Fix minor errors

.eslintcache

@@ -1 +1 @@
-[{"/Users/pveiga/repos/wisemapping-react/src/Footer.js":"1","/Users/pveiga/repos/wisemapping-react/src/Header.js":"2","/Users/pveiga/repos/wisemapping-react/src/index.js":"3","/Users/pveiga/repos/wisemapping-react/src/LoginPage.js":"4"},{"size":2117,"mtime":1606670064431,"results":"5","hashOfConfig":"6"},{"size":1572,"mtime":1606670050593,"results":"7","hashOfConfig":"6"},{"size":777,"mtime":1606670265242,"results":"8","hashOfConfig":"6"},{"size":4012,"mtime":1606670278388,"results":"9","hashOfConfig":"6"},{"filePath":"10","messages":"11","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1xegajf",{"filePath":"12","messages":"13","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"16","messages":"17","errorCount":0,"warningCount":1,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"/Users/pveiga/repos/wisemapping-react/src/Footer.js",[],"/Users/pveiga/repos/wisemapping-react/src/Header.js",[],"/Users/pveiga/repos/wisemapping-react/src/index.js",[],"/Users/pveiga/repos/wisemapping-react/src/LoginPage.js",["18"],{"ruleId":"19","severity":1,"message":"20","line":7,"column":7,"nodeType":"21","messageId":"22","endLine":7,"endColumn":26},"no-unused-vars","'ConfigStatusMessage' is defined but never used.","Identifier","unusedVar"]
+[{"/Users/pveiga/repos/wisemapping-react/src/Footer.js":"1","/Users/pveiga/repos/wisemapping-react/src/Header.js":"2","/Users/pveiga/repos/wisemapping-react/src/index.js":"3","/Users/pveiga/repos/wisemapping-react/src/LoginPage.js":"4"},{"size":1864,"mtime":1606671502544,"results":"5","hashOfConfig":"6"},{"size":1572,"mtime":1606670050593,"results":"7","hashOfConfig":"6"},{"size":777,"mtime":1606670265242,"results":"8","hashOfConfig":"6"},{"size":4070,"mtime":1606672449720,"results":"9","hashOfConfig":"6"},{"filePath":"10","messages":"11","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1xegajf",{"filePath":"12","messages":"13","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"16","messages":"17","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/pveiga/repos/wisemapping-react/src/Footer.js",[],"/Users/pveiga/repos/wisemapping-react/src/Header.js",[],"/Users/pveiga/repos/wisemapping-react/src/index.js",[],"/Users/pveiga/repos/wisemapping-react/src/LoginPage.js",[]]

lang/en.json

@@ -6,25 +6,25 @@
         "defaultMessage": "Contact Us"
     },
     "footer.donations": {
-        "defaultMessage": "PayPal footer.donations"
+        "defaultMessage": "PayPal Donations"
     },
     "header.donthaveaccount": {
         "defaultMessage": "Don't have an account ?"
     },
     "login.email": {
-        "defaultMessage": "login.email"
+        "defaultMessage": "Email"
     },
     "footer.faq": {
         "defaultMessage": "F.A.Q."
     },
     "footer.feedback": {
-        "defaultMessage": "footer.feedback"
+        "defaultMessage": "Feedback"
     },
     "login.forgotpwd": {
-        "defaultMessage": "Forgot login.password ?"
+        "defaultMessage": "Forgot Password ?"
     },
     "login.error": {
-        "defaultMessage": "The login.email address or login.password you entered is not valid."
+        "defaultMessage": "The email address or password you entered is not valid."
     },
     "login.loginto": {
         "defaultMessage": "Log Into Your Account"
@@ -37,7 +37,7 @@
         "defaultMessage": "Open Source"
     },
     "login.password": {
-        "defaultMessage": "login.password"
+        "defaultMessage": "Password"
     },
     "login.remberme": {
         "defaultMessage": "Remember me"
@@ -52,9 +52,9 @@
         "defaultMessage": "Term And Conditions"
     },
     "login.userinactive": {
-        "defaultMessage": "Sorry, your account has not been activated yet. You'll receive a notification login.email when it becomes active. Stay tuned!."
+        "defaultMessage": "Sorry, your account has not been activated yet. You'll receive a notification email when it becomes active. Stay tuned!."
     },
     "login.welcome": {
-        "defaultMessage": "login.welcome"
+        "defaultMessage": "Welcome"
     }
 }

lang/es.json

@@ -12,19 +12,19 @@
         "defaultMessage": "No tienes una cuenta ?"
     },
     "login.email": {
-        "defaultMessage": "login.email"
+        "defaultMessage": "Email"
     },
     "footer.faq": {
-        "defaultMessage": "F.A.Q."
+        "defaultMessage": "Preguntas Frecuentes"
     },
     "footer.feedback": {
-        "defaultMessage": "footer.feedback"
+        "defaultMessage": "Feedback"
     },
     "login.forgotpwd": {
-        "defaultMessage": "Olvidaste el login.password ?"
+        "defaultMessage": "Olvidaste la contraseña ?"
     },
     "login.error": {
-        "defaultMessage": "El login.email or la contraseña no es valida."
+        "defaultMessage": "El email o la contraseña no es valida."
     },
     "login.loginto": {
         "defaultMessage": "Ingresar a tu Cuenta"
@@ -52,7 +52,7 @@
         "defaultMessage": "Terminos y Condiciones"
     },
     "login.userinactive": {
-        "defaultMessage": "Sorry, your account has not been activated yet. You'll receive a notification login.email when it becomes active. Stay tuned!."
+        "defaultMessage": "Sorry, your account has not been activated yet. You'll receive a notification email when it becomes active. Stay tuned!."
     },
     "login.welcome": {
         "defaultMessage": "Bienvenido"

src/Footer.js

@@ -4,43 +4,25 @@ import { ReactComponent as Logo } from './images/logo-text.svg'
 
 class Footer extends React.Component {
     render() {
-        return ( <
+        return (
-            footer class = "footer" >
+            <footer class="footer" >
-            <
+                <Logo />
-            Logo / >
+                <div >
-            <
+                    <div><a href="termsofuse.html" > < FormattedMessage id="footer.termsandconditions" defaultMessage="Term And Conditions" /> </a></div>
-            div >
+                    <div><a href="faq.html" > < FormattedMessage id="footer.faq" defaultMessage="F.A.Q." /> </a></div >
-            <
+                    <div><a href="aboutus.html" > < FormattedMessage id="footer.aboutus" defaultMessage="About Us" /></a></div >
-            div > < a href = "termsofuse.html" > < FormattedMessage id = "footer.termsandconditions"
+                </div>
-            defaultMessage = "Term And Conditions" / > < /a></div >
+                <div >
-            <
+                    <div><a href="http://www.wisemapping.org/" > < FormattedMessage id="footer.opensource" defaultMessage="Open Source" /> </a></div>
-            div > < a href = "footer.faq.html" > < FormattedMessage id = "footer.faq"
+                    <div><a href="mailto:team@wisemapping.com" > < FormattedMessage id="footer.contactus" defaultMessage="Contact Us" /> </a></div>
-            defaultMessage = "F.A.Q." / > < /a></div >
+                    <div>< a href="mailto:feedback@wisemapping.com" > < FormattedMessage id="footer.feedback" defaultMessage="Feedback" /> </a></div>
-            <
+                </div>
-            div > < a href = "aboutus.html" > < FormattedMessage id = "footer.aboutus"
+                <div>
-            defaultMessage = "About Us" / > < /a></div >
+                    <div>
-            <
+                        <span id="siteseal" ><script async type="text/javascript" src="https://seal.godaddy.com/getSeal?sealID=iGLOz83ePtxZCiqwz4QuXb7OQWXTflEIPdOnuR2PzaUwSru3lYJNEj9VdqJ1" > </script></span ></div>
-            /div> <
+                        <div><span class="button-style2" >< a href="https://www.paypal.com/webapps/shoppingcart?flowlogging_id=c7ac923b53025&mfid=1606520600355_c7ac923b53025#/checkout/openButton">< FormattedMessage id="footer.donations" defaultMessage="PayPal Donations" /> </a></span > </div> 
-            div >
+                    </div >
-            <
+            </footer>
-            div > < a href = "http://www.wisemapping.org/" > < FormattedMessage id = "footer.opensource"
-            defaultMessage = "Open Source" / > < /a></div >
-            <
-            div > < a href = "mailto:team@wisemapping.com" > < FormattedMessage id = "footer.contactus"
-            defaultMessage = "Contact Us" / > < /a></div >
-            <
-            div > < a href = "mailto:footer.feedback@wisemapping.com" > < FormattedMessage id = "footer.feedback"
-            defaultMessage = "footer.feedback" / > < /a></div >
-            <
-            /div> <
-            div >
-            <
-            div > < span id = "siteseal" > < script async type = "text/javascript"
-            src = "https://seal.godaddy.com/getSeal?sealID=iGLOz83ePtxZCiqwz4QuXb7OQWXTflEIPdOnuR2PzaUwSru3lYJNEj9VdqJ1" > < /script></span > < /div> <
-            div > < span class = "button-style2" > < a href = "https://www.paypal.com/webapps/shoppingcart?flowlogging_id=c7ac923b53025&mfid=1606520600355_c7ac923b53025#/checkout/openButton" > < FormattedMessage id = "footer.donations"
-            defaultMessage = "PayPal footer.donations" / > < /a></span > < /div> < /
-            div > <
-            /footer>
         )
     };
 }

src/LoginPage.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import {FormattedMessage, IntlProvider,injectIntl } from 'react-intl'
+import { FormattedMessage, IntlProvider, injectIntl } from 'react-intl'
 
 import Header from './Header.js';
 import Footer from './Footer.js';
@@ -13,13 +13,19 @@ class ConfigStatusMessage extends React.Component {
   }
 
   render() {
-    return (
+    let result;
-      <div class="db-warn-msg">
+   
+    if (this.state.enabled===true) {
+      result = (<div class="db-warn-msg">
         <p>
-          <FormattedMessage id="login.hsqldbcofig" defaultMessage="Warning: 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" /><a href="https://wisemapping.atlassian.net/wiki/display/WS/Database+Configuration"> here</a>
+          <FormattedMessage id="login.hsqldbcofig" 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" /><a href="https://wisemapping.atlassian.net/wiki/display/WS/Database+Configuration"> here</a>
         </p>
-      </div>
+      </div>);
-    );
+    } else {
+      result = <span></span>;
+    }
+   
+    return result;
   }
 }
 
@@ -28,7 +34,7 @@ class LoginError extends React.Component {
     super(props)
     // @Todo: This must be reviewed to be based on navigation state.
     // Login error example: http://localhost:8080/c/login?login.error=2
-    const errorCode = new URLSearchParams(window.location.search).get('login.error');
+    const errorCode = new URLSearchParams(window.location.search).get('login_error');
     this.state = {
       errorCode: errorCode
     }
@@ -69,14 +75,14 @@ class LoginForm extends React.Component {
     return (
       <div class="wrapper">
         <div class="content">
-          <h1><FormattedMessage id="login.welcome" defaultMessage="login.welcome" /></h1>
+          <h1><FormattedMessage id="login.welcome" defaultMessage="Welcome" /></h1>
           <p><FormattedMessage id="login.loginto" defaultMessage="Log Into Your Account" /></p>
 
           <LoginError />
 
           <form action="/c/perform-login" method="POST">
-            <input type="email" name="username" placeholder={intl.formatMessage({ id: "login.email", defaultMessage: "login.email" })}  required="true" autocomplete="login.email" />
+            <input type="email" name="username" placeholder={intl.formatMessage({ id: "login.email", defaultMessage: "Email" })} required="true" autocomplete="email" />
-            <input type="password" name="login.password" placeholder={intl.formatMessage({ id: "login.password", defaultMessage: "login.password" })} required="true" autocomplete="current-login.password" />
+            <input type="password" name="password" placeholder={intl.formatMessage({ id: "login.password", defaultMessage: "Password" })} required="true" autocomplete="current-password" />
 
             <div>
               <input name="_spring_security_login.remberme" id="staySignIn" type="checkbox" />
@@ -84,7 +90,7 @@ class LoginForm extends React.Component {
             </div>
             <input type="submit" value={intl.formatMessage({ id: "login.signin", defaultMessage: "Sign In" })} />
           </form>
-          <a href="/c/user/resetlogin.password"><FormattedMessage id="login.forgotpwd" defaultMessage="Forgot login.password ?" /></a>
+          <a href="/c/user/resetlogin.password"><FormattedMessage id="login.forgotpwd" defaultMessage="Forgot Password ?" /></a>
         </div>
       </div>
     );
@@ -110,7 +116,7 @@ class LoginPage extends React.Component {
         <div>
           <Header type='login' />
           <LoginForm />
-          {/* <ConfigStatusMessage enabled='false' /> */}
+          <ConfigStatusMessage enabled='false' />
           <Footer />
         </div>
       </IntlProvider>

src/compiled-lang/en.json

@@ -1,78 +1,116 @@
 {
-    "footer.aboutus": [{
+  "footer.aboutus": [
+    {
       "type": 0,
       "value": "About Us"
-    }],
+    }
-    "footer.contactus": [{
+  ],
+  "footer.contactus": [
+    {
       "type": 0,
       "value": "Contact Us"
-    }],
+    }
-    "footer.donations": [{
+  ],
+  "footer.donations": [
+    {
       "type": 0,
-        "value": "PayPal footer.donations"
+      "value": "PayPal Donations"
-    }],
+    }
-    "header.donthaveaccount": [{
+  ],
-        "type": 0,
+  "footer.faq": [
-        "value": "Don't have an account ?"
+    {
-    }],
-    "login.email": [{
-        "type": 0,
-        "value": "login.email"
-    }],
-    "footer.faq": [{
       "type": 0,
       "value": "F.A.Q."
-    }],
+    }
-    "footer.feedback": [{
+  ],
+  "footer.feedback": [
+    {
       "type": 0,
-        "value": "footer.feedback"
+      "value": "Feedback"
-    }],
+    }
-    "login.forgotpwd": [{
+  ],
-        "type": 0,
+  "footer.opensource": [
-        "value": "Forgot login.password ?"
+    {
-    }],
-    "login.error": [{
-        "type": 0,
-        "value": "The login.email address or login.password you entered is not valid."
-    }],
-    "login.loginto": [{
-        "type": 0,
-        "value": "Log Into Your Account"
-    }],
-    "login.hsqldbcofig": [{
-        "type": 0,
-        "value": "Warning: 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"
-    }],
-    "footer.opensource": [{
       "type": 0,
       "value": "Open Source"
-    }],
+    }
-    "login.password": [{
+  ],
-        "type": 0,
+  "footer.termsandconditions": [
-        "value": "login.password"
+    {
-    }],
-    "login.remberme": [{
-        "type": 0,
-        "value": "Remember me"
-    }],
-    "login.signin": [{
-        "type": 0,
-        "value": "Sign In"
-    }],
-    "login.signup": [{
-        "type": 0,
-        "value": "Sign Up"
-    }],
-    "footer.termsandconditions": [{
       "type": 0,
       "value": "Term And Conditions"
-    }],
+    }
-    "login.userinactive": [{
+  ],
+  "header.donthaveaccount": [
+    {
       "type": 0,
-        "value": "Sorry, your account has not been activated yet. You'll receive a notification login.email when it becomes active. Stay tuned!."
+      "value": "Don't have an account ?"
-    }],
+    }
-    "login.welcome": [{
+  ],
+  "login.email": [
+    {
       "type": 0,
-        "value": "login.welcome"
+      "value": "Email"
-    }]
+    }
+  ],
+  "login.error": [
+    {
+      "type": 0,
+      "value": "The email address or password you entered is not valid."
+    }
+  ],
+  "login.forgotpwd": [
+    {
+      "type": 0,
+      "value": "Forgot Password ?"
+    }
+  ],
+  "login.hsqldbcofig": [
+    {
+      "type": 0,
+      "value": "Warning: 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,
+      "value": "Password"
+    }
+  ],
+  "login.remberme": [
+    {
+      "type": 0,
+      "value": "Remember me"
+    }
+  ],
+  "login.signin": [
+    {
+      "type": 0,
+      "value": "Sign In"
+    }
+  ],
+  "login.signup": [
+    {
+      "type": 0,
+      "value": "Sign Up"
+    }
+  ],
+  "login.userinactive": [
+    {
+      "type": 0,
+      "value": "Sorry, your account has not been activated yet. You'll receive a notification email when it becomes active. Stay tuned!."
+    }
+  ],
+  "login.welcome": [
+    {
+      "type": 0,
+      "value": "Welcome"
+    }
+  ]
 }

src/compiled-lang/es.json

@@ -1,78 +1,116 @@
 {
-    "footer.aboutus": [{
+  "footer.aboutus": [
+    {
       "type": 0,
       "value": "Sobre Nosotros"
-    }],
+    }
-    "footer.contactus": [{
+  ],
+  "footer.contactus": [
+    {
       "type": 0,
       "value": "Contáctenos"
-    }],
+    }
-    "footer.donations": [{
+  ],
+  "footer.donations": [
+    {
       "type": 0,
       "value": "PayPal Donaciones"
-    }],
+    }
-    "header.donthaveaccount": [{
+  ],
+  "footer.faq": [
+    {
       "type": 0,
-        "value": "No tienes una cuenta ?"
+      "value": "Preguntas Frecuentes"
-    }],
+    }
-    "login.email": [{
+  ],
+  "footer.feedback": [
+    {
       "type": 0,
-        "value": "login.email"
+      "value": "Feedback"
-    }],
+    }
-    "footer.faq": [{
+  ],
-        "type": 0,
+  "footer.opensource": [
-        "value": "F.A.Q."
+    {
-    }],
-    "footer.feedback": [{
-        "type": 0,
-        "value": "footer.feedback"
-    }],
-    "login.forgotpwd": [{
-        "type": 0,
-        "value": "Olvidaste el login.password ?"
-    }],
-    "login.error": [{
-        "type": 0,
-        "value": "El login.email or la contraseña no es valida."
-    }],
-    "login.loginto": [{
-        "type": 0,
-        "value": "Ingresar a tu Cuenta"
-    }],
-    "login.hsqldbcofig": [{
-        "type": 0,
-        "value": "Warning: 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"
-    }],
-    "footer.opensource": [{
       "type": 0,
       "value": "Open Source"
-    }],
+    }
-    "login.password": [{
+  ],
-        "type": 0,
+  "footer.termsandconditions": [
-        "value": "Contraseña"
+    {
-    }],
-    "login.remberme": [{
-        "type": 0,
-        "value": "Recordarme"
-    }],
-    "login.signin": [{
-        "typye": 0,
-        "value": "Ingresar"
-    }],
-    "login.signup": [{
-        "type": 0,
-        "value": "Registrarse"
-    }],
-    "footer.termsandconditions": [{
       "type": 0,
       "value": "Terminos y Condiciones"
-    }],
+    }
-    "login.userinactive": [{
+  ],
+  "header.donthaveaccount": [
+    {
       "type": 0,
-        "value": "Sorry, your account has not been activated yet. You'll receive a notification login.email when it becomes active. Stay tuned!."
+      "value": "No tienes una cuenta ?"
-    }],
+    }
-    "login.welcome": [{
+  ],
+  "login.email": [
+    {
+      "type": 0,
+      "value": "Email"
+    }
+  ],
+  "login.error": [
+    {
+      "type": 0,
+      "value": "El email o la contraseña no es valida."
+    }
+  ],
+  "login.forgotpwd": [
+    {
+      "type": 0,
+      "value": "Olvidaste la contraseña ?"
+    }
+  ],
+  "login.hsqldbcofig": [
+    {
+      "type": 0,
+      "value": "Warning: 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": "Ingresar a tu Cuenta"
+    }
+  ],
+  "login.password": [
+    {
+      "type": 0,
+      "value": "Contraseña"
+    }
+  ],
+  "login.remberme": [
+    {
+      "type": 0,
+      "value": "Recordarme"
+    }
+  ],
+  "login.signin": [
+    {
+      "type": 0,
+      "value": "Ingresar"
+    }
+  ],
+  "login.signup": [
+    {
+      "type": 0,
+      "value": "Registrarse"
+    }
+  ],
+  "login.userinactive": [
+    {
+      "type": 0,
+      "value": "Sorry, your account has not been activated yet. You'll receive a notification email when it becomes active. Stay tuned!."
+    }
+  ],
+  "login.welcome": [
+    {
       "type": 0,
       "value": "Bienvenido"
-    }]
+    }
+  ]
 }