Merge branch 'develop'

CHANGELOG.md

@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - added energy storage container to database, myems-api and myems-admin
 - added baidu map link and google maps link to get coordinate in myems-admin
 - added cookieExpireTime to config.js in myems-web
+- added background image to login page in myems-web
 - 
 ### Changed
 - changed microgrid monitoring in myems-web

myems-web/src/Main.js

@@ -114,23 +114,23 @@ const Main = props => {
       let user_uuid = getCookieValue('user_uuid');
       let token = getCookieValue('token');
       if(checkEmpty(token)|| checkEmpty(user_uuid)) return;
-      createCookie('is_logged_in', true, 1000 * 60 * 10 * 1);
-      createCookie('user_name', user_name, 1000 * 60 * 10 * 1);
-      createCookie('user_display_name', user_display_name, 1000 * 60 * 10 * 1);
-      createCookie('user_uuid', user_uuid, 1000 * 60 * 10 * 1);
-      createCookie('token', token, 1000 * 60 * 10 * 1);
+      createCookie('is_logged_in', true, settings.cookieExpireTime);
+      createCookie('user_name', user_name, settings.cookieExpireTime);
+      createCookie('user_display_name', user_display_name, settings.cookieExpireTime);
+      createCookie('user_uuid', user_uuid, settings.cookieExpireTime);
+      createCookie('token', token, settings.cookieExpireTime);
     };
     const mousedown = () => {
       let user_name = getCookieValue('user_name');
       let user_display_name = getCookieValue('user_display_name');
       let user_uuid = getCookieValue('user_uuid');
       let token = getCookieValue('token');
       if(checkEmpty(token)|| checkEmpty(user_uuid)) return;
-      createCookie('is_logged_in', true, 1000 * 60 * 10 * 1);
-      createCookie('user_name', user_name, 1000 * 60 * 10 * 1);
-      createCookie('user_display_name', user_display_name, 1000 * 60 * 10 * 1);
-      createCookie('user_uuid', user_uuid, 1000 * 60 * 10 * 1);
-      createCookie('token', token, 1000 * 60 * 10 * 1);
+      createCookie('is_logged_in', true, settings.cookieExpireTime);
+      createCookie('user_name', user_name, settings.cookieExpireTime);
+      createCookie('user_display_name', user_display_name, settings.cookieExpireTime);
+      createCookie('user_uuid', user_uuid, settings.cookieExpireTime);
+      createCookie('token', token, settings.cookieExpireTime);
     };
     window.addEventListener("mousemove", mousemove);
     window.addEventListener("mousedown", mousedown);

myems-web/src/components/MyEMS/Meter/RealtimeChart.js

@@ -5,7 +5,7 @@ import { Card, CardHeader, CardBody, ListGroup, ListGroupItem } from 'reactstrap
 import { rgbaColor } from '../../../helpers/utils';
 import { withTranslation } from 'react-i18next';
 import {v4 as uuid} from 'uuid';
-import { APIBaseURL, settings } from '../../../config';
+import { APIBaseURL } from '../../../config';
 import { getCookieValue, floatFormatter } from '../../../helpers/utils';
 import { toast } from 'react-toastify';
 

myems-web/src/components/MyEMS/Space/RealtimeData.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { Card, CardHeader, CardBody, ListGroup, ListGroupItem } from 'reactstrap';
 import { withTranslation } from 'react-i18next';
 import {v4 as uuid} from 'uuid';
-import { APIBaseURL, settings } from '../../../config';
+import { APIBaseURL } from '../../../config';
 import { getCookieValue } from '../../../helpers/utils';
 import { toast } from 'react-toastify';
 

myems-web/src/components/MyEMS/dashboard/Dashboard.js

@@ -100,7 +100,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
         setIsFetchDashboard(false);
         toast(
           <Fragment>
-            {t("Welcome to MyEMS")}!<br />
+            {t("Welcome to MyEMS")}<br />
             {t("An Industry Leading Open Source Energy Management System")}
           </Fragment>
         );

myems-web/src/layouts/AuthBasicLayout.js

@@ -3,9 +3,10 @@ import { Card, CardBody, Col, Row } from 'reactstrap';
 import Logo from '../components/navbar/Logo';
 import Section from '../components/common/Section';
 import AuthBasicRoutes from '../components/auth/basic/AuthBasicRoutes';
+import bg1 from '../assets/img/generic/login-bg-1920x1080.jpg';
 
 const AuthBasicLayout = () => (
-  <Section className="py-0">
+  <Section className="py-0 overflow-hidden" image={bg1} position="center bottom" overlay>
     <Row className="flex-center min-vh-100 py-6">
       <Col sm={10} md={8} lg={6} xl={5} className="col-xxl-4">
         <Logo />