public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Work in progress on migration to Bootstrap 4 and CoreUI admin theme

Browse source
This commit is contained in:
Tomas Bures 2018-12-27 14:42:21 +01:00
parent 366bd09f2a
commit 3425e2c16a
85 changed files with 2093 additions and 10564 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server/app-builder.js
View file

@ -236,6 +236,11 @@ function createApp(appType) {
useWith404Fallback('/mailtrain', express.static(path.join(__dirname, '..', 'client', 'dist')));
useWith404Fallback('/locales', express.static(path.join(__dirname, '..', 'client', 'locales')));
useWith404Fallback('/static-npm/fontawesome', express.static(path.join(__dirname, '..', 'client', 'node_modules', '@fortawesome', 'fontawesome-free', 'webfonts')));
useWith404Fallback('/static-npm/popper.min.js', express.static(path.join(__dirname, '..', 'client', 'node_modules', 'popper.js', 'dist', 'umd', 'popper.min.js')));
useWith404Fallback('/static-npm/bootstrap.min.js', express.static(path.join(__dirname, '..', 'client', 'node_modules', 'bootstrap', 'dist', 'js', 'bootstrap.min.js')));
useWith404Fallback('/static-npm/coreui.min.js', express.static(path.join(__dirname, '..', 'client', 'node_modules', '@coreui', 'coreui', 'dist', 'js', 'coreui.min.js')));
// Make sure flash messages are available
// Currently, flash messages are used only from routes/subscription.js

33
server/package-lock.json generated
View file

@ -849,8 +849,9 @@
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
},
"bounce-handler": {
"version": "github:bures/node-bounce-handler#81ccca0d9c3bbc9efea54a9eaf5f10425e2153bb",
"from": "github:bures/node-bounce-handler#81ccca0d9c3bbc9efea54a9eaf5f10425e2153bb",
"version": "7.3.2-fork.3",
"resolved": "https://registry.npmjs.org/bounce-handler/-/bounce-handler-7.3.2-fork.3.tgz",
"integrity": "sha512-UD0eO38XmjaKr3rk5A0WWbFFs0XyF57bH1SkGBoyErOi+oDxVOieZwJUGSDL7pIb/Q1U8izz1zjOcIZ+O5bVBA==",
"requires": {
"libmime": "^2.0.3"
},
@ -2882,7 +2883,8 @@
},
"ansi-regex": {
"version": "2.1.1",
"bundled": true
"bundled": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
@ -3247,7 +3249,8 @@
},
"safe-buffer": {
"version": "5.1.1",
"bundled": true
"bundled": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
@ -3295,6 +3298,7 @@
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@ -3333,11 +3337,13 @@
},
"wrappy": {
"version": "1.0.2",
"bundled": true
"bundled": true,
"optional": true
},
"yallist": {
"version": "3.0.2",
"bundled": true
"bundled": true,
"optional": true
}
}
},
@ -6249,12 +6255,9 @@
"from": "github:openpgpjs/elliptic#e187e706e11fa51bcd20e46e5119054be4e2a4a6",
"requires": {
"bn.js": "^4.4.0",
"brorand": "^1.0.1",
"hash.js": "^1.0.0",
"hmac-drbg": "^1.0.0",
"inherits": "^2.0.1",
"minimalistic-assert": "^1.0.0",
"minimalistic-crypto-utils": "^1.0.0"
"minimalistic-assert": "^1.0.0"
}
},
"openpgp": {
@ -10753,22 +10756,16 @@
"commander": {
"version": "2.8.1",
"resolved": "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
"integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
"requires": {
"graceful-readlink": ">= 1.0.0"
}
"integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ="
},
"elliptic": {
"version": "github:openpgpjs/elliptic#e187e706e11fa51bcd20e46e5119054be4e2a4a6",
"from": "github:openpgpjs/elliptic#e187e706e11fa51bcd20e46e5119054be4e2a4a6",
"requires": {
"bn.js": "^4.4.0",
"brorand": "^1.0.1",
"hash.js": "^1.0.0",
"hmac-drbg": "^1.0.0",
"inherits": "^2.0.1",
"minimalistic-assert": "^1.0.0",
"minimalistic-crypto-utils": "^1.0.0"
"minimalistic-assert": "^1.0.0"
}
},
"node-fetch": {

3
server/routes/index.js
View file

@ -22,7 +22,8 @@ function getRouter(appType) {
mailtrainConfig: JSON.stringify(mailtrainConfig),
scriptFiles: [
getTrustedUrl('mailtrain/root.js')
]
],
publicPath: getTrustedUrl()
});
});
}

2
server/views/archive/layout-wrapped.hbs
View file

@ -6,8 +6,6 @@
<link rel="icon" href="{{publicPath}}static/favicon.ico">
<title>Mailtrain</title>
<link rel="stylesheet" href="/static/css/narrow.css">
</head>
<body>

2
server/views/ckeditor/layout.hbs
View file

@ -13,7 +13,7 @@
<title>Mailtrain</title>
<link rel="stylesheet" href="{{publicPath}}static/bootstrap/themes/united.min.css">
<script src="{{publicPath}}static/jquery-2.2.1.min.js"></script>
<script src="{{publicPath}}static/jquery-3.3.1.min.js"></script>
<script src="{{publicPath}}static/bootstrap/js/bootstrap.min.js"></script>
{{#if mailtrainConfig}}

2
server/views/codeeditor/layout.hbs
View file

@ -13,7 +13,7 @@
<title>Mailtrain</title>
<link rel="stylesheet" href="{{publicPath}}static/bootstrap/themes/united.min.css">
<script src="{{publicPath}}static/jquery-2.2.1.min.js"></script>
<script src="{{publicPath}}static/jquery-3.3.1.min.js"></script>
<script src="{{publicPath}}static/bootstrap/js/bootstrap.min.js"></script>
{{#if mailtrainConfig}}

2
server/views/grapesjs/layout.hbs
View file

@ -12,7 +12,7 @@
<title>Mailtrain</title>
<script src="{{publicPath}}static/jquery-2.2.1.min.js"></script>
<script src="{{publicPath}}static/jquery-3.3.1.min.js"></script>
{{#if mailtrainConfig}}
<script>

19
server/views/layout.hbs
View file

@ -14,12 +14,19 @@
{{#if title}} | {{title}}{{/if}}
</title>
<link rel="stylesheet" href="/static/bootstrap/themes/united.min.css">
<link rel="stylesheet" href="/static/css/footer.css">
<link rel="stylesheet" href="/static/css/mailtrain.css">
<script src="/static/jquery-2.2.1.min.js"></script>
<script src="/static/bootstrap/js/bootstrap.min.js"></script>
<link rel="stylesheet" href="{{publicPath}}mailtrain/mailtrain.css">
<script src="{{publicPath}}static/jquery-3.3.1.min.js"></script>
<script src="{{publicPath}}static-npm/popper.min.js"></script>
<script src="{{publicPath}}static-npm/bootstrap.min.js"></script>
<script src="{{publicPath}}static-npm/coreui.min.js"></script>
<script>
if (!window.location.href.startsWith('{{publicPath}}')) {
console.warn('Warning: Misconfigured urlBases. If the website does not work, check the settings of www.trustedUrlBase, www.sandboxUrlBase and www.publicUrlBase in server config file.');
}
</script>
{{#if mailtrainConfig}}
<script>
@ -33,7 +40,7 @@
{{/if}}
</head>
<body class="{{bodyClass}}">
<body class="mailtrain {{bodyClass}}">
{{{body}}}
{{> tracking_scripts}}