Added Log out button, all login sessions cached (#16)

* minor fixes

* idea for tomorrow

* rewrite authentication logic

* working error handling and display

* cached login session

* logout button complete

* set map maxZoom and default location (#14)

* fixed outdated tests

* update release script

Co-authored-by: Syed Murtaza Naqvi <[email protected]>

.gitignore

@@ -1,5 +1,6 @@
 node_modules/
 dist/
-# .vscode/
 coverage/
-*key.json
+*key.json
+*.zip
+release/

configuration.json

@@ -1,7 +1,7 @@
 {
   "name": "Real Time Map",
   "supportEmail": "[email protected], [email protected]",
-  "version": "2.3.0",
+  "version": "v2.3.1",
   "items": [
     {
       "icon": "dist/img/icon.png",

package.json

@@ -1,14 +1,16 @@
 {
 	"name": "real-time-map",
-	"version": "2.3.0",
+	"version": "v2.3.1",
 	"description": "The Real Time Dashboard project is an open source foundation for real time GPS, exception, and status tracking that will allow an organization to track their fleet data in real time or playback historical data on the map.",
 	"main": "server.js",
 	"scripts": {
-		"test": "jest --config=jest.config.json --coverage",
+    "test": "jest --config=jest.config.json --coverage",
+    "devStart": "sh dev.sh",
 		"devServer": "nodemon ./server.js",
 		"devBuild": "webpack --config webpack.dev.js --watch",
-		"build": "echo Building Version 2.3.0 && webpack --config webpack.prod.js && echo Version 2.3.0 built in dist folder.",
-		"start": "node ./server.js"
+		"build": "echo 'Building Version v2.3.1...' && webpack --config webpack.prod.js && echo 'Version v2.3.1 built into the dist folder.'",
+    "start": "node ./server.js",
+    "release":"npm i && npm run build && mkdir release && cp -avr -t release dist README.md configuration.json"
 	},
 	"repository": {
 		"type": "git",

src/app-helper.js

@@ -16,8 +16,7 @@ import { initView } from "./index";
 import {
   apiConfig,
   userInfo
-}
-  from "./dataStore/api-config";
+} from "./dataStore/api-config";
 import {
   resetAnimationOnFocus,
   resetTransitionAnimation

src/components/map/map-model.js

@@ -33,6 +33,10 @@ export const mapModel = {
       storage.map.closePopup();
     });
     storage.map.on("zoom", resetTransitionAnimation);
+
+    // set to default location if user does not allow locating.
+    const defautLocation = [43.515391, -79.684085];
+    storage.map.setView(defautLocation, 12);
   },
 
   addMapBoxTileLayer: map => {
@@ -55,7 +59,7 @@ export const mapModel = {
   },
 
   locateUserAndSetView() {
-    storage.map.locate({ setView: true });
+    storage.map.locate({ setView: true, maxZoom: 12 });
   },
 
   setMapToCompanyAddress() {

src/components/map/map-view.js

@@ -3,6 +3,10 @@ import { mapModel } from "./map-model";
 import { progressBar } from "../progress-bar";
 import { ProgressIndicatorComponent } from "../progress-bar/progress-indicator-component";
 import { SnackBar } from "../snackbar/snackbar-component";
+import {
+  apiConfig
+} from "../../dataStore/api-config";
+import storage from "../../dataStore";
 
 export class MapView extends React.Component {
   componentDidMount() {
@@ -13,6 +17,7 @@ export class MapView extends React.Component {
   render() {
     return (
       <div id="RTM-Map-Container">
+        {storage.isStandAlone ? <button id="RTM-LogoutButton" onClick={() => { apiConfig.api.forget(); }}>Logout</button> : null}
         <div id="RTM-Map">
           <ProgressIndicatorComponent />
           <button