diff --git a/app.js b/app.js
index 2be1d14a..ca1cc533 100644
--- a/app.js
+++ b/app.js
@@ -23,23 +23,13 @@ const passport = require('./lib/passport');
const tools = require('./lib/tools');
const contextHelpers = require('./lib/context-helpers');
-const routes = require('./routes/index');
-const lists = require('./routes/lists-legacy');
-//const settings = require('./routes/settings');
const getSettings = nodeifyFunction(require('./models/settings').get);
-const campaigns = require('./routes/campaigns');
-const links = require('./routes/links');
-const triggers = require('./routes/triggers');
-const webhooks = require('./routes/webhooks');
-const archive = require('./routes/archive');
const api = require('./routes/api');
-const editorapi = require('./routes/editorapi');
-const grapejs = require('./routes/grapejs');
-const mosaico = require('./routes/mosaico');
// These are routes for the new React-based client
const reports = require('./routes/reports');
const subscription = require('./routes/subscription');
+const mosaico = require('./routes/mosaico');
const namespacesRest = require('./routes/rest/namespaces');
const usersRest = require('./routes/rest/users');
@@ -57,18 +47,32 @@ const templatesRest = require('./routes/rest/templates');
const blacklistRest = require('./routes/rest/blacklist');
const editorsRest = require('./routes/rest/editors');
-const namespacesLegacyIntegration = require('./routes/namespaces-legacy-integration');
-const usersLegacyIntegration = require('./routes/users-legacy-integration');
-const accountLegacyIntegration = require('./routes/account-legacy-integration');
-const reportsLegacyIntegration = require('./routes/reports-legacy-integration');
-const listsLegacyIntegration = require('./routes/lists-legacy-integration');
-const templatesLegacyIntegration = require('./routes/templates-legacy-integration');
-const blacklistLegacyIntegration = require('./routes/blacklist-legacy-integration');
+const root = require('./routes/root');
const interoperableErrors = require('./shared/interoperable-errors');
const app = express();
+function install404Fallback(url) {
+ app.use(url, (req, res, next) => {
+ let err = new Error(_('Not Found'));
+ err.status = 404;
+ next(err);
+ });
+
+ app.use(url + '/*', (req, res, next) => {
+ let err = new Error(_('Not Found'));
+ err.status = 404;
+ next(err);
+ });
+}
+
+function useWith404Fallback(url, route) {
+ app.use(url, route);
+ install404Fallback(url);
+}
+
+
// view engine setup
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'hbs');
@@ -83,8 +87,6 @@ app.disable('x-powered-by');
hbs.registerPartials(__dirname + '/views/partials');
hbs.registerPartials(__dirname + '/views/subscription/partials/');
-hbs.registerPartials(__dirname + '/views/report-templates/partials/');
-hbs.registerPartials(__dirname + '/views/reports/partials/');
/**
* We need this helper to make sure that we consume flash messages only
@@ -136,7 +138,7 @@ handlebarsHelpers.registerHelpers(hbs.handlebars);
app.use(compression());
-app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
+app.use(favicon(path.join(__dirname, 'client', 'public', 'favicon.ico')));
app.use(logger(config.www.log, {
stream: {
@@ -150,9 +152,9 @@ app.use(logger(config.www.log, {
}));
app.use(cookieParser());
-app.use(express.static(path.join(__dirname, 'public')));
-app.use('/mailtrain', express.static(path.join(__dirname, 'client', 'dist')));
-app.use('/locales', express.static(path.join(__dirname, 'client', 'locales')));
+useWith404Fallback('/public', express.static(path.join(__dirname, 'client', 'public')));
+useWith404Fallback('/mailtrain', express.static(path.join(__dirname, 'client', 'dist')));
+useWith404Fallback('/locales', express.static(path.join(__dirname, 'client', 'locales')));
app.use(session({
store: config.redis.enabled ? new RedisStore(config.redis) : false,
@@ -251,42 +253,17 @@ app.use((req, res, next) => {
// Regular endpoints
-app.use('/', routes);
-app.use('/lists', lists);
-app.use('/campaigns', campaigns);
-//app.use('/settings', settings);
-app.use('/links', links);
-app.use('/triggers', triggers);
-app.use('/webhooks', webhooks);
-app.use('/archive', archive);
-app.use('/editorapi', editorapi);
-app.use('/grapejs', grapejs);
-app.use('/mosaico', mosaico);
+useWith404Fallback('/subscription', subscription);
+if (config.reports && config.reports.enabled === true) {
+ useWith404Fallback('/reports', reports);
+}
-app.use('/subscription', subscription);
-
+useWith404Fallback('/mosaico', mosaico);
// API endpoints
-app.use('/api', api);
+useWith404Fallback('/api', api);
-
-if (config.reports && config.reports.enabled === true) {
- app.use('/reports', reports);
-}
-
-/* FIXME - this should be removed once we bind the ReactJS client to / */
-app.use('/users', usersLegacyIntegration);
-app.use('/namespaces', namespacesLegacyIntegration);
-app.use('/account', accountLegacyIntegration);
-app.use('/lists', listsLegacyIntegration);
-app.use('/templates', templatesLegacyIntegration);
-app.use('/blacklist', blacklistLegacyIntegration);
-
-if (config.reports && config.reports.enabled === true) {
- app.use('/reports', reports);
- app.use('/reports', reportsLegacyIntegration);
-}
/* ------------------------------------------------------------------- */
// REST endpoints
@@ -308,14 +285,9 @@ if (config.reports && config.reports.enabled === true) {
app.use('/rest', reportTemplatesRest);
app.use('/rest', reportsRest);
}
+install404Fallback('/rest');
-
-// catch 404 and forward to error handler
-app.use((req, res, next) => {
- let err = new Error(_('Not Found'));
- err.status = 404;
- next(err);
-});
+app.use('/', root);
// Error handlers
diff --git a/client/package-lock.json b/client/package-lock.json
index 941c1c4a..fe3683c3 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -366,7 +366,6 @@
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz",
"integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
- "dev": true,
"requires": {
"babel-runtime": "6.26.0",
"babel-types": "6.26.0",
@@ -591,8 +590,7 @@
"babel-plugin-syntax-flow": {
"version": "6.18.0",
"resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
- "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
- "dev": true
+ "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0="
},
"babel-plugin-syntax-function-bind": {
"version": "6.13.0",
@@ -603,8 +601,7 @@
"babel-plugin-syntax-jsx": {
"version": "6.18.0",
"resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
- "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
- "dev": true
+ "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
},
"babel-plugin-syntax-object-rest-spread": {
"version": "6.13.0",
@@ -946,7 +943,6 @@
"version": "6.22.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
"integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
- "dev": true,
"requires": {
"babel-plugin-syntax-flow": "6.18.0",
"babel-runtime": "6.26.0"
@@ -976,7 +972,6 @@
"version": "6.25.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz",
"integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
- "dev": true,
"requires": {
"babel-runtime": "6.26.0"
}
@@ -985,7 +980,6 @@
"version": "6.24.1",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz",
"integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
- "dev": true,
"requires": {
"babel-helper-builder-react-jsx": "6.26.0",
"babel-plugin-syntax-jsx": "6.18.0",
@@ -996,7 +990,6 @@
"version": "6.22.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz",
"integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
- "dev": true,
"requires": {
"babel-plugin-syntax-jsx": "6.18.0",
"babel-runtime": "6.26.0"
@@ -1006,7 +999,6 @@
"version": "6.22.0",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz",
"integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
- "dev": true,
"requires": {
"babel-plugin-syntax-jsx": "6.18.0",
"babel-runtime": "6.26.0"
@@ -1021,6 +1013,14 @@
"regenerator-transform": "0.10.1"
}
},
+ "babel-plugin-transform-runtime": {
+ "version": "6.23.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
+ "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
+ "requires": {
+ "babel-runtime": "6.26.0"
+ }
+ },
"babel-plugin-transform-strict-mode": {
"version": "6.24.1",
"resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
@@ -1092,7 +1092,6 @@
"version": "6.23.0",
"resolved": "https://registry.npmjs.org/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz",
"integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
- "dev": true,
"requires": {
"babel-plugin-transform-flow-strip-types": "6.22.0"
}
@@ -1101,7 +1100,6 @@
"version": "6.24.1",
"resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz",
"integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
- "dev": true,
"requires": {
"babel-plugin-syntax-jsx": "6.18.0",
"babel-plugin-transform-react-display-name": "6.25.0",
@@ -1231,7 +1229,6 @@
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
- "dev": true,
"requires": {
"babel-runtime": "6.26.0",
"esutils": "2.0.2",
@@ -2167,8 +2164,7 @@
"esutils": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
- "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
- "dev": true
+ "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
},
"events": {
"version": "1.1.1",
@@ -3213,6 +3209,11 @@
}
}
},
+ "load-script": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/load-script/-/load-script-1.0.0.tgz",
+ "integrity": "sha1-BJGTngvuVkPuSUp+PaPSuscMbKQ="
+ },
"loader-runner": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz",
@@ -4789,6 +4790,17 @@
"prop-types": "15.6.0"
}
},
+ "react-ckeditor-component": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/react-ckeditor-component/-/react-ckeditor-component-1.0.7.tgz",
+ "integrity": "sha1-1aVGuDEYRL9VmTwnWSME8dp5vK4=",
+ "requires": {
+ "babel-plugin-transform-runtime": "6.23.0",
+ "babel-preset-react": "6.24.1",
+ "babel-runtime": "6.26.0",
+ "load-script": "1.0.0"
+ }
+ },
"react-day-picker": {
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-6.2.1.tgz",
@@ -5635,8 +5647,7 @@
"to-fast-properties": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
- "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
- "dev": true
+ "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
},
"tough-cookie": {
"version": "2.3.3",
diff --git a/public/bootstrap/css/bootstrap-theme.css b/client/public/bootstrap/css/bootstrap-theme.css
similarity index 100%
rename from public/bootstrap/css/bootstrap-theme.css
rename to client/public/bootstrap/css/bootstrap-theme.css
diff --git a/public/bootstrap/css/bootstrap-theme.css.map b/client/public/bootstrap/css/bootstrap-theme.css.map
similarity index 100%
rename from public/bootstrap/css/bootstrap-theme.css.map
rename to client/public/bootstrap/css/bootstrap-theme.css.map
diff --git a/public/bootstrap/css/bootstrap-theme.min.css b/client/public/bootstrap/css/bootstrap-theme.min.css
similarity index 100%
rename from public/bootstrap/css/bootstrap-theme.min.css
rename to client/public/bootstrap/css/bootstrap-theme.min.css
diff --git a/public/bootstrap/css/bootstrap-theme.min.css.map b/client/public/bootstrap/css/bootstrap-theme.min.css.map
similarity index 100%
rename from public/bootstrap/css/bootstrap-theme.min.css.map
rename to client/public/bootstrap/css/bootstrap-theme.min.css.map
diff --git a/public/bootstrap/css/bootstrap.css b/client/public/bootstrap/css/bootstrap.css
similarity index 100%
rename from public/bootstrap/css/bootstrap.css
rename to client/public/bootstrap/css/bootstrap.css
diff --git a/public/bootstrap/css/bootstrap.css.map b/client/public/bootstrap/css/bootstrap.css.map
similarity index 100%
rename from public/bootstrap/css/bootstrap.css.map
rename to client/public/bootstrap/css/bootstrap.css.map
diff --git a/public/bootstrap/css/bootstrap.min.css b/client/public/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from public/bootstrap/css/bootstrap.min.css
rename to client/public/bootstrap/css/bootstrap.min.css
diff --git a/public/bootstrap/css/bootstrap.min.css.map b/client/public/bootstrap/css/bootstrap.min.css.map
similarity index 100%
rename from public/bootstrap/css/bootstrap.min.css.map
rename to client/public/bootstrap/css/bootstrap.min.css.map
diff --git a/public/bootstrap/fonts/glyphicons-halflings-regular.eot b/client/public/bootstrap/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from public/bootstrap/fonts/glyphicons-halflings-regular.eot
rename to client/public/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/public/bootstrap/fonts/glyphicons-halflings-regular.svg b/client/public/bootstrap/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from public/bootstrap/fonts/glyphicons-halflings-regular.svg
rename to client/public/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/public/bootstrap/fonts/glyphicons-halflings-regular.ttf b/client/public/bootstrap/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from public/bootstrap/fonts/glyphicons-halflings-regular.ttf
rename to client/public/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/public/bootstrap/fonts/glyphicons-halflings-regular.woff b/client/public/bootstrap/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from public/bootstrap/fonts/glyphicons-halflings-regular.woff
rename to client/public/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/public/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/client/public/bootstrap/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from public/bootstrap/fonts/glyphicons-halflings-regular.woff2
rename to client/public/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/public/bootstrap/js/bootstrap.js b/client/public/bootstrap/js/bootstrap.js
similarity index 100%
rename from public/bootstrap/js/bootstrap.js
rename to client/public/bootstrap/js/bootstrap.js
diff --git a/public/bootstrap/js/bootstrap.min.js b/client/public/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from public/bootstrap/js/bootstrap.min.js
rename to client/public/bootstrap/js/bootstrap.min.js
diff --git a/public/bootstrap/js/npm.js b/client/public/bootstrap/js/npm.js
similarity index 100%
rename from public/bootstrap/js/npm.js
rename to client/public/bootstrap/js/npm.js
diff --git a/public/bootstrap/themes/cosmo.min.css b/client/public/bootstrap/themes/cosmo.min.css
similarity index 100%
rename from public/bootstrap/themes/cosmo.min.css
rename to client/public/bootstrap/themes/cosmo.min.css
diff --git a/public/bootstrap/themes/flatly.min.css b/client/public/bootstrap/themes/flatly.min.css
similarity index 100%
rename from public/bootstrap/themes/flatly.min.css
rename to client/public/bootstrap/themes/flatly.min.css
diff --git a/public/bootstrap/themes/paper.min.css b/client/public/bootstrap/themes/paper.min.css
similarity index 100%
rename from public/bootstrap/themes/paper.min.css
rename to client/public/bootstrap/themes/paper.min.css
diff --git a/public/bootstrap/themes/simplex.min.css b/client/public/bootstrap/themes/simplex.min.css
similarity index 100%
rename from public/bootstrap/themes/simplex.min.css
rename to client/public/bootstrap/themes/simplex.min.css
diff --git a/public/bootstrap/themes/slate.min.css b/client/public/bootstrap/themes/slate.min.css
similarity index 100%
rename from public/bootstrap/themes/slate.min.css
rename to client/public/bootstrap/themes/slate.min.css
diff --git a/public/bootstrap/themes/superhero.min.css b/client/public/bootstrap/themes/superhero.min.css
similarity index 100%
rename from public/bootstrap/themes/superhero.min.css
rename to client/public/bootstrap/themes/superhero.min.css
diff --git a/public/bootstrap/themes/united.min.css b/client/public/bootstrap/themes/united.min.css
similarity index 100%
rename from public/bootstrap/themes/united.min.css
rename to client/public/bootstrap/themes/united.min.css
diff --git a/public/bootstrap/themes/yeti.min.css b/client/public/bootstrap/themes/yeti.min.css
similarity index 100%
rename from public/bootstrap/themes/yeti.min.css
rename to client/public/bootstrap/themes/yeti.min.css
diff --git a/public/css/footer.css b/client/public/css/footer.css
similarity index 100%
rename from public/css/footer.css
rename to client/public/css/footer.css
diff --git a/public/css/mailtrain.css b/client/public/css/mailtrain.css
similarity index 91%
rename from public/css/mailtrain.css
rename to client/public/css/mailtrain.css
index f4bf6f2f..2445b17d 100644
--- a/public/css/mailtrain.css
+++ b/client/public/css/mailtrain.css
@@ -46,4 +46,12 @@ tbody>tr.selected {
.row-actions .row-action:last-child {
padding-right: 0px;
+}
+
+.navbar {
+ margin-bottom: 8px;
+}
+
+.breadcrumb {
+ margin-bottom: 8px;
}
\ No newline at end of file
diff --git a/public/css/narrow.css b/client/public/css/narrow.css
similarity index 100%
rename from public/css/narrow.css
rename to client/public/css/narrow.css
diff --git a/public/favicon.ico b/client/public/favicon.ico
similarity index 100%
rename from public/favicon.ico
rename to client/public/favicon.ico
diff --git a/public/javascript/jquery-2.2.1.min.js b/client/public/jquery-2.2.1.min.js
similarity index 100%
rename from public/javascript/jquery-2.2.1.min.js
rename to client/public/jquery-2.2.1.min.js
diff --git a/public/mailtrain-header.png b/client/public/mailtrain-header.png
similarity index 100%
rename from public/mailtrain-header.png
rename to client/public/mailtrain-header.png
diff --git a/public/mailtrain.png b/client/public/mailtrain.png
similarity index 100%
rename from public/mailtrain.png
rename to client/public/mailtrain.png
diff --git a/client/public/mosaico/fa/fonts/fontawesome-webfont.eot b/client/public/mosaico/fa/fonts/fontawesome-webfont.eot
new file mode 100644
index 00000000..e9f60ca9
Binary files /dev/null and b/client/public/mosaico/fa/fonts/fontawesome-webfont.eot differ
diff --git a/client/public/mosaico/fa/fonts/fontawesome-webfont.svg b/client/public/mosaico/fa/fonts/fontawesome-webfont.svg
new file mode 100644
index 00000000..855c845e
--- /dev/null
+++ b/client/public/mosaico/fa/fonts/fontawesome-webfont.svg
@@ -0,0 +1,2671 @@
+
+
+
+
+Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016
+ By ,,,
+Copyright Dave Gandy 2016. All rights reserved.
+
+
+
+
+
diff --git a/client/public/mosaico/fa/fonts/fontawesome-webfont.ttf b/client/public/mosaico/fa/fonts/fontawesome-webfont.ttf
new file mode 100644
index 00000000..35acda2f
Binary files /dev/null and b/client/public/mosaico/fa/fonts/fontawesome-webfont.ttf differ
diff --git a/client/public/mosaico/fa/fonts/fontawesome-webfont.woff b/client/public/mosaico/fa/fonts/fontawesome-webfont.woff
new file mode 100644
index 00000000..400014a4
Binary files /dev/null and b/client/public/mosaico/fa/fonts/fontawesome-webfont.woff differ
diff --git a/client/public/mosaico/fa/fonts/fontawesome-webfont.woff2 b/client/public/mosaico/fa/fonts/fontawesome-webfont.woff2
new file mode 100644
index 00000000..4d13fc60
Binary files /dev/null and b/client/public/mosaico/fa/fonts/fontawesome-webfont.woff2 differ
diff --git a/public/mosaico/dist/img/byvoxmail.png b/client/public/mosaico/img/byvoxmail.png
similarity index 100%
rename from public/mosaico/dist/img/byvoxmail.png
rename to client/public/mosaico/img/byvoxmail.png
diff --git a/public/mosaico/dist/img/mosaico-badge.gif b/client/public/mosaico/img/mosaico-badge.gif
similarity index 100%
rename from public/mosaico/dist/img/mosaico-badge.gif
rename to client/public/mosaico/img/mosaico-badge.gif
diff --git a/public/mosaico/dist/img/mosaico-v.gif b/client/public/mosaico/img/mosaico-v.gif
similarity index 100%
rename from public/mosaico/dist/img/mosaico-v.gif
rename to client/public/mosaico/img/mosaico-v.gif
diff --git a/public/mosaico/dist/img/mosaico32.png b/client/public/mosaico/img/mosaico32.png
similarity index 100%
rename from public/mosaico/dist/img/mosaico32.png
rename to client/public/mosaico/img/mosaico32.png
diff --git a/public/mosaico/dist/img/mosaicologo.png b/client/public/mosaico/img/mosaicologo.png
similarity index 100%
rename from public/mosaico/dist/img/mosaicologo.png
rename to client/public/mosaico/img/mosaicologo.png
diff --git a/public/mosaico/dist/img/screenshot-orig.png b/client/public/mosaico/img/screenshot-orig.png
similarity index 100%
rename from public/mosaico/dist/img/screenshot-orig.png
rename to client/public/mosaico/img/screenshot-orig.png
diff --git a/public/mosaico/dist/img/screenshot.png b/client/public/mosaico/img/screenshot.png
similarity index 100%
rename from public/mosaico/dist/img/screenshot.png
rename to client/public/mosaico/img/screenshot.png
diff --git a/client/public/mosaico/lang/LICENSE b/client/public/mosaico/lang/LICENSE
new file mode 100644
index 00000000..82a691b9
--- /dev/null
+++ b/client/public/mosaico/lang/LICENSE
@@ -0,0 +1,395 @@
+Attribution 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+ Considerations for licensors: Our public licenses are
+ intended for use by those authorized to give the public
+ permission to use material in ways otherwise restricted by
+ copyright and certain other rights. Our licenses are
+ irrevocable. Licensors should read and understand the terms
+ and conditions of the license they choose before applying it.
+ Licensors should also secure all rights necessary before
+ applying our licenses so that the public can reuse the
+ material as expected. Licensors should clearly mark any
+ material not subject to the license. This includes other CC-
+ licensed material, or material used under an exception or
+ limitation to copyright. More considerations for licensors:
+ wiki.creativecommons.org/Considerations_for_licensors
+
+ Considerations for the public: By using one of our public
+ licenses, a licensor grants the public permission to use the
+ licensed material under specified terms and conditions. If
+ the licensor's permission is not necessary for any reason--for
+ example, because of any applicable exception or limitation to
+ copyright--then that use is not regulated by the license. Our
+ licenses grant only permissions under copyright and certain
+ other rights that a licensor has authority to grant. Use of
+ the licensed material may still be restricted for other
+ reasons, including because others have copyright or other
+ rights in the material. A licensor may make special requests,
+ such as asking that all changes be marked or described.
+ Although not required by our licenses, you are encouraged to
+ respect those requests where reasonable. More_considerations
+ for the public:
+ wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+ a. Adapted Material means material subject to Copyright and Similar
+ Rights that is derived from or based upon the Licensed Material
+ and in which the Licensed Material is translated, altered,
+ arranged, transformed, or otherwise modified in a manner requiring
+ permission under the Copyright and Similar Rights held by the
+ Licensor. For purposes of this Public License, where the Licensed
+ Material is a musical work, performance, or sound recording,
+ Adapted Material is always produced where the Licensed Material is
+ synched in timed relation with a moving image.
+
+ b. Adapter's License means the license You apply to Your Copyright
+ and Similar Rights in Your contributions to Adapted Material in
+ accordance with the terms and conditions of this Public License.
+
+ c. Copyright and Similar Rights means copyright and/or similar rights
+ closely related to copyright including, without limitation,
+ performance, broadcast, sound recording, and Sui Generis Database
+ Rights, without regard to how the rights are labeled or
+ categorized. For purposes of this Public License, the rights
+ specified in Section 2(b)(1)-(2) are not Copyright and Similar
+ Rights.
+
+ d. Effective Technological Measures means those measures that, in the
+ absence of proper authority, may not be circumvented under laws
+ fulfilling obligations under Article 11 of the WIPO Copyright
+ Treaty adopted on December 20, 1996, and/or similar international
+ agreements.
+
+ e. Exceptions and Limitations means fair use, fair dealing, and/or
+ any other exception or limitation to Copyright and Similar Rights
+ that applies to Your use of the Licensed Material.
+
+ f. Licensed Material means the artistic or literary work, database,
+ or other material to which the Licensor applied this Public
+ License.
+
+ g. Licensed Rights means the rights granted to You subject to the
+ terms and conditions of this Public License, which are limited to
+ all Copyright and Similar Rights that apply to Your use of the
+ Licensed Material and that the Licensor has authority to license.
+
+ h. Licensor means the individual(s) or entity(ies) granting rights
+ under this Public License.
+
+ i. Share means to provide material to the public by any means or
+ process that requires permission under the Licensed Rights, such
+ as reproduction, public display, public performance, distribution,
+ dissemination, communication, or importation, and to make material
+ available to the public including in ways that members of the
+ public may access the material from a place and at a time
+ individually chosen by them.
+
+ j. Sui Generis Database Rights means rights other than copyright
+ resulting from Directive 96/9/EC of the European Parliament and of
+ the Council of 11 March 1996 on the legal protection of databases,
+ as amended and/or succeeded, as well as other essentially
+ equivalent rights anywhere in the world.
+
+ k. You means the individual or entity exercising the Licensed Rights
+ under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+ a. License grant.
+
+ 1. Subject to the terms and conditions of this Public License,
+ the Licensor hereby grants You a worldwide, royalty-free,
+ non-sublicensable, non-exclusive, irrevocable license to
+ exercise the Licensed Rights in the Licensed Material to:
+
+ a. reproduce and Share the Licensed Material, in whole or
+ in part; and
+
+ b. produce, reproduce, and Share Adapted Material.
+
+ 2. Exceptions and Limitations. For the avoidance of doubt, where
+ Exceptions and Limitations apply to Your use, this Public
+ License does not apply, and You do not need to comply with
+ its terms and conditions.
+
+ 3. Term. The term of this Public License is specified in Section
+ 6(a).
+
+ 4. Media and formats; technical modifications allowed. The
+ Licensor authorizes You to exercise the Licensed Rights in
+ all media and formats whether now known or hereafter created,
+ and to make technical modifications necessary to do so. The
+ Licensor waives and/or agrees not to assert any right or
+ authority to forbid You from making technical modifications
+ necessary to exercise the Licensed Rights, including
+ technical modifications necessary to circumvent Effective
+ Technological Measures. For purposes of this Public License,
+ simply making modifications authorized by this Section 2(a)
+ (4) never produces Adapted Material.
+
+ 5. Downstream recipients.
+
+ a. Offer from the Licensor -- Licensed Material. Every
+ recipient of the Licensed Material automatically
+ receives an offer from the Licensor to exercise the
+ Licensed Rights under the terms and conditions of this
+ Public License.
+
+ b. No downstream restrictions. You may not offer or impose
+ any additional or different terms or conditions on, or
+ apply any Effective Technological Measures to, the
+ Licensed Material if doing so restricts exercise of the
+ Licensed Rights by any recipient of the Licensed
+ Material.
+
+ 6. No endorsement. Nothing in this Public License constitutes or
+ may be construed as permission to assert or imply that You
+ are, or that Your use of the Licensed Material is, connected
+ with, or sponsored, endorsed, or granted official status by,
+ the Licensor or others designated to receive attribution as
+ provided in Section 3(a)(1)(A)(i).
+
+ b. Other rights.
+
+ 1. Moral rights, such as the right of integrity, are not
+ licensed under this Public License, nor are publicity,
+ privacy, and/or other similar personality rights; however, to
+ the extent possible, the Licensor waives and/or agrees not to
+ assert any such rights held by the Licensor to the limited
+ extent necessary to allow You to exercise the Licensed
+ Rights, but not otherwise.
+
+ 2. Patent and trademark rights are not licensed under this
+ Public License.
+
+ 3. To the extent possible, the Licensor waives any right to
+ collect royalties from You for the exercise of the Licensed
+ Rights, whether directly or through a collecting society
+ under any voluntary or waivable statutory or compulsory
+ licensing scheme. In all other cases the Licensor expressly
+ reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+ a. Attribution.
+
+ 1. If You Share the Licensed Material (including in modified
+ form), You must:
+
+ a. retain the following if it is supplied by the Licensor
+ with the Licensed Material:
+
+ i. identification of the creator(s) of the Licensed
+ Material and any others designated to receive
+ attribution, in any reasonable manner requested by
+ the Licensor (including by pseudonym if
+ designated);
+
+ ii. a copyright notice;
+
+ iii. a notice that refers to this Public License;
+
+ iv. a notice that refers to the disclaimer of
+ warranties;
+
+ v. a URI or hyperlink to the Licensed Material to the
+ extent reasonably practicable;
+
+ b. indicate if You modified the Licensed Material and
+ retain an indication of any previous modifications; and
+
+ c. indicate the Licensed Material is licensed under this
+ Public License, and include the text of, or the URI or
+ hyperlink to, this Public License.
+
+ 2. You may satisfy the conditions in Section 3(a)(1) in any
+ reasonable manner based on the medium, means, and context in
+ which You Share the Licensed Material. For example, it may be
+ reasonable to satisfy the conditions by providing a URI or
+ hyperlink to a resource that includes the required
+ information.
+
+ 3. If requested by the Licensor, You must remove any of the
+ information required by Section 3(a)(1)(A) to the extent
+ reasonably practicable.
+
+ 4. If You Share Adapted Material You produce, the Adapter's
+ License You apply must not prevent recipients of the Adapted
+ Material from complying with this Public License.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+ a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+ to extract, reuse, reproduce, and Share all or a substantial
+ portion of the contents of the database;
+
+ b. if You include all or a substantial portion of the database
+ contents in a database in which You have Sui Generis Database
+ Rights, then the database in which You have Sui Generis Database
+ Rights (but not its individual contents) is Adapted Material; and
+
+ c. You must comply with the conditions in Section 3(a) if You Share
+ all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+ a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+ EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+ AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+ ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+ IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+ WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+ ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+ KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+ ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+ b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+ TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+ NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+ INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+ COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+ USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+ ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+ DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+ IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+ c. The disclaimer of warranties and limitation of liability provided
+ above shall be interpreted in a manner that, to the extent
+ possible, most closely approximates an absolute disclaimer and
+ waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+ a. This Public License applies for the term of the Copyright and
+ Similar Rights licensed here. However, if You fail to comply with
+ this Public License, then Your rights under this Public License
+ terminate automatically.
+
+ b. Where Your right to use the Licensed Material has terminated under
+ Section 6(a), it reinstates:
+
+ 1. automatically as of the date the violation is cured, provided
+ it is cured within 30 days of Your discovery of the
+ violation; or
+
+ 2. upon express reinstatement by the Licensor.
+
+ For the avoidance of doubt, this Section 6(b) does not affect any
+ right the Licensor may have to seek remedies for Your violations
+ of this Public License.
+
+ c. For the avoidance of doubt, the Licensor may also offer the
+ Licensed Material under separate terms or conditions or stop
+ distributing the Licensed Material at any time; however, doing so
+ will not terminate this Public License.
+
+ d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+ License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+ a. The Licensor shall not be bound by any additional or different
+ terms or conditions communicated by You unless expressly agreed.
+
+ b. Any arrangements, understandings, or agreements regarding the
+ Licensed Material not stated herein are separate from and
+ independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+ a. For the avoidance of doubt, this Public License does not, and
+ shall not be interpreted to, reduce, limit, restrict, or impose
+ conditions on any use of the Licensed Material that could lawfully
+ be made without permission under this Public License.
+
+ b. To the extent possible, if any provision of this Public License is
+ deemed unenforceable, it shall be automatically reformed to the
+ minimum extent necessary to make it enforceable. If the provision
+ cannot be reformed, it shall be severed from this Public License
+ without affecting the enforceability of the remaining terms and
+ conditions.
+
+ c. No term or condition of this Public License will be waived and no
+ failure to comply consented to unless expressly agreed to by the
+ Licensor.
+
+ d. Nothing in this Public License constitutes or may be interpreted
+ as a limitation upon, or waiver of, any privileges and immunities
+ that apply to the Licensor or You, including from the legal
+ processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the Licensor. The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
diff --git a/client/public/mosaico/lang/README.md b/client/public/mosaico/lang/README.md
new file mode 100644
index 00000000..4a9f58b0
--- /dev/null
+++ b/client/public/mosaico/lang/README.md
@@ -0,0 +1,31 @@
+These files are not yet directly used by mosaico.
+
+You can use ```Mosaico.init({ strings: #thecontentofoneofthisfiles# })``` to initialize mosaico in a given language.
+
+You can provide new translations to our mosaico translations project on POEditor: https://poeditor.com/join/project/nsFNi6zyOm
+
+Please note that this just translate the main Mosaico UI: some parts of the UI are defined by the template and their "labels" cannot be translated by the library because each template defines its own labels/texts. So you may want to create your own "translated" templates by altering the "source" html for the template.
+
+You can even force mosaico to run the internal translation tool for the template labels by defining a [plugin](https://github.com/voidlabs/mosaico/wiki/Mosaico-Plugins):
+```javascript
+ var plugin = function(vm) {
+ vm.ut = vm.tt;
+ };
+```
+
+Please get in touch with us by sending an email to feedback at mosaico.io including your email and the language you'd like to contribute.
+
+Thanks to translators:
+
+- it (Italian): Mosaico Team
+- de (German): Bernhard Weichel
+- es (Spanish): Carlos Jacobs
+- fr (French): Jonathan Loriaux
+- nl (Dutch): Pieter Emeis
+- sv (Swedish): P-H Westman
+- sr_RS (Serbian): Đorđe Kolaković
+- ru (Russian): Andrey ANM
+
+Sign-up to POEditor if you want to collaborate or suggest changes to the current languages, or provide PR for full new complete languages.
+
+Language files are contributed and redistributed under the CC-BY-4.0 (Creative Commons - Attribution) license.
diff --git a/public/mosaico/dist/lang/mosaico-de.json b/client/public/mosaico/lang/mosaico-de.json
similarity index 100%
rename from public/mosaico/dist/lang/mosaico-de.json
rename to client/public/mosaico/lang/mosaico-de.json
diff --git a/client/public/mosaico/lang/mosaico-en.json b/client/public/mosaico/lang/mosaico-en.json
new file mode 100644
index 00000000..6cd06bb0
--- /dev/null
+++ b/client/public/mosaico/lang/mosaico-en.json
@@ -0,0 +1,88 @@
+{
+ "Download": "Download",
+ "Test": "Test",
+ "Save": "Save",
+ "Downloading...": "Downloading...",
+ "Invalid email address": "Invalid email address",
+ "Test email sent...": "Test email sent...",
+ "Unexpected error talking to server: contact us!": "Unexpected error talking to server: contact us!",
+ "Insert here the recipient email address": "Insert here the recipient email address",
+ "Test email address": "Test email address",
+ "Block removed: use undo button to restore it...": "Block removed: use undo button to restore it...",
+ "New block added after the selected one (__pos__)": "New block added after the selected one (__pos__)",
+ "New block added at the model bottom (__pos__)": "New block added at the model bottom (__pos__)",
+ "Undo (#COUNT#)": "Undo (#COUNT#)",
+ "Redo": "Redo",
+ "Selected element has no editable properties": "Selected element has no editable properties",
+ "This style is specific for this block: click here to remove the custom style and revert to the theme value": "This style is specific for this block: click here to remove the custom style and revert to the theme value",
+ "Switch between global and block level styles editing": "Switch between global and block level styles editing",
+ "Undo last operation": "Undo last operation",
+ "Redo last operation": "Redo last operation",
+ "Show image gallery": "Show image gallery",
+ "Gallery": "Gallery",
+ "Preview": "Preview",
+ "Show live preview": "Show live preview",
+ "Large screen": "Large screen",
+ "Tablet": "Tablet",
+ "Smartphone": "Smartphone",
+ "Show preview and send test": "Show preview and send test",
+ "Download template": "Download template",
+ "Save template": "Save template",
+ "Saved model is obsolete": "Saved model is obsolete",
+ "The saved model has been created with a previous, non completely compatible version, of the template
Some content or style in the model COULD BE LOST if you will save
Contact us for more informations!
": "The saved model has been created with a previous, non completely compatible version, of the template
Some content or style in the model COULD BE LOST if you will save
Contact us for more informations!
",
+ "Blocks": "Blocks",
+ "Blocks ready to be added to the template": "Blocks ready to be added to the template",
+ "Content": "Content",
+ "Edit content options": "Edit content options",
+ "Style": "Style",
+ "Edit style options": "Edit style options",
+ "Block __name__": "Block __name__",
+ "Click or drag to add this block to the template": "Click or drag to add this block to the template",
+ "Add": "Add",
+ "By clicking on message parts you will select a block and content options, if any, will show here": "By clicking on message parts you will select a block and content options, if any, will show here",
+ "By clicking on message parts you will select a block and style options, if available, will show here": "By clicking on message parts you will select a block and style options, if available, will show here",
+ "Click or drag files here": "Click or drag files here",
+ "No images uploaded, yet": "No images uploaded, yet",
+ "Show images from the gallery": "Show images from the gallery",
+ "Loading...": "Loading...",
+ "Load gallery": "Load gallery",
+ "Loading gallery...": "Loading gallery...",
+ "The gallery is empty": "The gallery is empty",
+ "Remove image": "Remove image",
+ "Open the image editing tool": "Open the image editing tool",
+ "Upload a new image": "Upload a new image",
+ "Drop an image here": "Drop an image here",
+ "Drop an image here or click the upload button": "Drop an image here or click the upload button",
+ "Drag this image and drop it on any template image placeholder": "Drag this image and drop it on any template image placeholder",
+ "Gallery:": "Gallery:",
+ "Session images": "Session images",
+ "Recents": "Recents",
+ "Remote gallery": "Remote gallery",
+ "Customized block.In this status changes to properties will be specific to the current block (instead of being global to all blocks in the same section) A \"small cube\" In this status changes to properties will be specific to the current block (instead of being global to all blocks in the same section) A \"small cube\" The saved model has been created with a previous, non completely compatible version, of the template
Some content or style in the model COULD BE LOST if you will save
Contact us for more informations!
": "Il modello salvato è stato creato con una versione precedente del template non del tutto compatibile
Alcuni contenuti o stili del modello POTREBBERO ESSERE PERSI se procederai e deciderai di salvare
Contattaci se hai dei dubbi!
",
+ "Blocks": "Blocchi",
+ "Blocks ready to be added to the template": "Elenco contenuti aggiungibili al messaggio",
+ "Content": "Contenuto",
+ "Edit content options": "Modifica opzioni contenuti",
+ "Style": "Stile",
+ "Edit style options": "Modifica opzioni grafiche",
+ "Block __name__": "Blocco __name__",
+ "Click or drag to add this block to the template": "Clicca o trascina per aggiungere al messaggio",
+ "Add": "Aggiungi",
+ "By clicking on message parts you will select a block and content options, if any, will show here": "Cliccando su alcune parti del messaggio selezionerai un blocco e le opzioni contenutistiche, se disponibili, compariranno qui",
+ "By clicking on message parts you will select a block and style options, if available, will show here": "Cliccando su alcune parti del messaggio selezionerai un blocco e le opzioni di stile, se disponibili, compariranno qui",
+ "Click or drag files here": "Clicca o trascina i file qui!",
+ "No images uploaded, yet": "Non hai ancora caricato immagini",
+ "Show images from the gallery": "Visualizza le immagini caricate nella tua area",
+ "Loading...": "Caricamento...",
+ "Load gallery": "Carica galleria",
+ "Loading gallery...": "Caricamento in corso...",
+ "The gallery is empty": "Nessuna immagine nella galleria",
+ "Remove image": "Rimuovi immagine",
+ "Open the image editing tool": "Avvia strumento modifica immagine",
+ "Upload a new image": "Carica una nuova immagine",
+ "Drop an image here": "Trascina una immagine qui",
+ "Drop an image here or click the upload button": "Trascina una immagine qui o clicca sul pulsante di caricamento",
+ "Drag this image and drop it on any template image placeholder": "Trascina questa immagine sulla posizione in cui vuoi inserirla",
+ "Gallery:": "Galleria:",
+ "Session images": "Immagini di sessione",
+ "Recents": "Recenti",
+ "Remote gallery": "Galleria remota",
+ "Customized block.In this status changes to properties will be specific to the current block (instead of being global to all blocks in the same section) A \"small cube\" In questa modalità se cambi una proprietà verrà modificata solamente per questo specifico blocco (invece che per tutti i blocchi della stessa sezione). Per segnalare la personalizzazione apparirà l'icona del \"cubetto\" The saved model has been created with a previous, non completely compatible version, of the template
Some content or style in the model COULD BE LOST if you will save
Contact us for more informations!
": "Сохраненная модель была создана с помощью предыдущей, не полностью совместимой версии шаблона
Часть содержимого или стиль в моделиМОЖЕТ БЫТЬ ПОТЕРЯНО если вы сохраните
Свяжитесь с нами для получения дополнительных сведений!
",
+ "Blocks": "Блоки",
+ "Blocks ready to be added to the template": "Блоки готовы к добавлению в шаблон",
+ "Content": "Содержимое",
+ "Edit content options": "Изменить параметры содержимого",
+ "Style": "Стиль",
+ "Edit style options": "Изменить параметры стиля",
+ "Block __name__": "Блок __name__",
+ "Click or drag to add this block to the template": "Щелкните или перетащите, чтобы добавить этот блок в шаблон",
+ "Add": "Добавить",
+ "By clicking on message parts you will select a block and content options, if any, will show here": "При нажатии на части сообщения будут выбраны параметры блока и содержимого, если таковые будут здесь отображаться.",
+ "By clicking on message parts you will select a block and style options, if available, will show here": "При нажатии на части сообщения будут выбраны параметры блока и стиля, если они доступны, будут показаны здесь",
+ "Click or drag files here": "Щелкните или перетащите сюда файлы",
+ "No images uploaded, yet": "Нет загруженных изображений",
+ "Show images from the gallery": "Показать изображения из галереи",
+ "Loading...": "Загрузка...",
+ "Load gallery": "Загрузить галерею",
+ "Loading gallery...": "Загрузка галереи...",
+ "The gallery is empty": "Галерея пуста",
+ "Remove image": "Удалить изображение",
+ "Open the image editing tool": "Открыть инструмент редактирования изображений",
+ "Upload a new image": "Загрузить новое изображение",
+ "Drop an image here": "Бросьте изображение здесь",
+ "Drop an image here or click the upload button": "Бросьте изображение здесь или нажмите кнопку загрузки",
+ "Drag this image and drop it on any template image placeholder": "Перетащите это изображение и поместите его на любой заполнитель шаблона",
+ "Gallery:": "Галерея:",
+ "Session images": "Изображения сеанса",
+ "Recents": "Недавние",
+ "Remote gallery": "Удаленная галерея",
+ "Customized block.In this status changes to properties will be specific to the current block (instead of being global to all blocks in the same section) A \"small cube\" В этом статусе изменения свойств будут специфичны для текущего блока (вместо того, чтобы быть глобальными для всех блоков в том же разделе). Значок\"маленький куб\" The saved model has been created with a previous, non completely compatible version, of the template
Some content or style in the model COULD BE LOST if you will save
Contact us for more informations!
": "Sačuvani model je kreiran sa prethodnom verzijom šablona, koja nije u potpunosti kompatibilna
Neki sadržaj ili stil u modeluMOŽE BITI IZGUBLJEN ukoliko sačuvate model
Kontaktirajte nas za više informacija!
",
+ "Blocks": "Blokovi",
+ "Blocks ready to be added to the template": "Blokovi koji su spremni za dodavanje u šablo",
+ "Content": "Sadržaj",
+ "Edit content options": "Uredi opcije sadržaja",
+ "Style": "Stil",
+ "Edit style options": "Uredi opcije stila",
+ "Block __name__": "Blok __ime__",
+ "Click or drag to add this block to the template": "Kliknite ili prevucite ovaj blok u šablon",
+ "Add": "Dodaj",
+ "By clicking on message parts you will select a block and content options, if any, will show here": "Klikom na delove poruke ćete izabrati blok i opcije za sadržaj, ukoliko postoje će biti prikazane ovde",
+ "By clicking on message parts you will select a block and style options, if available, will show here": "Klikom na delove poruke ćete izabrati blok i opcije za stil će, ukoliko postoje biti prikazane ovde",
+ "Click or drag files here": "Kliknite ili prevucite fajlove ovde",
+ "No images uploaded, yet": "Još uvek nema postavljenih slika",
+ "Show images from the gallery": "Prikaži slike iz galerije",
+ "Loading...": "Učitavanje...",
+ "Load gallery": "Učitaj galeriju",
+ "Loading gallery...": "Učitavanje galerije...",
+ "The gallery is empty": "Galerija je prazna",
+ "Remove image": "Ukloni sliku",
+ "Open the image editing tool": "Otvori alatku za uređivanje slika",
+ "Upload a new image": "Postavi novu sliku",
+ "Drop an image here": "Ubaci sliku ovde",
+ "Drop an image here or click the upload button": "Ubacite sliku ovde ili kliknite na dugme za postavljanje",
+ "Drag this image and drop it on any template image placeholder": "Prevucite ovu sliku na poziciju za sliku u šablonu",
+ "Gallery:": "Galerija:",
+ "Session images": "Slike sesije",
+ "Recents": "Poslednje",
+ "Remote gallery": "Odaljena galerija",
+ "Customized block.In this status changes to properties will be specific to the current block (instead of being global to all blocks in the same section) A \"small cube\" U ovom statusu će promene svojstava biti direktno vezane za trenutno odabrani blok (umesto da se vezuju za sve blokove u istoj sekciji) Ikonica \"mala kocka\" pored svojstva će obeležiti prilagođavanje. Klikom na ovu ikonicu, svojstvo će biti vraćeno na podrazumevanu vrednost definisanu u sekciji.
\x3c!-- ko block: $data --\x3e\x3c!-- /ko --\x3e'),templateSystem.addTemplate("blocks-show","\x3c!-- ko template: { name: 'block-show', foreach: blocks } --\x3e\x3c!-- /ko --\x3e"),templateSystem.addTemplate("blocks-wysiwyg","
"),templateSystem.addTemplate("customstyle",'Customized block.
In this status changes to properties will be specific to the current block (instead of being global to all blocks in the same section) A "small cube"
]'),templateSystem.addTemplate("gallery-images",'\x3c!-- ko if: items.pageCount() > 1 --\x3e\x3c!-- /ko --\x3e'),templateSystem.addTemplate("img-wysiwyg",'
size
\x3c!-- ko template: _template --\x3e\x3c!-- /ko --\x3e \x3c!-- ko if: _src() == \'\' --\x3e \x3c!-- Drop an image here
'),templateSystem.addTemplate("main",' \x3c!-- ko withProperties: { templateMode: \'wysiwyg\', templateModeFallback: \'show\' } --\x3e
\x3c!-- /ko --\x3e
\x3c!-- ko if: $root.showToolbox --\x3e
\x3c!-- /ko --\x3e
Incompatible template
\x3c!-- ko if: $root.logoPath --\x3e Oppps... !!
\x3c!-- /ko --\x3e'),templateSystem.addTemplate("toolbox",' ')});
+
+},{"../src/js/bindings/choose-template.js":28}],2:[function(require,module,exports){
+(function (global){
+'use strict';
+
+// compare and isBuffer taken from https://github.com/feross/buffer/blob/680e9e5e488f22aac27599a57dc844a6315928dd/index.js
+// original notice:
+
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author Feross Aboukhadijeh
+ * @license MIT
+ */
+function compare(a, b) {
+ if (a === b) {
+ return 0;
+ }
+
+ var x = a.length;
+ var y = b.length;
+
+ for (var i = 0, len = Math.min(x, y); i < len; ++i) {
+ if (a[i] !== b[i]) {
+ x = a[i];
+ y = b[i];
+ break;
+ }
+ }
+
+ if (x < y) {
+ return -1;
+ }
+ if (y < x) {
+ return 1;
+ }
+ return 0;
+}
+function isBuffer(b) {
+ if (global.Buffer && typeof global.Buffer.isBuffer === 'function') {
+ return global.Buffer.isBuffer(b);
+ }
+ return !!(b != null && b._isBuffer);
+}
+
+// based on node assert, original notice:
+
+// http://wiki.commonjs.org/wiki/Unit_Testing/1.0
+//
+// THIS IS NOT TESTED NOR LIKELY TO WORK OUTSIDE V8!
+//
+// Originally from narwhal.js (http://narwhaljs.org)
+// Copyright (c) 2009 Thomas Robinson <280north.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the 'Software'), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var util = require('util/');
+var hasOwn = Object.prototype.hasOwnProperty;
+var pSlice = Array.prototype.slice;
+var functionsHaveNames = (function () {
+ return function foo() {}.name === 'foo';
+}());
+function pToString (obj) {
+ return Object.prototype.toString.call(obj);
+}
+function isView(arrbuf) {
+ if (isBuffer(arrbuf)) {
+ return false;
+ }
+ if (typeof global.ArrayBuffer !== 'function') {
+ return false;
+ }
+ if (typeof ArrayBuffer.isView === 'function') {
+ return ArrayBuffer.isView(arrbuf);
+ }
+ if (!arrbuf) {
+ return false;
+ }
+ if (arrbuf instanceof DataView) {
+ return true;
+ }
+ if (arrbuf.buffer && arrbuf.buffer instanceof ArrayBuffer) {
+ return true;
+ }
+ return false;
+}
+// 1. The assert module provides functions that throw
+// AssertionError's when particular conditions are not met. The
+// assert module must conform to the following interface.
+
+var assert = module.exports = ok;
+
+// 2. The AssertionError is defined in assert.
+// new assert.AssertionError({ message: message,
+// actual: actual,
+// expected: expected })
+
+var regex = /\s*function\s+([^\(\s]*)\s*/;
+// based on https://github.com/ljharb/function.prototype.name/blob/adeeeec8bfcc6068b187d7d9fb3d5bb1d3a30899/implementation.js
+function getName(func) {
+ if (!util.isFunction(func)) {
+ return;
+ }
+ if (functionsHaveNames) {
+ return func.name;
+ }
+ var str = func.toString();
+ var match = str.match(regex);
+ return match && match[1];
+}
+assert.AssertionError = function AssertionError(options) {
+ this.name = 'AssertionError';
+ this.actual = options.actual;
+ this.expected = options.expected;
+ this.operator = options.operator;
+ if (options.message) {
+ this.message = options.message;
+ this.generatedMessage = false;
+ } else {
+ this.message = getMessage(this);
+ this.generatedMessage = true;
+ }
+ var stackStartFunction = options.stackStartFunction || fail;
+ if (Error.captureStackTrace) {
+ Error.captureStackTrace(this, stackStartFunction);
+ } else {
+ // non v8 browsers so we can have a stacktrace
+ var err = new Error();
+ if (err.stack) {
+ var out = err.stack;
+
+ // try to strip useless frames
+ var fn_name = getName(stackStartFunction);
+ var idx = out.indexOf('\n' + fn_name);
+ if (idx >= 0) {
+ // once we have located the function frame
+ // we need to strip out everything before it (and its line)
+ var next_line = out.indexOf('\n', idx + 1);
+ out = out.substring(next_line + 1);
+ }
+
+ this.stack = out;
+ }
+ }
+};
+
+// assert.AssertionError instanceof Error
+util.inherits(assert.AssertionError, Error);
+
+function truncate(s, n) {
+ if (typeof s === 'string') {
+ return s.length < n ? s : s.slice(0, n);
+ } else {
+ return s;
+ }
+}
+function inspect(something) {
+ if (functionsHaveNames || !util.isFunction(something)) {
+ return util.inspect(something);
+ }
+ var rawname = getName(something);
+ var name = rawname ? ': ' + rawname : '';
+ return '[Function' + name + ']';
+}
+function getMessage(self) {
+ return truncate(inspect(self.actual), 128) + ' ' +
+ self.operator + ' ' +
+ truncate(inspect(self.expected), 128);
+}
+
+// At present only the three keys mentioned above are used and
+// understood by the spec. Implementations or sub modules can pass
+// other keys to the AssertionError's constructor - they will be
+// ignored.
+
+// 3. All of the following functions must throw an AssertionError
+// when a corresponding condition is not met, with a message that
+// may be undefined if not provided. All assertion methods provide
+// both the actual and expected values to the assertion error for
+// display purposes.
+
+function fail(actual, expected, message, operator, stackStartFunction) {
+ throw new assert.AssertionError({
+ message: message,
+ actual: actual,
+ expected: expected,
+ operator: operator,
+ stackStartFunction: stackStartFunction
+ });
+}
+
+// EXTENSION! allows for well behaved errors defined elsewhere.
+assert.fail = fail;
+
+// 4. Pure assertion tests whether a value is truthy, as determined
+// by !!guard.
+// assert.ok(guard, message_opt);
+// This statement is equivalent to assert.equal(true, !!guard,
+// message_opt);. To test strictly for the value true, use
+// assert.strictEqual(true, guard, message_opt);.
+
+function ok(value, message) {
+ if (!value) fail(value, true, message, '==', assert.ok);
+}
+assert.ok = ok;
+
+// 5. The equality assertion tests shallow, coercive equality with
+// ==.
+// assert.equal(actual, expected, message_opt);
+
+assert.equal = function equal(actual, expected, message) {
+ if (actual != expected) fail(actual, expected, message, '==', assert.equal);
+};
+
+// 6. The non-equality assertion tests for whether two objects are not equal
+// with != assert.notEqual(actual, expected, message_opt);
+
+assert.notEqual = function notEqual(actual, expected, message) {
+ if (actual == expected) {
+ fail(actual, expected, message, '!=', assert.notEqual);
+ }
+};
+
+// 7. The equivalence assertion tests a deep equality relation.
+// assert.deepEqual(actual, expected, message_opt);
+
+assert.deepEqual = function deepEqual(actual, expected, message) {
+ if (!_deepEqual(actual, expected, false)) {
+ fail(actual, expected, message, 'deepEqual', assert.deepEqual);
+ }
+};
+
+assert.deepStrictEqual = function deepStrictEqual(actual, expected, message) {
+ if (!_deepEqual(actual, expected, true)) {
+ fail(actual, expected, message, 'deepStrictEqual', assert.deepStrictEqual);
+ }
+};
+
+function _deepEqual(actual, expected, strict, memos) {
+ // 7.1. All identical values are equivalent, as determined by ===.
+ if (actual === expected) {
+ return true;
+ } else if (isBuffer(actual) && isBuffer(expected)) {
+ return compare(actual, expected) === 0;
+
+ // 7.2. If the expected value is a Date object, the actual value is
+ // equivalent if it is also a Date object that refers to the same time.
+ } else if (util.isDate(actual) && util.isDate(expected)) {
+ return actual.getTime() === expected.getTime();
+
+ // 7.3 If the expected value is a RegExp object, the actual value is
+ // equivalent if it is also a RegExp object with the same source and
+ // properties (`global`, `multiline`, `lastIndex`, `ignoreCase`).
+ } else if (util.isRegExp(actual) && util.isRegExp(expected)) {
+ return actual.source === expected.source &&
+ actual.global === expected.global &&
+ actual.multiline === expected.multiline &&
+ actual.lastIndex === expected.lastIndex &&
+ actual.ignoreCase === expected.ignoreCase;
+
+ // 7.4. Other pairs that do not both pass typeof value == 'object',
+ // equivalence is determined by ==.
+ } else if ((actual === null || typeof actual !== 'object') &&
+ (expected === null || typeof expected !== 'object')) {
+ return strict ? actual === expected : actual == expected;
+
+ // If both values are instances of typed arrays, wrap their underlying
+ // ArrayBuffers in a Buffer each to increase performance
+ // This optimization requires the arrays to have the same type as checked by
+ // Object.prototype.toString (aka pToString). Never perform binary
+ // comparisons for Float*Arrays, though, since e.g. +0 === -0 but their
+ // bit patterns are not identical.
+ } else if (isView(actual) && isView(expected) &&
+ pToString(actual) === pToString(expected) &&
+ !(actual instanceof Float32Array ||
+ actual instanceof Float64Array)) {
+ return compare(new Uint8Array(actual.buffer),
+ new Uint8Array(expected.buffer)) === 0;
+
+ // 7.5 For all other Object pairs, including Array objects, equivalence is
+ // determined by having the same number of owned properties (as verified
+ // with Object.prototype.hasOwnProperty.call), the same set of keys
+ // (although not necessarily the same order), equivalent values for every
+ // corresponding key, and an identical 'prototype' property. Note: this
+ // accounts for both named and indexed properties on Arrays.
+ } else if (isBuffer(actual) !== isBuffer(expected)) {
+ return false;
+ } else {
+ memos = memos || {actual: [], expected: []};
+
+ var actualIndex = memos.actual.indexOf(actual);
+ if (actualIndex !== -1) {
+ if (actualIndex === memos.expected.indexOf(expected)) {
+ return true;
+ }
+ }
+
+ memos.actual.push(actual);
+ memos.expected.push(expected);
+
+ return objEquiv(actual, expected, strict, memos);
+ }
+}
+
+function isArguments(object) {
+ return Object.prototype.toString.call(object) == '[object Arguments]';
+}
+
+function objEquiv(a, b, strict, actualVisitedObjects) {
+ if (a === null || a === undefined || b === null || b === undefined)
+ return false;
+ // if one is a primitive, the other must be same
+ if (util.isPrimitive(a) || util.isPrimitive(b))
+ return a === b;
+ if (strict && Object.getPrototypeOf(a) !== Object.getPrototypeOf(b))
+ return false;
+ var aIsArgs = isArguments(a);
+ var bIsArgs = isArguments(b);
+ if ((aIsArgs && !bIsArgs) || (!aIsArgs && bIsArgs))
+ return false;
+ if (aIsArgs) {
+ a = pSlice.call(a);
+ b = pSlice.call(b);
+ return _deepEqual(a, b, strict);
+ }
+ var ka = objectKeys(a);
+ var kb = objectKeys(b);
+ var key, i;
+ // having the same number of owned properties (keys incorporates
+ // hasOwnProperty)
+ if (ka.length !== kb.length)
+ return false;
+ //the same set of keys (although not necessarily the same order),
+ ka.sort();
+ kb.sort();
+ //~~~cheap key test
+ for (i = ka.length - 1; i >= 0; i--) {
+ if (ka[i] !== kb[i])
+ return false;
+ }
+ //equivalent values for every corresponding key, and
+ //~~~possibly expensive deep test
+ for (i = ka.length - 1; i >= 0; i--) {
+ key = ka[i];
+ if (!_deepEqual(a[key], b[key], strict, actualVisitedObjects))
+ return false;
+ }
+ return true;
+}
+
+// 8. The non-equivalence assertion tests for any deep inequality.
+// assert.notDeepEqual(actual, expected, message_opt);
+
+assert.notDeepEqual = function notDeepEqual(actual, expected, message) {
+ if (_deepEqual(actual, expected, false)) {
+ fail(actual, expected, message, 'notDeepEqual', assert.notDeepEqual);
+ }
+};
+
+assert.notDeepStrictEqual = notDeepStrictEqual;
+function notDeepStrictEqual(actual, expected, message) {
+ if (_deepEqual(actual, expected, true)) {
+ fail(actual, expected, message, 'notDeepStrictEqual', notDeepStrictEqual);
+ }
+}
+
+
+// 9. The strict equality assertion tests strict equality, as determined by ===.
+// assert.strictEqual(actual, expected, message_opt);
+
+assert.strictEqual = function strictEqual(actual, expected, message) {
+ if (actual !== expected) {
+ fail(actual, expected, message, '===', assert.strictEqual);
+ }
+};
+
+// 10. The strict non-equality assertion tests for strict inequality, as
+// determined by !==. assert.notStrictEqual(actual, expected, message_opt);
+
+assert.notStrictEqual = function notStrictEqual(actual, expected, message) {
+ if (actual === expected) {
+ fail(actual, expected, message, '!==', assert.notStrictEqual);
+ }
+};
+
+function expectedException(actual, expected) {
+ if (!actual || !expected) {
+ return false;
+ }
+
+ if (Object.prototype.toString.call(expected) == '[object RegExp]') {
+ return expected.test(actual);
+ }
+
+ try {
+ if (actual instanceof expected) {
+ return true;
+ }
+ } catch (e) {
+ // Ignore. The instanceof check doesn't work for arrow functions.
+ }
+
+ if (Error.isPrototypeOf(expected)) {
+ return false;
+ }
+
+ return expected.call({}, actual) === true;
+}
+
+function _tryBlock(block) {
+ var error;
+ try {
+ block();
+ } catch (e) {
+ error = e;
+ }
+ return error;
+}
+
+function _throws(shouldThrow, block, expected, message) {
+ var actual;
+
+ if (typeof block !== 'function') {
+ throw new TypeError('"block" argument must be a function');
+ }
+
+ if (typeof expected === 'string') {
+ message = expected;
+ expected = null;
+ }
+
+ actual = _tryBlock(block);
+
+ message = (expected && expected.name ? ' (' + expected.name + ').' : '.') +
+ (message ? ' ' + message : '.');
+
+ if (shouldThrow && !actual) {
+ fail(actual, expected, 'Missing expected exception' + message);
+ }
+
+ var userProvidedMessage = typeof message === 'string';
+ var isUnwantedException = !shouldThrow && util.isError(actual);
+ var isUnexpectedException = !shouldThrow && actual && !expected;
+
+ if ((isUnwantedException &&
+ userProvidedMessage &&
+ expectedException(actual, expected)) ||
+ isUnexpectedException) {
+ fail(actual, expected, 'Got unwanted exception' + message);
+ }
+
+ if ((shouldThrow && actual && expected &&
+ !expectedException(actual, expected)) || (!shouldThrow && actual)) {
+ throw actual;
+ }
+}
+
+// 11. Expected to throw an error:
+// assert.throws(block, Error_opt, message_opt);
+
+assert.throws = function(block, /*optional*/error, /*optional*/message) {
+ _throws(true, block, error, message);
+};
+
+// EXTENSION! This is annoying to write outside this module.
+assert.doesNotThrow = function(block, /*optional*/error, /*optional*/message) {
+ _throws(false, block, error, message);
+};
+
+assert.ifError = function(err) { if (err) throw err; };
+
+var objectKeys = Object.keys || function (obj) {
+ var keys = [];
+ for (var key in obj) {
+ if (hasOwn.call(obj, key)) keys.push(key);
+ }
+ return keys;
+};
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+
+},{"util/":24}],3:[function(require,module,exports){
+(function (global){
+/*global window, global*/
+var util = require("util")
+var assert = require("assert")
+var now = require("date-now")
+
+var slice = Array.prototype.slice
+var console
+var times = {}
+
+if (typeof global !== "undefined" && global.console) {
+ console = global.console
+} else if (typeof window !== "undefined" && window.console) {
+ console = window.console
+} else {
+ console = {}
+}
+
+var functions = [
+ [log, "log"],
+ [info, "info"],
+ [warn, "warn"],
+ [error, "error"],
+ [time, "time"],
+ [timeEnd, "timeEnd"],
+ [trace, "trace"],
+ [dir, "dir"],
+ [consoleAssert, "assert"]
+]
+
+for (var i = 0; i < functions.length; i++) {
+ var tuple = functions[i]
+ var f = tuple[0]
+ var name = tuple[1]
+
+ if (!console[name]) {
+ console[name] = f
+ }
+}
+
+module.exports = console
+
+function log() {}
+
+function info() {
+ console.log.apply(console, arguments)
+}
+
+function warn() {
+ console.log.apply(console, arguments)
+}
+
+function error() {
+ console.warn.apply(console, arguments)
+}
+
+function time(label) {
+ times[label] = now()
+}
+
+function timeEnd(label) {
+ var time = times[label]
+ if (!time) {
+ throw new Error("No such label: " + label)
+ }
+
+ var duration = now() - time
+ console.log(label + ": " + duration + "ms")
+}
+
+function trace() {
+ var err = new Error()
+ err.name = "Trace"
+ err.message = util.format.apply(null, arguments)
+ console.error(err.stack)
+}
+
+function dir(object) {
+ console.log(util.inspect(object) + "\n")
+}
+
+function consoleAssert(expression) {
+ if (!expression) {
+ var arr = slice.call(arguments, 1)
+ assert.ok(false, util.format.apply(null, arr))
+ }
+}
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+
+},{"assert":2,"date-now":4,"util":24}],4:[function(require,module,exports){
+module.exports = now
+
+function now() {
+ return new Date().getTime()
+}
+
+},{}],5:[function(require,module,exports){
+/*
+ evol.colorpicker 3.2.2
+ (c) 2015 Olivier Giulieri
+ http://evoluteur.github.io/colorpicker/
+*/
+!function(a,b){var c=0,d=window.navigator.userAgent,e=d.indexOf("MSIE ")>0,f=e?"-ie":"",g=e?!1:/mozilla/.test(d.toLowerCase())&&!/webkit/.test(d.toLowerCase()),h=[],i=["ffffff","000000","eeece1","1f497d","4f81bd","c0504d","9bbb59","8064a2","4bacc6","f79646"],j=["f2f2f2","7f7f7f","ddd9c3","c6d9f0","dbe5f1","f2dcdb","ebf1dd","e5e0ec","dbeef3","fdeada","d8d8d8","595959","c4bd97","8db3e2","b8cce4","e5b9b7","d7e3bc","ccc1d9","b7dde8","fbd5b5","bfbfbf","3f3f3f","938953","548dd4","95b3d7","d99694","c3d69b","b2a2c7","92cddc","fac08f","a5a5a5","262626","494429","17365d","366092","953734","76923c","5f497a","31859b","e36c09","7f7f7f","0c0c0c","1d1b10","0f243e","244061","632423","4f6128","3f3151","205867","974806"],k=["c00000","ff0000","ffc000","ffff00","92d050","00b050","00b0f0","0070c0","002060","7030a0"],l=[["003366","336699","3366cc","003399","000099","0000cc","000066"],["006666","006699","0099cc","0066cc","0033cc","0000ff","3333ff","333399"],["669999","009999","33cccc","00ccff","0099ff","0066ff","3366ff","3333cc","666699"],["339966","00cc99","00ffcc","00ffff","33ccff","3399ff","6699ff","6666ff","6600ff","6600cc"],["339933","00cc66","00ff99","66ffcc","66ffff","66ccff","99ccff","9999ff","9966ff","9933ff","9900ff"],["006600","00cc00","00ff00","66ff99","99ffcc","ccffff","ccccff","cc99ff","cc66ff","cc33ff","cc00ff","9900cc"],["003300","009933","33cc33","66ff66","99ff99","ccffcc","ffffff","ffccff","ff99ff","ff66ff","ff00ff","cc00cc","660066"],["333300","009900","66ff33","99ff66","ccff99","ffffcc","ffcccc","ff99cc","ff66cc","ff33cc","cc0099","993399"],["336600","669900","99ff33","ccff66","ffff99","ffcc99","ff9999","ff6699","ff3399","cc3399","990099"],["666633","99cc00","ccff33","ffff66","ffcc66","ff9966","ff6666","ff0066","d60094","993366"],["a58800","cccc00","ffff00","ffcc00","ff9933","ff6600","ff0033","cc0066","660033"],["996633","cc9900","ff9900","cc6600","ff3300","ff0000","cc0000","990033"],["663300","996600","cc3300","993300","990000","800000","993333"]],m="#0000ffff",n=function(a){var b=a.toString(16);return 1==b.length&&(b="0"+b),b},o=function(a){return n(Number(a))},p=function(a){var b=n(a);return b+b+b},q=function(a){if(a.length>10){var b=1+a.indexOf("("),c=a.indexOf(")"),d=a.substring(b,c).split(",");return["#",o(d[0]),o(d[1]),o(d[2])].join("")}return a};a.widget("evol.colorpicker",{version:"3.2.1",options:{color:null,showOn:"both",hideButton:!1,displayIndicator:!0,transparentColor:!1,history:!0,defaultPalette:"theme",strings:"Theme Colors,Standard Colors,Web Colors,Theme Colors,Back to Palette,History,No history yet."},_active:!1,_create:function(){var b=this;switch(this._paletteIdx="theme"==this.options.defaultPalette?1:2,this._id="evo-cp"+c++,this._enabled=!0,this.options.showOn=this.options.hideButton?"focus":this.options.showOn,this.element.get(0).tagName){case"INPUT":var d=this.options.color,h=this.element,i=("focus"===this.options.showOn?"":"evo-pointer ")+"evo-colorind"+(g?"-ff":f)+(this.options.hideButton?" evo-hidden-button":""),j="";if(this._isPopup=!0,this._palette=null,null!==d)h.val(d);else{var k=h.val();""!==k&&(d=this.options.color=k)}d===m?i+=" evo-transparent":j=null!==d?"background-color:"+d:"",h.addClass("colorPicker "+this._id).wrap('
').after('
').on("keyup onpaste",function(c){var d=a(this).val();d!=b.options.color&&b._setValue(d,!0)});var l=this.options.showOn;("both"===l||"focus"===l)&&h.on("focus",function(){b.showPalette()}),("both"===l||"button"===l)&&h.next().on("click",function(a){return a.stopPropagation(),b.showPalette(),!1});break;default:this._isPopup=!1,this._palette=this.element.html(this._paletteHTML()).attr("aria-haspopup","true"),this._bindColors()}if(this.options.history&&(d&&this._add2History(d),this.options.initialHistory)){var n=this.options.initialHistory;for(var o in n)this._add2History(n[o])}},_paletteHTML:function(){var a=this._paletteIdx=Math.abs(this._paletteIdx),b=this.options,c=b.strings.split(","),d='"+this["_paletteHTML"+a]()+' ",b.displayIndicator&&(d+=this._colorIndHTML(this.options.color)+this._colorIndHTML("")),d+="
',h=''+g+b[0]+"",l=0;10>l;l++)h+=c+i[l]+d;for(h+=" ",e||(h+='',l=0;10>l;l++)h+=c+j[l]+d;for(var m=1;4>m;m++)for(h+=' ',l=0;10>l;l++)h+=c+j[10*m+l]+d;for(h+=' ',l=40;50>l;l++)h+=c+j[l]+d;for(h+=" "+g,a.transparentColor&&(h+='
'),h+=b[1]+"",l=0;10>l;l++)h+=c+k[l]+d;return h+="
"},_paletteHTML2:function(){for(var a,b,c='
',j=0,k=l.length;k>j;j++){i+=g;var m=l[j];for(a=0,b=m.length;b>a;a++)i+=c+m[a]+d;i+=h}i+='
';var n="";for(i+=g,a=255;a>10;a-=10)i+=c+p(a)+d,a-=10,n+=c+p(a)+d;return i+=h+g+n+h+"
'];if(0===h.length)g.push("
",f[6],"
");else for(var i=h.length-1;i>-1;i--)9===h[i].length?g.push('
'):g.push('
');g.push("
+
+
+
+
+
+
+
+
+
+ {{#if user }}
+
+
+ {{else}}
+
+
+
+ {{/if}}
+
+
+
+
+
+
+ {{#if indexPage}}
+
+ {{/if}}
+
+
+
+ {{flash_messages}} {{{body}}}
+
+
+
+
+
+ {{#unless reactEntryPoint}}
+
+
+
+
+
+
+
+
+
+ {{#if useEditor}}
+
+
+
+ {{/if}}
+ {{/unless}}
+
+ {{> tracking_scripts}}
+
+
+
+
diff --git a/views/lists/create.hbs b/obsolete/views/lists/create.hbs
similarity index 100%
rename from views/lists/create.hbs
rename to obsolete/views/lists/create.hbs
diff --git a/views/lists/edit.hbs b/obsolete/views/lists/edit.hbs
similarity index 100%
rename from views/lists/edit.hbs
rename to obsolete/views/lists/edit.hbs
diff --git a/views/lists/fields/create.hbs b/obsolete/views/lists/fields/create.hbs
similarity index 100%
rename from views/lists/fields/create.hbs
rename to obsolete/views/lists/fields/create.hbs
diff --git a/views/lists/fields/edit.hbs b/obsolete/views/lists/fields/edit.hbs
similarity index 100%
rename from views/lists/fields/edit.hbs
rename to obsolete/views/lists/fields/edit.hbs
diff --git a/views/lists/fields/fields.hbs b/obsolete/views/lists/fields/fields.hbs
similarity index 100%
rename from views/lists/fields/fields.hbs
rename to obsolete/views/lists/fields/fields.hbs
diff --git a/views/lists/forms/create.hbs b/obsolete/views/lists/forms/create.hbs
similarity index 100%
rename from views/lists/forms/create.hbs
rename to obsolete/views/lists/forms/create.hbs
diff --git a/views/lists/forms/edit.hbs b/obsolete/views/lists/forms/edit.hbs
similarity index 100%
rename from views/lists/forms/edit.hbs
rename to obsolete/views/lists/forms/edit.hbs
diff --git a/views/lists/forms/forms.hbs b/obsolete/views/lists/forms/forms.hbs
similarity index 100%
rename from views/lists/forms/forms.hbs
rename to obsolete/views/lists/forms/forms.hbs
diff --git a/views/lists/lists.hbs b/obsolete/views/lists/lists.hbs
similarity index 100%
rename from views/lists/lists.hbs
rename to obsolete/views/lists/lists.hbs
diff --git a/views/lists/segments/create.hbs b/obsolete/views/lists/segments/create.hbs
similarity index 100%
rename from views/lists/segments/create.hbs
rename to obsolete/views/lists/segments/create.hbs
diff --git a/views/lists/segments/edit.hbs b/obsolete/views/lists/segments/edit.hbs
similarity index 100%
rename from views/lists/segments/edit.hbs
rename to obsolete/views/lists/segments/edit.hbs
diff --git a/views/lists/segments/rule-configure.hbs b/obsolete/views/lists/segments/rule-configure.hbs
similarity index 100%
rename from views/lists/segments/rule-configure.hbs
rename to obsolete/views/lists/segments/rule-configure.hbs
diff --git a/views/lists/segments/rule-create.hbs b/obsolete/views/lists/segments/rule-create.hbs
similarity index 100%
rename from views/lists/segments/rule-create.hbs
rename to obsolete/views/lists/segments/rule-create.hbs
diff --git a/views/lists/segments/rule-edit.hbs b/obsolete/views/lists/segments/rule-edit.hbs
similarity index 100%
rename from views/lists/segments/rule-edit.hbs
rename to obsolete/views/lists/segments/rule-edit.hbs
diff --git a/views/lists/segments/segments.hbs b/obsolete/views/lists/segments/segments.hbs
similarity index 100%
rename from views/lists/segments/segments.hbs
rename to obsolete/views/lists/segments/segments.hbs
diff --git a/views/lists/segments/view.hbs b/obsolete/views/lists/segments/view.hbs
similarity index 100%
rename from views/lists/segments/view.hbs
rename to obsolete/views/lists/segments/view.hbs
diff --git a/views/lists/subscription/add.hbs b/obsolete/views/lists/subscription/add.hbs
similarity index 100%
rename from views/lists/subscription/add.hbs
rename to obsolete/views/lists/subscription/add.hbs
diff --git a/views/lists/subscription/edit.hbs b/obsolete/views/lists/subscription/edit.hbs
similarity index 100%
rename from views/lists/subscription/edit.hbs
rename to obsolete/views/lists/subscription/edit.hbs
diff --git a/views/lists/subscription/import-failed.hbs b/obsolete/views/lists/subscription/import-failed.hbs
similarity index 100%
rename from views/lists/subscription/import-failed.hbs
rename to obsolete/views/lists/subscription/import-failed.hbs
diff --git a/views/lists/subscription/import-preview.hbs b/obsolete/views/lists/subscription/import-preview.hbs
similarity index 100%
rename from views/lists/subscription/import-preview.hbs
rename to obsolete/views/lists/subscription/import-preview.hbs
diff --git a/views/lists/subscription/import.hbs b/obsolete/views/lists/subscription/import.hbs
similarity index 100%
rename from views/lists/subscription/import.hbs
rename to obsolete/views/lists/subscription/import.hbs
diff --git a/views/lists/view.hbs b/obsolete/views/lists/view.hbs
similarity index 100%
rename from views/lists/view.hbs
rename to obsolete/views/lists/view.hbs
diff --git a/views/mosaico/editor.hbs b/obsolete/views/mosaico/editor.hbs
similarity index 100%
rename from views/mosaico/editor.hbs
rename to obsolete/views/mosaico/editor.hbs
diff --git a/views/mosaico/layout-editor.hbs b/obsolete/views/mosaico/layout-editor.hbs
similarity index 100%
rename from views/mosaico/layout-editor.hbs
rename to obsolete/views/mosaico/layout-editor.hbs
diff --git a/views/partials/codeeditor.hbs b/obsolete/views/partials/codeeditor.hbs
similarity index 100%
rename from views/partials/codeeditor.hbs
rename to obsolete/views/partials/codeeditor.hbs
diff --git a/views/partials/editor-bridge.hbs b/obsolete/views/partials/editor-bridge.hbs
similarity index 100%
rename from views/partials/editor-bridge.hbs
rename to obsolete/views/partials/editor-bridge.hbs
diff --git a/views/partials/editor-navbar.hbs b/obsolete/views/partials/editor-navbar.hbs
similarity index 100%
rename from views/partials/editor-navbar.hbs
rename to obsolete/views/partials/editor-navbar.hbs
diff --git a/views/partials/grapejs.hbs b/obsolete/views/partials/grapejs.hbs
similarity index 100%
rename from views/partials/grapejs.hbs
rename to obsolete/views/partials/grapejs.hbs
diff --git a/views/partials/html-preview.hbs b/obsolete/views/partials/html-preview.hbs
similarity index 100%
rename from views/partials/html-preview.hbs
rename to obsolete/views/partials/html-preview.hbs
diff --git a/views/partials/html-to-text.hbs b/obsolete/views/partials/html-to-text.hbs
similarity index 100%
rename from views/partials/html-to-text.hbs
rename to obsolete/views/partials/html-to-text.hbs
diff --git a/views/partials/merge-tag-reference.hbs b/obsolete/views/partials/merge-tag-reference.hbs
similarity index 100%
rename from views/partials/merge-tag-reference.hbs
rename to obsolete/views/partials/merge-tag-reference.hbs
diff --git a/views/partials/modal-carousel.hbs b/obsolete/views/partials/modal-carousel.hbs
similarity index 100%
rename from views/partials/modal-carousel.hbs
rename to obsolete/views/partials/modal-carousel.hbs
diff --git a/views/partials/mosaico.hbs b/obsolete/views/partials/mosaico.hbs
similarity index 100%
rename from views/partials/mosaico.hbs
rename to obsolete/views/partials/mosaico.hbs
diff --git a/views/partials/plaintext.hbs b/obsolete/views/partials/plaintext.hbs
similarity index 100%
rename from views/partials/plaintext.hbs
rename to obsolete/views/partials/plaintext.hbs
diff --git a/views/partials/summernote.hbs b/obsolete/views/partials/summernote.hbs
similarity index 100%
rename from views/partials/summernote.hbs
rename to obsolete/views/partials/summernote.hbs
diff --git a/views/reports/create-select-template.hbs b/obsolete/views/reports/create-select-template.hbs
similarity index 100%
rename from views/reports/create-select-template.hbs
rename to obsolete/views/reports/create-select-template.hbs
diff --git a/views/reports/create.hbs b/obsolete/views/reports/create.hbs
similarity index 100%
rename from views/reports/create.hbs
rename to obsolete/views/reports/create.hbs
diff --git a/views/reports/edit.hbs b/obsolete/views/reports/edit.hbs
similarity index 100%
rename from views/reports/edit.hbs
rename to obsolete/views/reports/edit.hbs
diff --git a/views/reports/output.hbs b/obsolete/views/reports/output.hbs
similarity index 100%
rename from views/reports/output.hbs
rename to obsolete/views/reports/output.hbs
diff --git a/views/reports/partials/report-fields.hbs b/obsolete/views/reports/partials/report-fields.hbs
similarity index 100%
rename from views/reports/partials/report-fields.hbs
rename to obsolete/views/reports/partials/report-fields.hbs
diff --git a/views/reports/partials/report-select-template.hbs b/obsolete/views/reports/partials/report-select-template.hbs
similarity index 100%
rename from views/reports/partials/report-select-template.hbs
rename to obsolete/views/reports/partials/report-select-template.hbs
diff --git a/views/reports/reports.hbs b/obsolete/views/reports/reports.hbs
similarity index 100%
rename from views/reports/reports.hbs
rename to obsolete/views/reports/reports.hbs
diff --git a/views/reports/view.hbs b/obsolete/views/reports/view.hbs
similarity index 100%
rename from views/reports/view.hbs
rename to obsolete/views/reports/view.hbs
diff --git a/views/settings.hbs b/obsolete/views/settings.hbs
similarity index 100%
rename from views/settings.hbs
rename to obsolete/views/settings.hbs
diff --git a/views/templates/create.hbs b/obsolete/views/templates/create.hbs
similarity index 100%
rename from views/templates/create.hbs
rename to obsolete/views/templates/create.hbs
diff --git a/views/templates/edit.hbs b/obsolete/views/templates/edit.hbs
similarity index 100%
rename from views/templates/edit.hbs
rename to obsolete/views/templates/edit.hbs
diff --git a/views/templates/templates.hbs b/obsolete/views/templates/templates.hbs
similarity index 100%
rename from views/templates/templates.hbs
rename to obsolete/views/templates/templates.hbs
diff --git a/views/triggers/create-select.hbs b/obsolete/views/triggers/create-select.hbs
similarity index 100%
rename from views/triggers/create-select.hbs
rename to obsolete/views/triggers/create-select.hbs
diff --git a/views/triggers/create.hbs b/obsolete/views/triggers/create.hbs
similarity index 100%
rename from views/triggers/create.hbs
rename to obsolete/views/triggers/create.hbs
diff --git a/views/triggers/edit.hbs b/obsolete/views/triggers/edit.hbs
similarity index 100%
rename from views/triggers/edit.hbs
rename to obsolete/views/triggers/edit.hbs
diff --git a/views/triggers/triggered.hbs b/obsolete/views/triggers/triggered.hbs
similarity index 100%
rename from views/triggers/triggered.hbs
rename to obsolete/views/triggers/triggered.hbs
diff --git a/views/triggers/triggers.hbs b/obsolete/views/triggers/triggers.hbs
similarity index 100%
rename from views/triggers/triggers.hbs
rename to obsolete/views/triggers/triggers.hbs
diff --git a/routes/account-legacy-integration.js b/routes/account-legacy-integration.js
deleted file mode 100644
index 2a5c2ebb..00000000
--- a/routes/account-legacy-integration.js
+++ /dev/null
@@ -1,15 +0,0 @@
-'use strict';
-
-const _ = require('../lib/translate')._;
-const clientHelpers = require('../lib/client-helpers');
-
-const router = require('../lib/router-async').create();
-
-router.get('/logout', (req, res) => {
- req.logout();
- res.redirect('/');
-});
-
-clientHelpers.registerRootRoute(router, 'account', _('Account'));
-
-module.exports = router;
\ No newline at end of file
diff --git a/routes/blacklist-legacy-integration.js b/routes/blacklist-legacy-integration.js
deleted file mode 100644
index 64e79a80..00000000
--- a/routes/blacklist-legacy-integration.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-const _ = require('../lib/translate')._;
-const clientHelpers = require('../lib/client-helpers');
-
-const router = require('../lib/router-async').create();
-
-clientHelpers.registerRootRoute(router, 'blacklist', _('Blacklist'));
-
-module.exports = router;
\ No newline at end of file
diff --git a/routes/lists-legacy-integration.js b/routes/lists-legacy-integration.js
deleted file mode 100644
index 4c41bd54..00000000
--- a/routes/lists-legacy-integration.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-const _ = require('../lib/translate')._;
-const clientHelpers = require('../lib/client-helpers');
-
-const router = require('../lib/router-async').create();
-
-clientHelpers.registerRootRoute(router, 'lists', _('Lists'));
-
-module.exports = router;
\ No newline at end of file
diff --git a/routes/mosaico.js b/routes/mosaico.js
index adb7a564..0ea91ec8 100644
--- a/routes/mosaico.js
+++ b/routes/mosaico.js
@@ -1,57 +1,49 @@
'use strict';
-let config = require('config');
-let express = require('express');
-let router = new express.Router();
-let passport = require('../lib/passport');
-let fs = require('fs');
-let path = require('path');
-let _ = require('../lib/translate')._;
-let editorHelpers = require('../lib/editor-helpers');
+const config = require('config');
+const router = require('../lib/router-async').create();
+const passport = require('../lib/passport');
+const clientHelpers = require('../lib/client-helpers');
-router.all('/*', (req, res, next) => {
- if (!req.user) {
- req.flash('danger', _('Need to be logged in to access restricted content'));
- return res.redirect('/account/login?next=' + encodeURIComponent(req.originalUrl));
+const bluebird = require('bluebird');
+const fsReadFile = bluebird.promisify(require('fs').readFile);
+
+const path = require('path');
+
+// FIXME - add authentication by sandboxToken
+
+
+router.getAsync('/editor', passport.csrfProtection, async (req, res) => {
+ const resourceType = req.query.type;
+ const resourceId = req.query.id;
+
+ const mailtrainConfig = await clientHelpers.getAnonymousConfig(req.context);
+
+ let languageStrings = null;
+ if (config.language && config.language !== 'en') {
+ const lang = config.language.split('_')[0];
+ try {
+ const file = path.join(__dirname, '..', 'client', 'public', 'mosaico', 'lang', 'mosaico-' + lang + '.json');
+ languageStrings = await fsReadFile(file, 'utf8');
+ } catch (err) {
+ }
}
- next();
-});
-
-router.get('/editor', passport.csrfProtection, (req, res) => {
- editorHelpers.getResource(req.query.type, req.query.id, (err, resource) => {
- if (err) {
- req.flash('danger', err.message || err);
- return res.redirect('/');
- }
-
- let getLanguageStrings = language => {
- if (!language || language === 'en') {
- return null;
- }
- language = language.split('_')[0];
- try {
- let file = path.join(__dirname, '..', 'public', 'mosaico', 'dist', 'lang', 'mosaico-' + language + '.json');
- return fs.readFileSync(file, 'utf8');
- } catch (err) {
- return null;
- }
- }
+ /* ????
resource.editorName = resource.editorName || 'mosaico';
resource.editorData = !resource.editorData ?
{
template: req.query.template || 'versafix-1'
} :
JSON.parse(resource.editorData);
+ */
- res.render('mosaico/editor', {
- layout: 'mosaico/layout-editor',
- type: req.query.type,
- resource,
- editorConfig: config.mosaico,
- languageStrings: getLanguageStrings(config.language),
- csrfToken: req.csrfToken(),
- });
+ res.render('mosaico/root', {
+ layout: 'mosaico/layout',
+ editorConfig: config.mosaico,
+ languageStrings: languageStrings,
+ reactCsrfToken: req.csrfToken(),
+ mailtrainConfig: JSON.stringify(mailtrainConfig)
});
});
diff --git a/routes/namespaces-legacy-integration.js b/routes/namespaces-legacy-integration.js
deleted file mode 100644
index 4fa00cac..00000000
--- a/routes/namespaces-legacy-integration.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-const _ = require('../lib/translate')._;
-const clientHelpers = require('../lib/client-helpers');
-
-const router = require('../lib/router-async').create();
-
-clientHelpers.registerRootRoute(router, 'namespaces', _('Namespaces'));
-
-module.exports = router;
\ No newline at end of file
diff --git a/routes/reports-legacy-integration.js b/routes/reports-legacy-integration.js
deleted file mode 100644
index d0654bf6..00000000
--- a/routes/reports-legacy-integration.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-const _ = require('../lib/translate')._;
-const clientHelpers = require('../lib/client-helpers');
-
-const router = require('../lib/router-async').create();
-
-clientHelpers.registerRootRoute(router, 'reports', _('Reports'));
-
-module.exports = router;
\ No newline at end of file
diff --git a/routes/rest/account.js b/routes/rest/account.js
index c6db2075..fd8085d3 100644
--- a/routes/rest/account.js
+++ b/routes/rest/account.js
@@ -42,7 +42,7 @@ router.postAsync('/access-token-reset', passport.loggedIn, passport.csrfProtecti
router.post('/login', passport.csrfProtection, passport.restLogin);
-router.post('/logout', passport.csrfProtection, passport.restLogout); // TODO - this endpoint is currently not in use. It will become relevant once we switch to SPA
+router.post('/logout', passport.csrfProtection, passport.restLogout);
router.postAsync('/password-reset-send', passport.csrfProtection, async (req, res) => {
await users.sendPasswordReset(req.body.usernameOrEmail);
diff --git a/routes/root.js b/routes/root.js
new file mode 100644
index 00000000..e1cdf11f
--- /dev/null
+++ b/routes/root.js
@@ -0,0 +1,22 @@
+'use strict';
+
+const passport = require('../lib/passport');
+const _ = require('../lib/translate')._;
+const clientHelpers = require('../lib/client-helpers');
+
+const router = require('../lib/router-async').create();
+
+router.getAsync('/*', passport.csrfProtection, async (req, res) => {
+ const mailtrainConfig = await clientHelpers.getAnonymousConfig(req.context);
+ if (req.user) {
+ Object.assign(mailtrainConfig, await clientHelpers.getAuthenticatedConfig(req.context));
+ }
+
+ res.render('root', {
+ reactCsrfToken: req.csrfToken(),
+ mailtrainConfig: JSON.stringify(mailtrainConfig)
+ });
+});
+
+
+module.exports = router;
\ No newline at end of file
diff --git a/routes/templates-legacy-integration.js b/routes/templates-legacy-integration.js
deleted file mode 100644
index aed6488d..00000000
--- a/routes/templates-legacy-integration.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-const _ = require('../lib/translate')._;
-const clientHelpers = require('../lib/client-helpers');
-
-const router = require('../lib/router-async').create();
-
-clientHelpers.registerRootRoute(router, 'templates', _('Templates'));
-
-module.exports = router;
\ No newline at end of file
diff --git a/routes/users-legacy-integration.js b/routes/users-legacy-integration.js
deleted file mode 100644
index 6b6c0f52..00000000
--- a/routes/users-legacy-integration.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-const _ = require('../lib/translate')._;
-const clientHelpers = require('../lib/client-helpers');
-
-const router = require('../lib/router-async').create();
-
-clientHelpers.registerRootRoute(router, 'users', _('Users'));
-
-module.exports = router;
\ No newline at end of file
diff --git a/views/layout.hbs b/views/layout.hbs
index 4c98a2a2..b0aca23c 100644
--- a/views/layout.hbs
+++ b/views/layout.hbs
@@ -7,200 +7,31 @@
Mailtrain
{{#if title}} | {{title}}{{/if}}
- {{#if reactEntryPoint}}
-
-
-
-
-
-
-
-
-
-
- {{#if user }}
-
-
- {{else}}
-
-
-
- {{/if}}
-
-
-
-
-
-
- {{#if indexPage}}
-
- {{/if}}
-
-
-
- {{flash_messages}} {{{body}}}
-
-
-
-
-
- {{#unless reactEntryPoint}}
-
-
-
-
-
-
-
-
-
- {{#if useEditor}}
-
-
-
- {{/if}}
- {{/unless}}
+ {{{body}}}
{{> tracking_scripts}}
diff --git a/views/mosaico/layout.hbs b/views/mosaico/layout.hbs
new file mode 100644
index 00000000..da8fbd7c
--- /dev/null
+++ b/views/mosaico/layout.hbs
@@ -0,0 +1,56 @@
+
+
+
+ Mailtrain
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{#if languageStrings}}{{/if}}
+
+
+
+ {{#if editorConfig.customscripts}}
+ {{#each editorConfig.customscripts}}
+
+ {{/each}}
+ {{/if}}
+
+
+
+
+
+
+
+
\ No newline at end of file
