- {primaryMenuComponent}
-
- {t('loading')}
-
+ content = (
+
+ {t('loading')}
);
}
+
+ return (
+
+
+ {primaryMenuComponent}
+
+
+
+
+ {content}
+
+
+
+
+
+ );
}
}
}
@@ -350,14 +365,14 @@ export class SectionContent extends Component {
ensureAuthenticated() {
if (!mailtrainConfig.isAuthenticated) {
- this.navigateTo('/account/login?next=' + encodeURIComponent(window.location.pathname));
+ this.navigateTo('/login?next=' + encodeURIComponent(window.location.pathname));
}
}
errorHandler(error) {
if (error instanceof interoperableErrors.NotLoggedInError) {
- if (window.location.pathname !== '/account/login') { // There may be multiple async requests failing at the same time. So we take the pathname only from the first one.
- this.navigateTo('/account/login?next=' + encodeURIComponent(window.location.pathname));
+ if (window.location.pathname !== '/login') { // There may be multiple async requests failing at the same time. So we take the pathname only from the first one.
+ this.navigateTo('/login?next=' + encodeURIComponent(window.location.pathname));
}
} else if (error.response && error.response.data && error.response.data.message) {
console.error(error);
diff --git a/client/src/lib/public-path.js b/client/src/lib/public-path.js
index f408e853..d8744eaf 100644
--- a/client/src/lib/public-path.js
+++ b/client/src/lib/public-path.js
@@ -2,4 +2,4 @@
import {getUrl} from "./urls";
-__webpack_public_path__ = getUrl('mailtrain/');
+__webpack_public_path__ = getUrl('client/');
diff --git a/client/src/lib/styles.scss b/client/src/lib/styles.scss
index 095d5eaa..d7999c9e 100644
--- a/client/src/lib/styles.scss
+++ b/client/src/lib/styles.scss
@@ -1,4 +1,4 @@
-@import "../../static/scss/variables";
+@import "../scss/variables.scss";
.form { // This is here to give the styles below higher priority than Bootstrap has
:global .DayPicker {
diff --git a/client/src/lib/tree.js b/client/src/lib/tree.js
index 13b84370..d7b21dfc 100644
--- a/client/src/lib/tree.js
+++ b/client/src/lib/tree.js
@@ -9,9 +9,9 @@ import PropTypes
import jQuery
from 'jquery';
-import '../../vendor/jquery/jquery-ui-1.12.1.min.js';
-import '../../vendor/fancytree/jquery.fancytree-all.min.js';
-import '../../vendor/fancytree/skin-bootstrap/ui.fancytree.min.css';
+import '../../static/jquery/jquery-ui-1.12.1.min.js';
+import '../../static/fancytree/jquery.fancytree-all.min.js';
+import '../../static/fancytree/skin-bootstrap/ui.fancytree.min.css';
import './tree.scss';
import axios
from './axios';
diff --git a/client/src/lib/tree.scss b/client/src/lib/tree.scss
index 914f987b..78c22a04 100644
--- a/client/src/lib/tree.scss
+++ b/client/src/lib/tree.scss
@@ -1,4 +1,4 @@
-@import "../../static/scss/variables.scss";
+@import "../scss/variables.scss";
:global {
diff --git a/client/src/account/Forgot.js b/client/src/login/Forgot.js
similarity index 95%
rename from client/src/account/Forgot.js
rename to client/src/login/Forgot.js
index 167a9a50..0193cf22 100644
--- a/client/src/account/Forgot.js
+++ b/client/src/login/Forgot.js
@@ -54,7 +54,7 @@ export default class Forget extends Component {
const submitSuccessful = await this.validateAndSendFormValuesToURL(FormSendMethod.POST, 'rest/password-reset-send');
if (submitSuccessful) {
- this.navigateToWithFlashMessage('/account/login', 'success', t('ifTheUsernameEmailExistsInTheSystem'));
+ this.navigateToWithFlashMessage('/login', 'success', t('ifTheUsernameEmailExistsInTheSystem'));
} else {
this.enableForm();
this.setFormStatusMessage('warning', t('pleaseEnterYourUsernameEmailAndTryAgain'));
diff --git a/client/src/account/Login.js b/client/src/login/Login.js
similarity index 96%
rename from client/src/account/Login.js
rename to client/src/login/Login.js
index 7ba7bb4d..4834ac0d 100644
--- a/client/src/account/Login.js
+++ b/client/src/login/Login.js
@@ -106,7 +106,7 @@ export default class Login extends Component {
let passwordResetLink;
if (mailtrainConfig.isAuthMethodLocal) {
- passwordResetLink =
{t('forgotYourPassword?')};
+ passwordResetLink =
{t('forgotYourPassword?')};
} else if (mailtrainConfig.externalPasswordResetLink) {
passwordResetLink =
{t('forgotYourPassword?')};
}
diff --git a/client/src/account/Reset.js b/client/src/login/Reset.js
similarity index 93%
rename from client/src/account/Reset.js
rename to client/src/login/Reset.js
index 50f91c49..08316b95 100644
--- a/client/src/account/Reset.js
+++ b/client/src/login/Reset.js
@@ -114,7 +114,7 @@ export default class Account extends Component {
});
if (submitSuccessful) {
- this.navigateToWithFlashMessage('/account/login', 'success', t('passwordReset-1'));
+ this.navigateToWithFlashMessage('/login', 'success', t('passwordReset-1'));
} else {
this.enableForm();
this.setFormStatusMessage('warning', t('thereAreErrorsInTheFormPleaseFixThemAnd'));
@@ -124,7 +124,7 @@ export default class Account extends Component {
this.setFormStatusMessage('danger',
{t('yourPasswordCannotBeReset')}{' '}
- {t('thePasswordResetTokenHasExpired')}{' '}{t('clickHereToRequestANewPasswordResetLink')}
+ {t('thePasswordResetTokenHasExpired')}{' '}{t('clickHereToRequestANewPasswordResetLink')}
);
return;
@@ -147,7 +147,7 @@ export default class Account extends Component {
{t('thePasswordCannotBeReset')}
-
{t('thePasswordResetTokenHasExpired')}{' '}{t('clickHereToRequestANewPasswordResetLink')}
+
{t('thePasswordResetTokenHasExpired')}{' '}{t('clickHereToRequestANewPasswordResetLink')}
);
diff --git a/client/src/login/root.js b/client/src/login/root.js
new file mode 100644
index 00000000..1a2e0f5f
--- /dev/null
+++ b/client/src/login/root.js
@@ -0,0 +1,47 @@
+'use strict';
+
+import React
+ from 'react';
+import Login
+ from './Login';
+import Reset
+ from './Forgot';
+import ResetLink
+ from './Reset';
+import mailtrainConfig
+ from 'mailtrainConfig';
+
+
+function getMenus(t) {
+ const subPaths = {}
+
+ if (mailtrainConfig.isAuthMethodLocal) {
+ subPaths.forgot = {
+ title: t('passwordReset-1'),
+ extraParams: [':username?'],
+ link: '/login/forgot',
+ panelComponent: Reset
+ };
+
+ subPaths.reset = {
+ title: t('passwordReset-1'),
+ extraParams: [':username', ':resetToken'],
+ link: '/login/reset',
+ panelComponent: ResetLink
+ };
+ }
+
+ return {
+ 'login': {
+ title: t('signIn'),
+ link: '/login',
+ panelComponent: Login,
+
+ children: subPaths
+ }
+ };
+}
+
+export default {
+ getMenus
+}
diff --git a/client/src/root.js b/client/src/root.js
index 729c4d21..1fddf94b 100644
--- a/client/src/root.js
+++ b/client/src/root.js
@@ -9,6 +9,8 @@ import {I18nextProvider} from 'react-i18next';
import i18n, {withTranslation} from './lib/i18n';
import account
from './account/root';
+import login
+ from './login/root';
import blacklist
from './blacklist/root';
import lists
@@ -41,6 +43,7 @@ import Home
from "./Home";
import {
ActionLink,
+ ButtonDropdownActionLink,
Icon
} from "./lib/bootstrap-components";
import {Link} from "react-router-dom";
@@ -89,7 +92,7 @@ class Root extends Component {
const label = langDesc.getLabel(t);
languageOptions.push(
-
i18n.changeLanguage(langDesc.longCode)}>{label}
+
i18n.changeLanguage(langDesc.longCode)}>{label}
)
}
@@ -166,6 +169,7 @@ class Root extends Component {
panelComponent: Home,
primaryMenuComponent: MainMenu,
children: {
+ ...login.getMenus(t),
...lists.getMenus(t),
...reports.getMenus(t),
...templates.getMenus(t),
@@ -180,15 +184,7 @@ class Root extends Component {
};
return (
-
+
);
}
}
diff --git a/client/static/scss/.gitignore b/client/src/scss/.gitignore
similarity index 100%
rename from client/static/scss/.gitignore
rename to client/src/scss/.gitignore
diff --git a/client/src/scss/mailtrain.scss b/client/src/scss/mailtrain.scss
new file mode 100644
index 00000000..96e64c2d
--- /dev/null
+++ b/client/src/scss/mailtrain.scss
@@ -0,0 +1,51 @@
+$fa-font-path: "../static-npm/fontawesome";
+
+@import "./variables.scss";
+@import "node_modules/@coreui/coreui/scss/coreui.scss";
+@import "node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss";
+@import "node_modules/@fortawesome/fontawesome-free/scss/regular.scss";
+@import "node_modules/@fortawesome/fontawesome-free/scss/solid.scss";
+
+.custom-select {
+ -webkit-appearance: none; // This is a fix for Chrome
+}
+
+body.mailtrain {
+ background-color: white;
+
+ .app-header {
+ height: auto;
+ padding: 0;
+ flex: none;
+ border-bottom: 0px none;
+
+ .navbar-brand {
+ width: auto;
+ height: auto;
+ display: inline-block;
+ padding-top: $navbar-brand-padding-y;
+ padding-bottom: $navbar-brand-padding-y;
+ margin-right: $navbar-padding-x;
+ }
+
+ .nav-item {
+ min-width: 0px;
+ }
+ }
+
+ .main .container-fluid {
+ padding: 0 15px;
+ }
+
+ .navbar-dark {
+ .navbar-nav {
+ .active > .nav-link:hover {
+ color: $navbar-dark-active-color;
+ }
+ }
+ }
+
+ .gpg-text {
+ font-family: monospace;
+ }
+}
diff --git a/client/static/scss/variables.scss b/client/src/scss/variables.scss
similarity index 100%
rename from client/static/scss/variables.scss
rename to client/src/scss/variables.scss
diff --git a/client/src/templates/helpers.js b/client/src/templates/helpers.js
index 787ec60d..a678e5ad 100644
--- a/client/src/templates/helpers.js
+++ b/client/src/templates/helpers.js
@@ -607,7 +607,7 @@ export function getEditForm(owner, typeKey, prefix = '') {
height="400px"
mode="text"
label={t('templateContentPlainText')}
- help={To extract the text from HTML click here. Please note that your existing plaintext in the field above will be overwritten. This feature uses the Premailer API, a third party service. Their Terms of Service and Privacy Policy apply.}
+ help={To extract the text from HTML click here. Please note that your existing plaintext in the field above will be overwritten. This feature uses the Premailer API, a third party service. Their Terms of Service and Privacy Policy apply.}
/>