diff --git a/packages/webapp/lang/en.json b/packages/webapp/lang/en.json
index 966905f0..be7ff202 100644
--- a/packages/webapp/lang/en.json
+++ b/packages/webapp/lang/en.json
@@ -14,21 +14,42 @@
"footer.faq": {
"defaultMessage": "F.A.Q."
},
+ "footer.faqandhelp": {
+ "defaultMessage": "Help & FAQ"
+ },
"footer.feedback": {
"defaultMessage": "Feedback"
},
"footer.opensource": {
"defaultMessage": "Open Source"
},
+ "footer.others": {
+ "defaultMessage": "Others"
+ },
"footer.termsandconditions": {
"defaultMessage": "Term And Conditions"
},
+ "forgot.desc": {
+ "defaultMessage": "We will send you an email to reset your password"
+ },
+ "forgot.email": {
+ "defaultMessage": "Email"
+ },
+ "forgot.register": {
+ "defaultMessage": "Send recovery link"
+ },
+ "forgot.title": {
+ "defaultMessage": "Reset your password"
+ },
"header.donthaveaccount": {
"defaultMessage": "Don't have an account ?"
},
"header.haveaccount": {
"defaultMessage": "Already have an account?"
},
+ "login.desc": {
+ "defaultMessage": "Log Into Your Account"
+ },
"login.email": {
"defaultMessage": "Email"
},
@@ -42,9 +63,6 @@
"defaultMessage": "Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.7 instead. You can find more information how to configure MySQL",
"description": "Missing production database configured"
},
- "login.loginto": {
- "defaultMessage": "Log Into Your Account"
- },
"login.password": {
"defaultMessage": "Password"
},
@@ -57,14 +75,14 @@
"login.signup": {
"defaultMessage": "Sign Up"
},
+ "login.title": {
+ "defaultMessage": "Welcome"
+ },
"login.userinactive": {
"defaultMessage": "Sorry, your account has not been activated yet. You'll receive a notification login.email when it becomes active. Stay tuned!."
},
- "login.welcome": {
- "defaultMessage": "Welcome"
- },
- "registration.become": {
- "defaultMessage": "Become a member of our comunity"
+ "registration.desc": {
+ "defaultMessage": "Signing up is free and just take a moment"
},
"registration.email": {
"defaultMessage": "Email"
@@ -81,16 +99,16 @@
"registration.register": {
"defaultMessage": "Register"
},
- "registration.signup": {
- "defaultMessage": "Signing up is free and just take a moment"
- },
"registration.success.desc": {
- "defaultMessage": "Click to 'Sign In' button below and start creating mind maps."
+ "defaultMessage": "Click 'Sign In' button below and start creating mind maps."
},
"registration.success.title": {
"defaultMessage": "Your account has been created successfully"
},
"registration.termandconditions": {
"defaultMessage": "Terms of Service: Please check the WiseMapping Account information you've entered above, and review the Terms of Service here. By clicking on 'Register' below you are agreeing to the Terms of Service above and the Privacy Policy"
+ },
+ "registration.title": {
+ "defaultMessage": "Become a member of our comunity"
}
}
\ No newline at end of file
diff --git a/packages/webapp/package.json b/packages/webapp/package.json
index f9da0e6b..54c93a1a 100644
--- a/packages/webapp/package.json
+++ b/packages/webapp/package.json
@@ -29,6 +29,7 @@
"eslint": "^7.14.0",
"eslint-plugin-react": "^7.21.5",
"eslint-plugin-react-hooks": "^4.2.0",
+ "html-webpack-dynamic-env-plugin": "^0.0.2",
"html-webpack-plugin": "^4.5.0",
"sass-loader": "^10.1.0",
"style-loader": "^2.0.0",
diff --git a/packages/webapp/public/index.html b/packages/webapp/public/index.html
index c6de8b81..e74a7fd9 100644
--- a/packages/webapp/public/index.html
+++ b/packages/webapp/public/index.html
@@ -4,17 +4,17 @@
-
+
-
+
-
+
+
+
Loading | WiseMapping
diff --git a/packages/webapp/src/compiled-lang/en.json b/packages/webapp/src/compiled-lang/en.json
index c27fe187..4e830f4e 100644
--- a/packages/webapp/src/compiled-lang/en.json
+++ b/packages/webapp/src/compiled-lang/en.json
@@ -29,6 +29,12 @@
"value": "F.A.Q."
}
],
+ "footer.faqandhelp": [
+ {
+ "type": 0,
+ "value": "Help & FAQ"
+ }
+ ],
"footer.feedback": [
{
"type": 0,
@@ -41,12 +47,42 @@
"value": "Open Source"
}
],
+ "footer.others": [
+ {
+ "type": 0,
+ "value": "Others"
+ }
+ ],
"footer.termsandconditions": [
{
"type": 0,
"value": "Term And Conditions"
}
],
+ "forgot.desc": [
+ {
+ "type": 0,
+ "value": "We will send you an email to reset your password"
+ }
+ ],
+ "forgot.email": [
+ {
+ "type": 0,
+ "value": "Email"
+ }
+ ],
+ "forgot.register": [
+ {
+ "type": 0,
+ "value": "Send recovery link"
+ }
+ ],
+ "forgot.title": [
+ {
+ "type": 0,
+ "value": "Reset your password"
+ }
+ ],
"header.donthaveaccount": [
{
"type": 0,
@@ -59,6 +95,12 @@
"value": "Already have an account?"
}
],
+ "login.desc": [
+ {
+ "type": 0,
+ "value": "Log Into Your Account"
+ }
+ ],
"login.email": [
{
"type": 0,
@@ -83,12 +125,6 @@
"value": "Although HSQLDB is bundled with WiseMapping by default during the installation, we do not recommend this database for production use. Please consider using MySQL 5.7 instead. You can find more information how to configure MySQL"
}
],
- "login.loginto": [
- {
- "type": 0,
- "value": "Log Into Your Account"
- }
- ],
"login.password": [
{
"type": 0,
@@ -113,22 +149,22 @@
"value": "Sign Up"
}
],
+ "login.title": [
+ {
+ "type": 0,
+ "value": "Welcome"
+ }
+ ],
"login.userinactive": [
{
"type": 0,
"value": "Sorry, your account has not been activated yet. You'll receive a notification login.email when it becomes active. Stay tuned!."
}
],
- "login.welcome": [
+ "registration.desc": [
{
"type": 0,
- "value": "Welcome"
- }
- ],
- "registration.become": [
- {
- "type": 0,
- "value": "Become a member of our comunity"
+ "value": "Signing up is free and just take a moment"
}
],
"registration.email": [
@@ -161,16 +197,10 @@
"value": "Register"
}
],
- "registration.signup": [
- {
- "type": 0,
- "value": "Signing up is free and just take a moment"
- }
- ],
"registration.success.desc": [
{
"type": 0,
- "value": "Click to 'Sign In' button below and start creating mind maps."
+ "value": "Click 'Sign In' button below and start creating mind maps."
}
],
"registration.success.title": [
@@ -184,5 +214,11 @@
"type": 0,
"value": "Terms of Service: Please check the WiseMapping Account information you've entered above, and review the Terms of Service here. By clicking on 'Register' below you are agreeing to the Terms of Service above and the Privacy Policy"
}
+ ],
+ "registration.title": [
+ {
+ "type": 0,
+ "value": "Become a member of our comunity"
+ }
]
}
\ No newline at end of file
diff --git a/packages/webapp/webpack.config.js b/packages/webapp/webpack.config.js
index 1849ee9e..e574f909 100644
--- a/packages/webapp/webpack.config.js
+++ b/packages/webapp/webpack.config.js
@@ -1,8 +1,11 @@
const path = require('path');
const HtmlWebpackPlugin = require('html-webpack-plugin');
+const HtmlWebpackDynamicEnvPlugin = require('html-webpack-dynamic-env-plugin');
+
const webpack = require('webpack');
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
+
module.exports = {
mode: 'development',
devtool: 'eval-source-map',
@@ -44,11 +47,10 @@ module.exports = {
plugins: [
new CleanWebpackPlugin(),
new HtmlWebpackPlugin({
- template: path.join(__dirname, 'public/index.html')
- }),
- new webpack.DefinePlugin({
- 'process.env.NODE_ENV': JSON.stringify('development'),
- 'process.env.PUBLIC_URL': 'http://localhost:3000'
+ template: path.join(__dirname, 'public/index.html'),
+ templateParameters: {
+ PUBLIC_URL: process.env.PUBLIC_URL ? process.env.PUBLIC_URL : '/'
+ },
})
],
devServer: {