Remove autobind decorator. Fix bugs in AR view

mobile/.babelrc

@@ -6,7 +6,6 @@
     "development": {
       "plugins": [
         "transform-react-jsx-source",
-        "transform-decorators-legacy"
       ]
     }
   }

mobile/android/app/build.gradle

@@ -101,8 +101,8 @@ android {
         applicationId "com.deightonar"
         minSdkVersion 24
         targetSdkVersion 27
-        versionCode 4
+        versionCode 6
-        versionName "1.0.1"
+        versionName "1.1.0"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }

mobile/android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.deightonar"
-    android:versionCode="4"
+    android:versionCode="6"
-    android:versionName="1.0.1">
+    android:versionName="1.1.0">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

mobile/ios/DeightonAR/Info.plist

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>20180518.0</string>
+	<string>20180525.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

mobile/package.json

@@ -3,7 +3,6 @@
   "version": "0.1.0",
   "private": true,
   "devDependencies": {
-    "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-preset-react-native-stage-0": "^1.0.1",
     "jest-react-native": "^18.0.0",
     "react-test-renderer": "16.2.0"
@@ -18,7 +17,7 @@
     "preset": "react-native"
   },
   "dependencies": {
-    "autobind-decorator": "^2.1.0",
+    "auto-bind2": "^1.0.3",
     "eventemitter3": "^3.1.0",
     "moment": "^2.22.1",
     "react": "^16.3.2",

mobile/src/API.js

@@ -1,9 +1,9 @@
 import EventEmitter from "eventemitter3"
 import io from "socket.io-client"
 import { AsyncStorage } from "react-native"
-import autobind from "autobind-decorator"
 import { config } from "./config"
 import RNFS from "react-native-fs"
+import { autoBind } from "auto-bind2"
 
 const authTokenKeyName = "AuthToken"
 const backendKeyName = "Backend"
@@ -33,7 +33,6 @@ class APIError extends Error {
   }
 }
 
-@autobind
 class API extends EventEmitter {
   static urls = {
     normal: "https://dar.kss.us.com/api",
@@ -43,6 +42,7 @@ class API extends EventEmitter {
 
   constructor() {
     super()
+    autoBind(this)
     this.user = { pending: true }
     this._apiURL = null
 

mobile/src/ARViewer/ARViewer.js

@@ -13,16 +13,16 @@ import {
   ViroQuad,
   ViroConstants,
 } from "react-viro"
-import autobind from "autobind-decorator"
 import backImage from "./images/back.png"
 import { config } from "../config"
 import "url-search-params-polyfill"
+import { reactAutoBind } from "auto-bind2"
 
 const shapes = {
   order: {
     source: require("./models/hardhat_obj.obj"),
     resources: [require("./models/hardhat.mtl")],
-    scale: [0.5, 0.5, 0.5],
+    scale: [0.3, 0.3, 0.3],
   },
   complaint: {
     source: require("./models/question_obj.obj"),
@@ -47,6 +47,7 @@ const distance = (vectorA, vectorB) => {
 class WorkItemSceneAR extends React.Component {
   constructor(props) {
     super(props)
+    reactAutoBind(this)
 
     this.state = {
       position: [0, 0, 0],
@@ -57,7 +58,6 @@ class WorkItemSceneAR extends React.Component {
     }
   }
 
-  @autobind
   handleLoadEnd() {
     this.arScene.getCameraOrientationAsync().then((orientation) => {
       return this.arScene
@@ -65,8 +65,11 @@ class WorkItemSceneAR extends React.Component {
         .then((results) => {
           const { forward, position } = orientation
           // Default position is just one meter in front of the user
-          const defaultPosition =
+          const defaultPosition = [
-            [forward[0] * 1.0, forward[1] * 1.0, forward[2]] * 1.0
+            forward[0] * 1.0,
+            forward[1] * 1.0,
+            forward[2] * 1.0,
+          ]
           let hitResultPosition = null
 
           // Filter the hit test results based on the position.
@@ -102,6 +105,8 @@ class WorkItemSceneAR extends React.Component {
             position: hitResultPosition || defaultPosition,
           })
 
+          console.log(hitResultPosition || defaultPosition)
+
           setTimeout(() => {
             this.updateInitialRotation()
           }, 200)
@@ -110,7 +115,6 @@ class WorkItemSceneAR extends React.Component {
     })
   }
 
-  @autobind
   updateInitialRotation() {
     this.arNode.getTransformAsync().then((retDict) => {
       let rotation = retDict.rotation
@@ -131,7 +135,6 @@ class WorkItemSceneAR extends React.Component {
     })
   }
 
-  @autobind
   handleTrackingUpdated(state, reason) {
     if (
       !this.state.trackingInitialized &&
@@ -141,12 +144,10 @@ class WorkItemSceneAR extends React.Component {
     }
   }
 
-  @autobind
   handleAnchorFound() {
     this.setState({ haveAnchor: true })
   }
 
-  @autobind
   handleClick(position, source) {
     const { workItemId } = this.props
 
@@ -182,7 +183,7 @@ class WorkItemSceneAR extends React.Component {
             innerAngle={5}
             outerAngle={20}
             direction={[0, -1, 0]}
-            position={[0, 10, 0]}
+            position={[0, 5, 0]}
             color="#ffffff"
             castsShadow={true}
             shadowNearZ={0.1}
@@ -193,7 +194,7 @@ class WorkItemSceneAR extends React.Component {
             trackingInitialized &&
             haveAnchor && (
               <Viro3DObject
-                position={[0, 0, -1]}
+                position={[0, 0, 0]}
                 source={shape.source}
                 resources={shape.resources}
                 scale={shape.scale}
@@ -219,6 +220,7 @@ class WorkItemSceneAR extends React.Component {
 export class ARViewer extends React.Component {
   constructor(props) {
     super(props)
+    reactAutoBind(this)
 
     const { search } = this.props.location
 
@@ -230,7 +232,6 @@ export class ARViewer extends React.Component {
     }
   }
 
-  @autobind
   handleBackPress() {
     this.props.history.replace("/")
   }

mobile/src/Activity/Activity.js

@@ -23,7 +23,7 @@ import {
   FormStaticInput,
 } from "../ui"
 import { MessageModal, WaitModal, ProgressModal } from "../Modal"
-import autobind from "autobind-decorator"
+import { reactAutoBind } from "auto-bind2"
 import KeyboardSpacer from "react-native-keyboard-spacer"
 import { isIphoneX } from "react-native-iphone-x-helper"
 import { api } from "../API"
@@ -86,14 +86,17 @@ export class Activity extends React.Component {
 
   constructor(props) {
     super(props)
+    reactAutoBind(this)
     this.state = {
       binder: new FormBinder({}, Activity.bindings),
       waitModal: null,
       messageModal: null,
       progressModal: null,
       uploadPercent: 0,
-      region: config.initialRegion,
     }
+    this.region = null
+    this.isMapReady = false
+    this.goToRegionWhenReady = false
 
     const { search } = this.props.location
     const params = search ? new URLSearchParams(search) : { get: () => null }
@@ -116,15 +119,22 @@ export class Activity extends React.Component {
                 },
                 Activity.bindings
               ),
-              region: {
-                latitude: lat,
-                longitude: lng,
-                latitudeDelta: 0.01,
-                longitudeDelta: 0.01,
-              },
               location: formatLatLng(lat, lng),
               dateTime: moment().format(),
             })
+
+            this.region = {
+              latitude: lat,
+              longitude: lng,
+              latitudeDelta: config.activityRegionDelta,
+              longitudeDelta: config.activityRegionDelta,
+            }
+          }
+
+          if (this.isMapReady) {
+            this.mapView.animateToRegion(this.region)
+          } else {
+            this.goToRegionWhenReady = true
           }
         })
         .catch((err) => {
@@ -170,7 +180,15 @@ export class Activity extends React.Component {
     }
   }
 
-  @autobind
+  handleOnMapReady() {
+    if (this.goToRegionWhenReady) {
+      this.mapView.animateToRegion(this.region)
+      this.goToRegionWhenReady = false
+    }
+
+    this.isMapReady = true
+  }
+
   handleMessageDismiss() {
     const back = this.state.messageModal.back
     this.setState({ messageModal: null })
@@ -179,7 +197,6 @@ export class Activity extends React.Component {
     }
   }
 
-  @autobind
   handleBackPress() {
     const { history } = this.props
 
@@ -190,7 +207,6 @@ export class Activity extends React.Component {
     }
   }
 
-  @autobind
   handleDonePress() {
     const { binder } = this.state
     let obj = binder.getModifiedBindingValues()
@@ -228,7 +244,6 @@ export class Activity extends React.Component {
     }
   }
 
-  @autobind
   handleUploadStarted() {
     this.setState({
       progressModal: { message: "Uploading Photo..." },
@@ -236,7 +251,6 @@ export class Activity extends React.Component {
     })
   }
 
-  @autobind
   handleUploadProgress(uploadData) {
     if (this.state.progressModal) {
       this.setState({
@@ -250,12 +264,10 @@ export class Activity extends React.Component {
     }
   }
 
-  @autobind
   handleUploadEnded(successful, uploadData) {
     this.setState({ progressModal: null })
   }
 
-  @autobind
   handleUploadCanceled() {
     this.setState({ progressModal: null })
   }
@@ -266,7 +278,6 @@ export class Activity extends React.Component {
       messageModal,
       progressModal,
       waitModal,
-      region,
       dateTime,
       location,
       uploadPercent,
@@ -306,6 +317,7 @@ export class Activity extends React.Component {
             <FormStaticInput label="Location:" value={location} />
             <View style={{ flexDirection: "column", justifyContent: "center" }}>
               <MapView
+                ref={(ref) => (this.mapView = ref)}
                 style={{
                   flexDirection: "column",
                   justifyContent: "center",
@@ -324,7 +336,8 @@ export class Activity extends React.Component {
                 showsScale={false}
                 showsUserLocation
                 cacheEnabled
-                region={region}
+                initialRegion={config.initialRegion}
+                onMapReady={this.handleOnMapReady}
               />
               <Icon
                 name="target"

mobile/src/App.js

@@ -56,7 +56,11 @@ export default class App extends React.Component {
             <Route exact path="/login" component={Login} />
             <Route exact path="/logout" component={Logout} />
             <ProtectedRoute exact path="/home" component={Home} />
-            <ProtectedRoute exact path="/arviewer" component={ARViewer} />
+            <ProtectedRoute
+              exact
+              path="/arviewer"
+              render={(props) => <ARViewer {...props} />}
+            />
             <ProtectedRoute exact path="/activity" component={Activity} />
             <ProtectedRoute exact admin path="/workItem" component={WorkItem} />
             <ProtectedRoute

mobile/src/Auth/Login.js

@@ -17,7 +17,7 @@ import { api } from "../API"
 import { BoundSwitch, BoundInput, BoundButton } from "../ui"
 import KeyboardSpacer from "react-native-keyboard-spacer"
 import { versionInfo } from "../version"
-import autobind from "autobind-decorator"
+import { reactAutoBind } from "auto-bind2"
 import { isIphoneX } from "react-native-iphone-x-helper"
 import { config } from "../config"
 
@@ -74,6 +74,7 @@ export class Login extends React.Component {
 
   constructor(props) {
     super(props)
+    reactAutoBind(this)
     this.state = {
       binder: new FormBinder(
         { email: config.defaultUser, rememberMe: true },
@@ -92,7 +93,6 @@ export class Login extends React.Component {
     }
   }
 
-  @autobind
   handleLogin() {
     let obj = this.state.binder.getModifiedBindingValues()
     let { history } = this.props
@@ -117,18 +117,15 @@ export class Login extends React.Component {
     }
   }
 
-  @autobind
   handleMessageDismiss() {
     this.setState({ messageModal: null })
   }
 
-  @autobind
   handleApiDismiss(backendName) {
     this.setState({ apiModal: null })
     api.backend = backendName
   }
 
-  @autobind
   handleApiPress() {
     this.hiddenTouchCount += 1
 

mobile/src/Auth/ProtectedRoute.js

@@ -1,28 +1,35 @@
-import React from 'react'
+import React from "react"
-import { Route, Redirect } from 'react-router-native'
+import { Route, Redirect } from "react-router-native"
-import { PropTypes } from 'prop-types'
+import { PropTypes } from "prop-types"
-import { api } from '../API'
+import { api } from "../API"
-import autobind from 'autobind-decorator'
+import { reactAutoBind, autoBind } from "auto-bind2"
 
 export class ProtectedRoute extends React.Component {
   static propTypes = {
-    location: PropTypes.shape({ pathname: PropTypes.string, search: PropTypes.string }),
+    location: PropTypes.shape({
+      pathname: PropTypes.string,
+      search: PropTypes.string,
+    }),
     admin: PropTypes.bool,
   }
 
-  @autobind
+  constructor(props) {
+    super(props)
+    reactAutoBind(this)
+  }
+
   updateComponent() {
     this.forceUpdate()
   }
 
   componentDidMount() {
-    api.addListener('login', this.updateComponent)
+    api.addListener("login", this.updateComponent)
-    api.addListener('logout', this.updateComponent)
+    api.addListener("logout", this.updateComponent)
   }
 
   componentWillUnmount() {
-    api.removeListener('login', this.updateComponent)
+    api.removeListener("login", this.updateComponent)
-    api.removeListener('logout', this.updateComponent)
+    api.removeListener("logout", this.updateComponent)
   }
 
   render(props) {
@@ -32,7 +39,7 @@ export class ProtectedRoute extends React.Component {
       return null
     } else {
       if (!user._id || (this.props.admin && !user.administrator)) {
-        return <Redirect to='/login' />
+        return <Redirect to="/login" />
       } else {
         return <Route {...this.props} />
       }

mobile/src/Home/Home.js

@@ -15,7 +15,7 @@ import MapView, { Marker, Callout } from "react-native-maps"
 import { Icon, Header, Geolocation } from "../ui"
 import { MessageModal } from "../Modal"
 import { api } from "../API"
-import autobind from "autobind-decorator"
+import { reactAutoBind } from "auto-bind2"
 import { ifIphoneX } from "react-native-iphone-x-helper"
 import {
   geoDistance,
@@ -39,14 +39,17 @@ const neverAskForCameraKeyName = "NeverAskForCameraPermission"
 export class Home extends React.Component {
   constructor(props) {
     super(props)
+    reactAutoBind(this)
     this.state = {
       sections: [],
       showWorkItems: true,
-      region: config.initialRegion,
       haveCameraPermission: false,
       haveLocationPermission: false,
       currentPosition: null,
     }
+    this.isMapReady = false
+    this.goToRegionWhenReady = false
+    this.region = null
 
     if (Platform.OS !== "ios") {
       ensurePermissions(
@@ -111,12 +114,19 @@ export class Home extends React.Component {
         })
         this.setState({
           sections: list.items,
-          region:
-            regionContainingPoints(
-              list.items.map((item) => item.coordinate),
-              0.02
-            ) || this.state.region,
         })
+
+        this.region =
+          regionContainingPoints(
+            list.items.map((item) => item.coordinate),
+            config.homeRegionInset
+          ) || config.initialRegion
+
+        if (this.isMapReady) {
+          this.mapView.animateToRegion(this.region)
+        } else {
+          this.goToRegionWhenReady = true
+        }
       })
       .catch((err) => {
         this.setState({
@@ -129,12 +139,19 @@ export class Home extends React.Component {
       })
   }
 
-  @autobind
   handleMessageDismiss() {
     this.setState({ messageModal: null })
   }
 
-  @autobind
+  handleOnMapReady() {
+    if (this.goToRegionWhenReady) {
+      this.mapView.animateToRegion(this.region)
+      this.goToRegionWhenReady = false
+    }
+
+    this.isMapReady = true
+  }
+
   handleMarkerPress(e, sectionIndex) {
     if (this.sectionList) {
       this.sectionList.scrollToLocation({
@@ -145,7 +162,6 @@ export class Home extends React.Component {
     }
   }
 
-  @autobind
   handleWorkItemsListPress() {
     if (this.currentPosition) {
       const { coords } = this.currentPosition
@@ -156,29 +172,30 @@ export class Home extends React.Component {
     }
   }
 
-  @autobind
   handleItemSelect(activity) {
     this.props.history.push(`/activity?id=${activity._id}`)
   }
 
-  @autobind
   handleSectionSelect(workItem) {
+    if (!this.isMapReady) {
+      return
+    }
+
     const { latitude, longitude } = workItem.coordinate
-    const region = {
+
+    this.region = {
       latitude,
       longitude,
-      latitudeDelta: 0.01,
+      latitudeDelta: config.homeRegionDelta,
-      longitudeDelta: 0.01,
+      longitudeDelta: config.homeRegionDelta,
     }
-    this.setState({ region })
+    this.mapView.animateToRegion(this.region)
   }
 
-  @autobind
   handleLogoutPress() {
     this.props.history.replace("/logout")
   }
 
-  @autobind
   handleGlassesPress() {
     const { sections: workItems } = this.state
 
@@ -217,24 +234,21 @@ export class Home extends React.Component {
     }
   }
 
-  @autobind
   handleMyLocationPress() {
-    if (this.currentPosition) {
+    if (this.currentPosition && this.isMapReady) {
       const coords = this.currentPosition.coords
 
-      this.map.animateToCoordinate({
+      this.mapView.animateToCoordinate({
         latitude: coords.latitude,
         longitude: coords.longitude,
       })
     }
   }
 
-  @autobind
   handleToggleWorkItemsList() {
     this.setState({ showWorkItems: !this.state.showWorkItems })
   }
 
-  @autobind
   handleCalloutPress(workItem) {
     if (api.loggedInUser.administrator) {
       this.props.history.push(
@@ -245,12 +259,10 @@ export class Home extends React.Component {
     }
   }
 
-  @autobind
   handlePositionUpdate(position) {
     this.currentPosition = position
   }
 
-  @autobind
   getCoordinateDistance(coordinate) {
     if (this.currentPosition) {
       const coords = this.currentPosition.coords
@@ -274,7 +286,6 @@ export class Home extends React.Component {
     const {
       sections,
       showWorkItems,
-      region,
       messageModal,
       haveCameraPermission,
       haveLocationPermission,
@@ -295,7 +306,7 @@ export class Home extends React.Component {
         />
         <MapView
           ref={(ref) => {
-            this.map = ref
+            this.mapView = ref
           }}
           style={[
             {
@@ -310,7 +321,8 @@ export class Home extends React.Component {
           showsIndoors={false}
           zoomControlEnabled={false}
           showsMyLocationButton={false}
-          region={region}>
+          initialRegion={config.initialRegion}
+          onMapReady={this.handleOnMapReady}>
           {sections.map((workItem, index) => (
             <Marker
               key={index}

mobile/src/Modal/ApiModal.js

@@ -3,7 +3,7 @@ import Modal from "react-native-modal"
 import PropTypes from "prop-types"
 import { View, Text, TouchableOpacity } from "react-native"
 import { Icon, OptionStrip } from "../ui"
-import autobind from "autobind-decorator"
+import { reactAutoBind } from "auto-bind2"
 import { api } from "../API"
 
 export class ApiModal extends Component {
@@ -14,12 +14,12 @@ export class ApiModal extends Component {
 
   constructor(props) {
     super(props)
+    reactAutoBind(this)
     this.state = {
       value: api.backend,
     }
   }
 
-  @autobind
   handleButtonPress() {
     const { onDismiss } = this.props
 
@@ -28,7 +28,6 @@ export class ApiModal extends Component {
     }
   }
 
-  @autobind
   handleValueChanged(newValue) {
     this.setState({ value: newValue })
   }

mobile/src/Modal/ImageViewerModal.js

@@ -3,7 +3,7 @@ import Modal from "react-native-modal"
 import PropTypes from "prop-types"
 import { View, Image, TouchableOpacity } from "react-native"
 import { Icon } from "../ui"
-import autobind from "autobind-decorator"
+import { reactAutoBind } from "auto-bind2"
 
 export class ImageViewerModal extends Component {
   static propTypes = {
@@ -12,7 +12,11 @@ export class ImageViewerModal extends Component {
     onDismiss: PropTypes.func,
   }
 
-  @autobind
+  constructor(props) {
+    super(props)
+    reactAutoBind(this)
+  }
+
   handleButtonPress() {
     const { onDismiss } = this.props
 

mobile/src/Modal/MessageModal.js

@@ -3,7 +3,7 @@ import Modal from "react-native-modal"
 import PropTypes from "prop-types"
 import { View, Text, TouchableOpacity } from "react-native"
 import { Icon } from "../ui"
-import autobind from "autobind-decorator"
+import { reactAutoBind } from "auto-bind2"
 
 export class MessageModal extends Component {
   static propTypes = {
@@ -14,7 +14,11 @@ export class MessageModal extends Component {
     onDismiss: PropTypes.func,
   }
 
-  @autobind
+  constructor(props) {
+    super(props)
+    reactAutoBind(this)
+  }
+
   handleButtonPress() {
     if (this.props.onDismiss) {
       this.props.onDismiss()

mobile/src/Modal/ProgressModal.js

@@ -3,7 +3,6 @@ import Modal from "react-native-modal"
 import PropTypes from "prop-types"
 import { View, Text, ActivityIndicator, TouchableOpacity } from "react-native"
 import { ProgressBar } from "../ui"
-import autobind from "autobind-decorator"
 
 export class ProgressModal extends Component {
   static propTypes = {

mobile/src/WorkItem/WorkItem.js

@@ -23,7 +23,7 @@ import {
   Geolocation,
 } from "../ui"
 import { MessageModal, ProgressModal, WaitModal } from "../Modal"
-import autobind from "autobind-decorator"
+import { reactAutoBind } from "auto-bind2"
 import { ifIphoneX, isIphoneX } from "react-native-iphone-x-helper"
 import KeyboardSpacer from "react-native-keyboard-spacer"
 import { api } from "../API"
@@ -93,14 +93,17 @@ export class WorkItem extends React.Component {
 
   constructor(props) {
     super(props)
+    reactAutoBind(this)
 
     this.state = {
       binder: new FormBinder({}, WorkItem.bindings),
       messageModal: null,
       waitModal: null,
       progressModal: null,
-      region: config.initialRegion,
     }
+    this.region = null
+    this.isMapReady = false
+    this.goToRegionWhenReady = false
 
     const { search } = this.props.location
     const params = search ? new URLSearchParams(search) : { get: () => null }
@@ -112,17 +115,18 @@ export class WorkItem extends React.Component {
         .then((workItem) => {
           if (workItem) {
             const [longitude, latitude] = workItem.location.coordinates
-            const region = {
+
+            this.region = {
               latitude,
               longitude,
-              latitudeDelta: 0.01,
+              latitudeDelta: config.workItemRegionDelta,
-              longitudeDelta: 0.01,
+              longitudeDelta: config.workItemRegionDelta,
             }
 
-            if (this.mapView) {
+            if (this.isMapReady) {
-              this.mapView.animateToRegion(region)
+              this.mapView.animateToRegion(this.region)
             } else {
-              this.goToRegion = region
+              this.goToRegionWhenReady = true
             }
 
             this.setState({
@@ -149,7 +153,6 @@ export class WorkItem extends React.Component {
     }
   }
 
-  @autobind
   handleBackPress() {
     const { history } = this.props
 
@@ -160,7 +163,6 @@ export class WorkItem extends React.Component {
     }
   }
 
-  @autobind
   handleDonePress() {
     const { binder } = this.state
     let obj = binder.getModifiedBindingValues()
@@ -198,7 +200,6 @@ export class WorkItem extends React.Component {
     }
   }
 
-  @autobind
   handleMessageDismiss() {
     const back = this.state.messageModal.back
     this.setState({ messageModal: null })
@@ -207,10 +208,11 @@ export class WorkItem extends React.Component {
     }
   }
 
-  @autobind
   handleRegionChange(region) {
     const { latitude, longitude } = region
 
+    this.region = region
+
     if (this.latLngInput) {
       this.latLngInput.handleChangeText(formatLatLng(latitude, longitude))
     }
@@ -226,15 +228,15 @@ export class WorkItem extends React.Component {
     )
   }
 
-  @autobind
   handleOnMapReady() {
-    if (this.goToRegion && this.mapView) {
+    if (this.goToRegionWhenReady) {
-      this.mapView.animateToRegion(this.goToRegion)
+      this.mapView.animateToRegion(this.region)
-      this.goToRegion = null
+      this.goToRegionWhenReady = false
     }
+
+    this.isMapReady = true
   }
 
-  @autobind
   handleStartAddressLookup(latLng) {
     api
       .getAddress(latLng)
@@ -250,7 +252,6 @@ export class WorkItem extends React.Component {
       })
   }
 
-  @autobind
   handleUploadStarted() {
     this.setState({
       progressModal: { message: "Uploading Photo..." },
@@ -258,7 +259,6 @@ export class WorkItem extends React.Component {
     })
   }
 
-  @autobind
   handleUploadProgress(uploadData) {
     if (this.state.progressModal) {
       this.setState({
@@ -272,35 +272,36 @@ export class WorkItem extends React.Component {
     }
   }
 
-  @autobind
   handleUploadEnded(successful, uploadData) {
     this.setState({ progressModal: null })
+    this.mapView.animateToRegion(this.region)
   }
 
-  @autobind
   handleUploadCanceled() {
     this.setState({ progressModal: null })
   }
 
-  @autobind
   handleAddActivity() {
     if (this.props.history) {
       this.props.history.push(`/activity?workItemId=${this.state.binder._id}`)
     }
   }
 
-  @autobind
   handlePositionUpdate(position) {
     const { coords } = position
 
-    this.setState({
+    this.region = {
-      region: {
+      latitude: coords.latitude,
-        latitude: coords.latitude,
+      longitude: coords.longitude,
-        longitude: coords.longitude,
+      latitudeDelta: config.workItemRegionDelta,
-        latitudeDelta: 0.02,
+      longitudeDelta: config.workItemRegionDelta,
-        longitudeDelta: 0.02,
+    }
-      },
+
-    })
+    if (this.isMapReady) {
+      this.mapView.animateToRegion(this.region)
+    } else {
+      this.goToRegionWhenReady = true
+    }
   }
 
   render() {
@@ -310,7 +311,6 @@ export class WorkItem extends React.Component {
       waitModal,
       progressModal,
       uploadPercent,
-      region,
     } = this.state
 
     return (
@@ -358,10 +358,11 @@ export class WorkItem extends React.Component {
                 rotateEnabled={false}
                 pitchEnabled={false}
                 showsUserLocation
+                showsMyLocationButton
                 showsBuildings={false}
                 showsTraffic={false}
                 showsIndoors={false}
-                region={region}
+                initialRegion={config.initialRegion}
                 onRegionChange={this.handleRegionChange}
                 onMapReady={this.handleOnMapReady}
               />

mobile/src/WorkItem/WorkItemList.js

@@ -10,7 +10,7 @@ import {
 } from "react-native"
 import { Icon, Header } from "../ui"
 import { MessageModal } from "../Modal"
-import autobind from "autobind-decorator"
+import { reactAutoBind } from "auto-bind2"
 import { SwipeListView } from "react-native-swipe-list-view"
 import { api } from "../API"
 import {
@@ -36,6 +36,7 @@ const styles = StyleSheet.create({
 export class WorkItemList extends React.Component {
   constructor(props) {
     super(props)
+    reactAutoBind(this)
     this.state = {
       messageModal: null,
     }
@@ -74,12 +75,10 @@ export class WorkItemList extends React.Component {
       })
   }
 
-  @autobind
   handleItemSelect(item, ref) {
     this.props.history.push(`/workItem?id=${item._id}`)
   }
 
-  @autobind
   handleItemDelete(item, ref) {
     api
       .deleteWorkItem(item._id)
@@ -110,17 +109,14 @@ export class WorkItemList extends React.Component {
       })
   }
 
-  @autobind
   handleMessageDismiss() {
     this.setState({ messageModal: null })
   }
 
-  @autobind
   handleDonePress() {
     this.props.history.push("/workItem")
   }
 
-  @autobind
   handleBackPress() {
     const { history } = this.props
 

mobile/src/config.js

@@ -10,21 +10,25 @@ export const config = {
   refererURL: "https://dar.kss.us.com",
   minDistanceToItem: 20,
   geocodeDelayMilliseconds: 500,
-  //defaultUser: "john@lyon-smith.org",
+  defaultUser: "john@lyon-smith.org",
-  defaultUser: "",
+  //defaultUser: "",
   // This region is downtown Toronto
-  initialRegion: {
-    latitude: 43.653908,
-    longitude: -79.384293,
-    latitudeDelta: 0.0922,
-    longitudeDelta: 0.0421,
-  },
-  // This region is Bainbridge Island
   // initialRegion: {
-  //   latitude: 47.629536,
+  //   latitude: 43.653908,
-  //   longitude: -122.524162,
+  //   longitude: -79.384293,
   //   latitudeDelta: 0.0922,
   //   longitudeDelta: 0.0421,
   // },
-  // alwaysShowWorkItemInAR: true,
+  // This region is Bainbridge Island
+  initialRegion: {
+    latitude: 47.629536,
+    longitude: -122.524162,
+    latitudeDelta: 0.0922,
+    longitudeDelta: 0.0421,
+  },
+  workItemRegionDelta: 0.005,
+  activityRegionDelta: 0.005,
+  homeRegionInset: 0.02,
+  homeRegionDelta: 0.005,
+  alwaysShowWorkItemInAR: true,
 }

mobile/src/ui/BoundButton.js

@@ -1,7 +1,7 @@
 import React from "react"
 import PropTypes from "prop-types"
 import { View, Text, TouchableHighlight } from "react-native"
-import autobind from "autobind-decorator"
+import { reactAutoBind } from "auto-bind2"
 
 export class BoundButton extends React.Component {
   static propTypes = {
@@ -14,6 +14,7 @@ export class BoundButton extends React.Component {
 
   constructor(props) {
     super(props)
+    reactAutoBind(this)
 
     const { name, binder } = this.props
 
@@ -21,7 +22,6 @@ export class BoundButton extends React.Component {
     this.state = binder.getBindingState(name)
   }
 
-  @autobind
   updateValue(e) {
     this.setState(e.state)
   }

mobile/src/ui/BoundHeader.js

@@ -1,7 +1,7 @@
 import React from "react"
 import PropTypes from "prop-types"
 import { Header } from "."
-import autobind from "autobind-decorator"
+import { reactAutoBind } from "auto-bind2"
 
 const headerButtonShape = {
   icon: PropTypes.string.isRequired,
@@ -19,6 +19,7 @@ export class BoundHeader extends React.Component {
 
   constructor(props) {
     super(props)
+    reactAutoBind(this)
 
     const { name, binder } = this.props
 
@@ -26,7 +27,6 @@ export class BoundHeader extends React.Component {
     this.state = binder.getBindingState(name)
   }
 
-  @autobind
   updateValue(e) {
     this.setState(e.state)
   }

mobile/src/ui/BoundInput.js

@@ -1,7 +1,7 @@
 import React from "react"
 import PropTypes from "prop-types"
 import { TextInput, Text, View, Platform } from "react-native"
-import autobind from "autobind-decorator"
+import { reactAutoBind } from "auto-bind2"
 
 export class BoundInput extends React.Component {
   static propTypes = {
@@ -20,11 +20,11 @@ export class BoundInput extends React.Component {
 
   constructor(props) {
     super(props)
+    reactAutoBind(this)
 
     const { name, binder } = this.props
 
     this.state = binder.getBindingState(name)
-    this.handleChangeText = this.handleChangeText.bind(this)
   }
 
   componentWillReceiveProps(nextProps) {
@@ -33,7 +33,6 @@ export class BoundInput extends React.Component {
     }
   }
 
-  // @autobind : There seems to be a bug with using this here, so we just do it the old way
   handleChangeText(newText) {
     const { binder, name } = this.props
 

mobile/src/ui/BoundOptionStrip.js

@@ -2,7 +2,7 @@ import React from "react"
 import PropTypes from "prop-types"
 import { View, Text } from "react-native"
 import { OptionStrip } from "."
-import autobind from "autobind-decorator"
+import { reactAutoBind } from "auto-bind2"
 
 export class BoundOptionStrip extends React.Component {
   static propTypes = {
@@ -17,10 +17,10 @@ export class BoundOptionStrip extends React.Component {
 
   constructor(props) {
     super(props)
+    reactAutoBind(this)
     this.state = props.binder.getBindingState(props.name)
   }
 
-  @autobind
   handleValueChanged(newValue) {
     this.setState(
       this.props.binder.updateBindingValue(this.props.name, newValue)

mobile/src/ui/BoundPhotoPanel.js

@@ -12,7 +12,7 @@ import {
 import { Icon } from "."
 import ImagePicker from "react-native-image-picker"
 import ImageResizer from "react-native-image-resizer"
-import autobind from "autobind-decorator"
+import { reactAutoBind } from "auto-bind2"
 import { api } from "../API"
 
 const getScreenPortraitDimensions = () => {
@@ -35,10 +35,8 @@ export class BoundPhotoPanel extends Component {
 
   constructor(props) {
     super(props)
-
+    reactAutoBind(this)
-    const { name, binder } = this.props
+    this.state = this.props.binder.getBindingState(this.props.name)
-
-    this.state = binder.getBindingState(name)
   }
 
   componentWillReceiveProps(nextProps) {
@@ -47,7 +45,6 @@ export class BoundPhotoPanel extends Component {
     }
   }
 
-  @autobind
   handlePhotoPress(index) {
     const { onUploadStarted, onUploadEnded, onUploadProgress } = this.props
 
@@ -98,7 +95,6 @@ export class BoundPhotoPanel extends Component {
     )
   }
 
-  @autobind
   handleLayout(e) {
     if (!this.state.photoSize) {
       const { layout } = e.nativeEvent

mobile/src/ui/BoundSwitch.js

@@ -1,7 +1,7 @@
 import React from "react"
 import PropTypes from "prop-types"
 import { View, Switch, Text } from "react-native"
-import autobind from "autobind-decorator"
+import { reactAutoBind } from "auto-bind2"
 
 export class BoundSwitch extends React.Component {
   static propTypes = {
@@ -12,10 +12,10 @@ export class BoundSwitch extends React.Component {
 
   constructor(props) {
     super(props)
+    reactAutoBind(this)
     this.state = props.binder.getBindingState(props.name)
   }
 
-  @autobind
   handleValueChange(newValue) {
     const { binder, name } = this.props
     const state = binder.getBindingState(name)

mobile/src/ui/FormStaticInput.js

@@ -1,7 +1,6 @@
 import React from "react"
 import PropTypes from "prop-types"
 import { TextInput, Text, View, Platform } from "react-native"
-import autobind from "autobind-decorator"
 
 export class FormStaticInput extends React.Component {
   static propTypes = {

mobile/src/ui/Geolocation.js

@@ -1,7 +1,6 @@
 import React, { Component } from "react"
 import { Image, View } from "react-native"
 import PropTypes from "prop-types"
-import autobind from "autobind-decorator"
 
 export class Geolocation extends Component {
   static propTypes = {

mobile/src/ui/OptionStrip.js

@@ -1,7 +1,7 @@
 import React, { Component } from "react"
 import { View, Text, TouchableHighlight } from "react-native"
 import PropTypes from "prop-types"
-import autobind from "autobind-decorator"
+import { reactAutoBind } from "auto-bind2"
 
 export class OptionStrip extends Component {
   static propTypes = {
@@ -14,12 +14,12 @@ export class OptionStrip extends Component {
 
   constructor(props) {
     super(props)
+    reactAutoBind(this)
     this.state = {
       selectedOption: this.getSelectedOption(props.options, props.value),
     }
   }
 
-  @autobind
   getSelectedOption(options, value) {
     return options.find((option) => value === option.value) || null
   }
@@ -38,7 +38,6 @@ export class OptionStrip extends Component {
     }
   }
 
-  @autobind
   handlePress(option) {
     const { onValueChanged } = this.props
 

mobile/src/version.js

@@ -1,6 +1,6 @@
 export const versionInfo = {
-  version: '1.0.1',
+  version: '1.1.0',
-  fullVersion: '1.0.1-20180518.0',
+  fullVersion: '1.1.0-20180525.0',
   title: 'Deighton AR System',
   copyright: '© 2018, Kingston Software Solutions.',
   supportEmail: 'support@kss.us.com',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "deighton-ar",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Deighton AR Training System",
   "main": "index.js",
   "repository": {

server/config/default-test.json5

@@ -22,6 +22,7 @@
     maxPasswordTokenAgeInHours: 3,
     sendEmailDelayInSeconds: 3,
     supportEmail: 'support@kss.us.com',
-    sendEmail: true
+    sendEmail: true,
+    appName: "Deighton AR Test",
   }
 }

server/config/default.json5

@@ -22,6 +22,7 @@
     maxPasswordTokenAgeInHours: 3,
     sendEmailDelayInSeconds: 3,
     supportEmail: 'support@kss.us.com',
-    sendEmail: true
+    sendEmail: true,
+    appName: "Deighton AR",
   }
 }

server/package.json

@@ -7,7 +7,7 @@
     "start": "babel-node src/server.js",
     "start:prod": "NODE_ENV=production node dist/server.js",
     "build": "rm -rf dist && babel src -d dist -s",
-    "deploy": "rsync -vr -e ssh --exclude-from .rsync-exclude * $SNAP_DEPLOY_USER@$SNAP_DEPLOY_HOST:deighton-ar-server/ && ssh $SNAP_DEPLOY_USER@$SNAP_DEPLOY_HOST 'cd deighton-ar-server; npm install; sudo ./ops restart; sudo ./ops --test restart'",
+    "deploy": "rsync -vr -e ssh --exclude-from .rsync-exclude * $SNAP_DEPLOY_USER_HOST:deighton-ar-server/ && ssh $SNAP_DEPLOY_USER_HOST 'cd deighton-ar-server; npm install; sudo ./ops restart; sudo ./ops --test restart'",
     "test": "jest",
     "actor:api": "monzilla 'src/api/**/*.js:src/database/**/*.js' -- babel-node src/api/index.js",
     "actor:api:debug": "babel-node --inspect-brk src/api/index.js",

server/src/api/routes/AssetRoutes.js

@@ -8,22 +8,7 @@ import config from "config"
 import autobind from "autobind-decorator"
 import { PassThrough } from "stream"
 import { catchAll } from "."
-
+import { pipeToPromise } from "../../util"
-function pipeToGridFS(readable, writeable) {
-  const promise = new Promise((resolve, reject) => {
-    readable.on("error", (error) => {
-      reject(error)
-    })
-    writeable.on("error", (error) => {
-      reject(error)
-    })
-    writeable.on("finish", (file) => {
-      resolve(file)
-    })
-  })
-  readable.pipe(writeable)
-  return promise
-}
 
 @autobind
 export class AssetRoutes {
@@ -109,7 +94,7 @@ export class AssetRoutes {
   }
 
   async beginAssetUpload(req, res, next) {
-    const uploadId = this.db.newObjectId()
+    const uploadId = this.db.newObjectId().toString()
     let {
       fileName,
       uploadSize,
@@ -224,12 +209,12 @@ export class AssetRoutes {
       if (uploadedChunks >= uploadData.numberOfChunks) {
         let readable = redisReadStream(this.rs.client, uploadDataId)
         let writeable = this.db.gridfs.openUploadStreamWithId(
-          uploadId,
+          this.db.newObjectId(uploadId),
           uploadData.fileName,
           { contentType: uploadData.contentType }
         )
 
-        const file = await pipeToGridFS(readable, writeable)
+        const file = await pipeToPromise(readable, writeable)
 
         await Promise.all([
           this.rs.del(uploadId),

server/src/api/routes/AuthRoutes.js

@@ -25,6 +25,8 @@ export class AuthRoutes {
     this.sendEmailDelayInSeconds = config.get("email.sendEmailDelayInSeconds")
     this.supportEmail = config.get("email.supportEmail")
     this.sendEmail = config.get("email.sendEmail")
+    this.appName = config.get("email.appName")
+    this.emailServiceName = config.get("serviceName.email")
     app
       .route("/auth/login")
       // Used to login. Email must be confirmed.
@@ -208,11 +210,12 @@ export class AuthRoutes {
           siteUrl.host
         }/confirm-email?email-token%3D${savedUser.emailToken.value}`,
         supportEmail: this.supportEmail,
+        appName: this.appName,
       },
     })
 
     if (this.sendEmail) {
-      await this.mq.request("dar-email", "sendEmail", msgs)
+      await this.mq.request(this.emailServiceName, "sendEmail", msgs)
     }
 
     res.json({})
@@ -393,10 +396,11 @@ export class AuthRoutes {
           siteUrl.host
         }/reset-password?password-token%3D${savedUser.passwordToken.value}`,
         supportEmail: this.supportEmail,
+        appName: this.appName,
       },
     }
     if (this.sendEmail) {
-      await this.mq.request("dar-email", "sendEmail", msg)
+      await this.mq.request(this.emailServiceName, "sendEmail", msg)
     }
 
     res.json({})

server/src/api/routes/TeamRoutes.js

@@ -41,7 +41,7 @@ export class TeamRoutes extends BaseRoutes {
 
     res.writeHead(200, {
       "Content-Type": "application/gzip",
-      "Content-Disposition": 'attachment; filename="team-scores.gzip"',
+      "Content-Disposition": 'attachment; filename="team-scores.json.gzip"',
     })
     readable.pipe(gzip).pipe(res)
   }

server/src/api/routes/UserRoutes.js

@@ -19,6 +19,8 @@ export class UserRoutes {
     this.ws = container.ws
     this.maxEmailTokenAgeInHours = config.get("email.maxEmailTokenAgeInHours")
     this.sendEmail = config.get("email.sendEmail")
+    this.emailServiceName = config.get("serviceName.email")
+
     app
       .route("/users")
       .get(
@@ -164,7 +166,7 @@ export class UserRoutes {
     res.json(savedUser.toClient())
 
     if (this.sendEmail) {
-      await this.mq.request("dar-email", "sendEmail", msg)
+      await this.mq.request(this.emailServiceName, "sendEmail", msg)
     }
   }
 
@@ -244,7 +246,7 @@ export class UserRoutes {
     res.json({})
 
     if (this.sendEmail) {
-      await this.mq.request("dar-email", "sendEmail", msg)
+      await this.mq.request(this.emailServiceName, "sendEmail", msg)
     }
   }
 }

server/src/api/routes/WorkItemRoutes.js

@@ -25,6 +25,15 @@ export class WorkItemRoutes extends BaseRoutes {
       )
   }
 
+  async deleteItem(req, res, next) {
+    super.deleteItem(req, res, next)
+
+    const id = req.params._id
+    const Activity = this.db.Activity
+
+    await Activity.remove({ workItem: id })
+  }
+
   async listWorkItemActivities(req, res, next) {
     const WorkItem = this.db.WorkItem
     const aggregate = WorkItem.aggregate()

server/src/util.js

@@ -0,0 +1,39 @@
+import stream from "stream"
+
+export function streamToBuffer(readable) {
+  return new Promise((resolve, reject) => {
+    var chunks = []
+    var writeable = new stream.Writable()
+
+    writeable._write = function(chunk, enc, done) {
+      chunks.push(chunk)
+      done()
+    }
+
+    readable.on("end", function() {
+      resolve(Buffer.concat(chunks))
+    })
+
+    readable.on("error", (err) => {
+      reject(err)
+    })
+
+    readable.pipe(writeable)
+  })
+}
+
+export function pipeToPromise(readable, writeable) {
+  const promise = new Promise((resolve, reject) => {
+    readable.on("error", (error) => {
+      reject(error)
+    })
+    writeable.on("error", (error) => {
+      reject(error)
+    })
+    writeable.on("finish", (file) => {
+      resolve(file)
+    })
+  })
+  readable.pipe(writeable)
+  return promise
+}

server/src/version.js

@@ -1,6 +1,6 @@
 export const versionInfo = {
-  version: '1.0.1',
+  version: '1.1.0',
-  fullVersion: '1.0.1-20180518.0',
+  fullVersion: '1.1.0-20180525.0',
   title: 'Deighton AR System',
   copyright: '© 2018, Kingston Software Solutions.',
   supportEmail: 'support@kss.us.com',

version.json5

@@ -15,11 +15,11 @@
   buildFormat: "full",
   tags: {
     major: 1,
-    minor: 0,
+    minor: 1,
-    patch: 1,
+    patch: 0,
-    build: 20180518,
+    build: 20180525,
     revision: 0,
-    sequence: 4,
+    sequence: 6,
     tz: "America/Los_Angeles",
     title: "Deighton AR System",
     copyright: "© 2018, Kingston Software Solutions.",

website/package.json

@@ -62,7 +62,7 @@
   "scripts": {
     "start": "node scripts/start.js",
     "build": "node scripts/build.js",
-    "deploy": "rsync -vr -e ssh build/* $SNAP_DEPLOY_USER@$SNAP_DEPLOY_HOST:deighton-ar-website/",
+    "deploy": "rsync -vr -e ssh build/* $SNAP_DEPLOY_USER_HOST:deighton-ar-website/",
     "lint": "eslint --ext .js --ext .jsx src/",
     "lint:fix": "eslint --ext .js --ext .jsx --fix src/"
   },

website/src/API.js

@@ -52,12 +52,12 @@ class API extends EventEmitter {
           localStorage.removeItem(authTokenKeyName)
           sessionStorage.removeItem(authTokenKeyName)
           this._token = null
-          this._user = {}
+          this._user = { loggedOut: true }
           this.socket = null
           this.emit("logout")
         })
     } else {
-      this._user = {}
+      this._user = { loggedOut: true }
     }
   }
 
@@ -229,7 +229,7 @@ class API extends EventEmitter {
       localStorage.removeItem(authTokenKeyName)
       sessionStorage.removeItem(authTokenKeyName)
       this._token = null
-      this._user = {}
+      this._user = { loggedOut: true }
       this.disconnectSocket()
       this.emit("logout")
     }

website/src/App.js

@@ -2,6 +2,7 @@ import React, { Component } from "react"
 import {
   Login,
   Logout,
+  Parking,
   ResetPassword,
   ForgotPassword,
   ConfirmEmail,
@@ -29,18 +30,38 @@ export class App extends Component {
       <BrowserRouter>
         <Column minHeight="100vh">
           <Route
-            path="/app"
+            path="/admin"
             render={(props) => (
               <Column.Item height={sizeInfo.headerHeight}>
                 <Header
                   {...props}
                   left={[
-                    { image: require("images/badge.png"), path: "/app/home" },
+                    { image: require("images/badge.png"), path: "/admin/home" },
-                    { text: "Teams", path: "/app/teams" },
+                    { text: "Teams", path: "/admin/teams" },
-                    { text: "Users", path: "/app/users" },
+                    { text: "Users", path: "/admin/users" },
                   ]}
                   right={[
-                    { icon: "profile", path: "/app/profile" },
+                    { icon: "profile", path: "/admin/profile" },
+                    { icon: "logout", path: "/logout" },
+                  ]}
+                />
+              </Column.Item>
+            )}
+          />
+          <Route
+            path="/user"
+            render={(props) => (
+              <Column.Item height={sizeInfo.headerHeight}>
+                <Header
+                  {...props}
+                  left={[
+                    {
+                      image: require("images/badge.png"),
+                      path: "/user/profile",
+                    },
+                  ]}
+                  right={[
+                    { icon: "profile", path: "/user/profile" },
                     { icon: "logout", path: "/logout" },
                   ]}
                 />
@@ -50,18 +71,30 @@ export class App extends Component {
           <Switch>
             <Route exact path="/login" component={Login} />
             <Route exact path="/logout" component={Logout} />
+            <Route exact path="/parking" component={Parking} />
             <Route exact path="/confirm-email" component={ConfirmEmail} />
             <Route exact path="/reset-password" component={ResetPassword} />
             <Route exact path="/forgot-password" component={ForgotPassword} />
-            <ProtectedRoute exact path="/app/profile" component={Profile} />
+            <ProtectedRoute exact path="/user/profile" component={Profile} />
-            <ProtectedRoute exact admin path="/app/home" component={Home} />
+            <ProtectedRoute
-            <ProtectedRoute exact admin path="/app/teams" component={Teams} />
+              exact
-            <ProtectedRoute exact admin path="/app/system" component={System} />
+              admin
-            <ProtectedRoute exact admin path="/app/users" component={Users} />
+              path="/admin/profile"
-            <DefaultRoute redirect="/app/home" />
+              component={Profile}
+            />
+            <ProtectedRoute exact admin path="/admin/home" component={Home} />
+            <ProtectedRoute exact admin path="/admin/teams" component={Teams} />
+            <ProtectedRoute
+              exact
+              admin
+              path="/admin/system"
+              component={System}
+            />
+            <ProtectedRoute exact admin path="/admin/users" component={Users} />
+            <DefaultRoute user="/user/profile" admin="/admin/home" />
           </Switch>
           <Route
-            path="/app"
+            path="/(user|admin)"
             render={() => (
               <Column.Item>
                 <Footer

website/src/Auth/ConfirmEmail.js

@@ -79,7 +79,7 @@ export class ConfirmEmail extends React.Component {
     return (
       <div>
         <WaitModal
-          active={!!waitModal}
+          open={!!waitModal}
           message={waitModal ? waitModal.message : ""}
         />
 

website/src/Auth/DefaultRoute.js

@@ -1,14 +1,49 @@
 import React, { Component } from "react"
 import { Route, Redirect } from "react-router-dom"
 import PropTypes from "prop-types"
+import { api } from "src/API"
 
 export class DefaultRoute extends Component {
   static propTypes = {
-    redirect: PropTypes.string,
+    location: PropTypes.shape({
+      pathname: PropTypes.string,
+      search: PropTypes.string,
+    }),
+    user: PropTypes.string.isRequired,
+    admin: PropTypes.string.isRequired,
   }
 
   render() {
-    // NOTE: When working on the site, Redirect to the page you are working on
+    const user = api.loggedInUser
-    return <Route render={() => <Redirect to={this.props.redirect} />} />
+
+    if (user.loggedOut) {
+      return <Route render={() => <Redirect to="/login" />} />
+    } else if (user.pending) {
+      // If login token has not yet been confirmed, park until it is then come back here
+      return (
+        <Route
+          render={() => (
+            <Redirect
+              to={`/parking?redirect=${this.props.location.pathname}`}
+            />
+          )}
+        />
+      )
+    } else {
+      // Render a redirect to the user or admin default page
+      return (
+        <Route
+          render={() => (
+            <Redirect
+              to={
+                user._id && user.administrator
+                  ? this.props.admin
+                  : this.props.user
+              }
+            />
+          )}
+        />
+      )
+    }
   }
 }

website/src/Auth/ForgotPassword.js

@@ -151,7 +151,7 @@ export class ForgotPassword extends Component {
         </Column.Item>
         <Column.Item grow>
           <WaitModal
-            active={!!waitModal}
+            open={!!waitModal}
             message={waitModal ? waitModal.message : ""}
           />
 

website/src/Auth/Login.js

@@ -75,7 +75,9 @@ export class Login extends Component {
           this.setState({ waitModal: false })
           if (this.props.history) {
             let url =
-              new URLSearchParams(window.location.search).get("redirect") || "/"
+              new URLSearchParams(this.props.history.location.search).get(
+                "redirect"
+              ) || "/"
 
             try {
               this.props.history.replace(url)
@@ -224,7 +226,7 @@ export class Login extends Component {
           </Row>
         </Column.Item>
         <Column.Item grow>
-          <WaitModal active={waitModal} message="Logging in..." />
+          <WaitModal open={waitModal} message="Logging in..." />
           <MessageModal
             error
             open={!!messageModal}

website/src/Auth/Parking.js

@@ -0,0 +1,53 @@
+import React, { Component, Fragment } from "react"
+import PropTypes from "prop-types"
+import { api } from "src/API"
+import { WaitModal } from "../Modal"
+import { Column } from "ui"
+import autobind from "autobind-decorator"
+
+export class Parking extends Component {
+  static propTypes = {
+    history: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),
+  }
+
+  componentDidMount() {
+    api.addListener("login", this.goToRedirect)
+    api.addListener("logout", this.goToLogin)
+  }
+
+  componentWillUnmount() {
+    api.removeListener("login", this.goToRedirect)
+    api.removeListener("logout", this.goToLogin)
+  }
+
+  @autobind
+  goToRedirect() {
+    if (this.props.history) {
+      let url =
+        new URLSearchParams(this.props.history.location.search).get(
+          "redirect"
+        ) || "/"
+
+      try {
+        this.props.history.replace(url)
+      } catch (error) {
+        this.props.history.replace("/")
+      }
+    }
+  }
+
+  @autobind
+  goToLogin() {
+    this.props.history.replace("/login")
+  }
+
+  render() {
+    return (
+      <Fragment>
+        <Column.Item grow>
+          <WaitModal open loader={false} message="Authenticating..." />
+        </Column.Item>
+      </Fragment>
+    )
+  }
+}

website/src/Auth/ProtectedRoute.js

@@ -1,8 +1,7 @@
-import React from 'react'
+import React from "react"
-import { Route, Redirect } from 'react-router'
+import { Route, Redirect } from "react-router"
-import { PropTypes } from 'prop-types'
+import { PropTypes } from "prop-types"
-import { api } from 'src/API'
+import { api } from "src/API"
-import autobind from 'autobind-decorator'
 
 export class ProtectedRoute extends React.Component {
   static propTypes = {
@@ -13,33 +12,32 @@ export class ProtectedRoute extends React.Component {
     admin: PropTypes.bool,
   }
 
-  @autobind
-  updateComponent() {
-    this.forceUpdate()
-  }
-
-  componentDidMount() {
-    api.addListener("login", this.updateComponent)
-    api.addListener("logout", this.updateComponent)
-  }
-
-  componentWillUnmount() {
-    api.removeListener("login", this.updateComponent)
-    api.removeListener("logout", this.updateComponent)
-  }
-
   render(props) {
     const user = api.loggedInUser
 
     if (user.pending) {
-      return null
+      // If login token has not yet been confirmed, park until it is and redirect back here
+      return (
+        <Route
+          render={() => (
+            <Redirect
+              to={`/parking?redirect=${this.props.location.pathname}`}
+            />
+          )}
+        />
+      )
     } else {
+      // If we are not a user or an admin go to the login page
       if (!user._id || (this.props.admin && !user.administrator)) {
         return (
-          <Redirect
+          <Route
-            to={`/login?redirect=${this.props.location.pathname}${
+            render={() => (
-              this.props.location.search
+              <Redirect
-            }`}
+                to={`/login?redirect=${this.props.location.pathname}${
+                  this.props.location.search
+                }`}
+              />
+            )}
           />
         )
       } else {

website/src/Auth/ResetPassword.js

@@ -205,7 +205,7 @@ export class ResetPassword extends Component {
           />
 
           <WaitModal
-            active={!!waitModal}
+            open={!!waitModal}
             message={waitModal ? waitModal.message : ""}
           />
         </Column.Item>

website/src/Auth/index.js

@@ -1,7 +1,8 @@
-export { Login } from './Login'
+export { Login } from "./Login"
-export { Logout } from './Logout'
+export { Logout } from "./Logout"
-export { ResetPassword } from './ResetPassword'
+export { Parking } from "./Parking"
-export { ForgotPassword } from './ForgotPassword'
+export { ResetPassword } from "./ResetPassword"
-export { ConfirmEmail } from './ConfirmEmail'
+export { ForgotPassword } from "./ForgotPassword"
-export { DefaultRoute } from './DefaultRoute'
+export { ConfirmEmail } from "./ConfirmEmail"
-export { ProtectedRoute } from './ProtectedRoute'
+export { DefaultRoute } from "./DefaultRoute"
+export { ProtectedRoute } from "./ProtectedRoute"

website/src/Home/Home.js

@@ -19,7 +19,7 @@ export class Home extends Component {
               <PanelButton
                 icon="users"
                 text="Users"
-                onClick={() => this.props.history.push("/app/users")}
+                onClick={() => this.props.history.push("/admin/users")}
               />
             </Row.Item>
             <Row.Item width={sizeInfo.panelButtonSpacing} />
@@ -27,7 +27,7 @@ export class Home extends Component {
               <PanelButton
                 icon="teams"
                 text="Teams"
-                onClick={() => this.props.history.push("/app/teams")}
+                onClick={() => this.props.history.push("/admin/teams")}
               />
             </Row.Item>
             <Row.Item width={sizeInfo.panelButtonSpacing} />
@@ -35,7 +35,7 @@ export class Home extends Component {
               <PanelButton
                 icon="system"
                 text="System"
-                onClick={() => this.props.history.push("/app/system")}
+                onClick={() => this.props.history.push("/admin/system")}
               />
             </Row.Item>
             <Row.Item grow />

website/src/MasterDetail/MasterDetail.js

@@ -352,7 +352,7 @@ export class MasterDetail extends Component {
           />
 
           <WaitModal
-            active={!!waitModal}
+            open={!!waitModal}
             message={waitModal ? waitModal.message : ""}
           />
 

website/src/MasterDetail/MasterList.js

@@ -47,7 +47,7 @@ export class MasterList extends React.Component {
                 <List.Item
                   key={item._id || "0"}
                   onClick={(e) => this.props.onItemListClick(e, index)}
-                  active={item === this.props.selectedItem}>
+                  open={item === this.props.selectedItem}>
                   <List.Icon name={data.icon} size={sizeInfo.listIcon} />
                   <List.Text>{data.text}</List.Text>
                   {item === selectedItem && selectionModified ? (

website/src/Modal/WaitModal.js

@@ -4,17 +4,26 @@ import { Dimmer, Loader, Text } from 'ui'
 
 export class WaitModal extends React.Component {
   static propTypes = {
-    active: PropTypes.bool.isRequired,
+    open: PropTypes.bool.isRequired,
     message: PropTypes.string,
+    loader: PropTypes.bool,
+  }
+
+  static defaultProps = {
+    loader: true,
   }
 
   render() {
-    const { active, message } = this.props
+    const { open, message, loader } = this.props
 
     return (
-      <Dimmer active={active}>
+      <Dimmer active={open}>
-        <Loader />
+        {loader && <Loader />}
-        {message && <Text size='huge' color='inverse'>{message}</Text>}
+        {message && (
+          <Text size="huge" color="inverse">
+            {message}
+          </Text>
+        )}
       </Dimmer>
     )
   }

website/src/Profile/Profile.js

@@ -166,7 +166,7 @@ export class Profile extends Component {
           />
 
           <WaitModal
-            active={!!waitModal}
+            open={!!waitModal}
             message={waitModal ? waitModal.message : ""}
           />
 

website/src/System/System.js

@@ -208,7 +208,7 @@ export class System extends Component {
           />
 
           <WaitModal
-            active={!!waitModal}
+            open={!!waitModal}
             message={waitModal ? waitModal.message : ""}
           />
         </Column.Item>

website/src/version.js

@@ -1,6 +1,6 @@
 export const versionInfo = {
-  version: '1.0.1',
+  version: '1.1.0',
-  fullVersion: '1.0.1-20180518.0',
+  fullVersion: '1.1.0-20180525.0',
   title: 'Deighton AR System',
   copyright: '© 2018, Kingston Software Solutions.',
   supportEmail: 'support@kss.us.com',