Reduce sensitivity

Version 1.2.0-20180531.0
Added wait modals everywhere. Reduce required distance to item
2018-05-31 13:38:28 -07:00 · 2018-05-31 11:16:42 -07:00 · 2018-05-31 11:15:53 -07:00 · 2018-05-31 07:20:29 -07:00 · 2018-05-29 13:09:48 -07:00 · 2018-05-29 12:49:51 -07:00
66 changed files with 2099 additions and 1619 deletions
--- a/mobile/.babelrc
+++ b/mobile/.babelrc
@@ -6,7 +6,6 @@
    "development": {
      "plugins": [
        "transform-react-jsx-source",
-        "transform-decorators-legacy"
      ]
    }
  }
--- a/mobile/android/DeightonAR.iml
+++ b/mobile/android/DeightonAR.iml
@@ -8,7 +8,7 @@
      </configuration>
    </facet>
  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
--- a/mobile/android/app/app.iml
+++ b/mobile/android/app/app.iml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":app" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-fragment-25.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.fresco:fbcore-1.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.exoplayer:exoplayer-r2.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat-25.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.fresco:drawee-1.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline-okhttp3-1.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: artifacts:arcore_client" level="project" />
+    <orderEntry type="library" name="Gradle: com.parse.bolts:bolts-tasks:1.4.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.13.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-25.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.amazonaws:aws-android-sdk-ddb:2.2.22@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.2.4@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-25.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.fresco:fresco-1.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-compat-25.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: org.webkit:android-jsc-r174650" level="project" />
+    <orderEntry type="library" name="Gradle: com.amazonaws:aws-android-sdk-s3:2.2.22@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-25.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.amazonaws:aws-android-sdk-core:2.2.22@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.soloader:soloader-0.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-25.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-25.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.fbui.textlayoutbuilder:textlayoutbuilder-1.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline-base-1.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.6.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-v4-25.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.fbui.textlayoutbuilder:staticlayout-proxy:1.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: artifacts:react_viro" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.react:react-native-0.55.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.0.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.amazonaws:aws-android-sdk-cognito:2.2.22@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.amazonaws:aws-android-sdk-cognitoidentityprovider:2.2.22@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp-urlconnection:3.6.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: artifacts:viro_renderer" level="project" />
+    <orderEntry type="library" name="Gradle: com.amazonaws:aws-android-sdk-ddb-mapper:2.2.22@jar" level="project" />
+    <orderEntry type="library" name="Gradle: artifacts:gvr_common" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline-1.3.0" level="project" />
+    <orderEntry type="module" module-name="react-native-fs" />
+    <orderEntry type="module" module-name="react-native-maps" />
+    <orderEntry type="module" module-name="react-native-image-resizer" />
+    <orderEntry type="module" module-name="react-native-image-picker" />
+    <orderEntry type="library" name="Gradle: android-android-27" level="project" />
+  </component>
+</module>
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -101,8 +101,8 @@ android {
        applicationId "com.deightonar"
        minSdkVersion 24
        targetSdkVersion 27
-        versionCode 4
-        versionName "1.0.1"
+        versionCode 10
+        versionName "1.2.0"
        ndk {
            abiFilters "armeabi-v7a", "x86"
        }
--- a/mobile/android/app/src/main/AndroidManifest.xml
+++ b/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:versionName="1.0.1">
+    android:versionCode="10"
+    android:versionName="1.2.0">

    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
--- a/mobile/ios/DeightonAR.xcodeproj/project.pbxproj
+++ b/mobile/ios/DeightonAR.xcodeproj/project.pbxproj
@@ -140,6 +140,11 @@
 				TargetAttributes = {
 					13B07F861A680F5B00A75B9A = {
 						DevelopmentTeam = 523GZPCZ3X;
+						SystemCapabilities = {
+							com.apple.BackgroundModes = {
+								enabled = 1;
+							};
+						};
 					};
 				};
 			};
--- a/mobile/ios/DeightonAR/Info.plist
+++ b/mobile/ios/DeightonAR/Info.plist
@@ -2,8 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>$(PRODUCT_NAME) camera use</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>$(PRODUCT_NAME) background location use</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.1</string>
+	<string>1.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>20180518.0</string>
+	<string>20180531.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -33,8 +33,16 @@
 	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>$(PRODUCT_NAME) camera use</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>$(PRODUCT_NAME) location use</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>$(PRODUCT_NAME) camera use</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>$(PRODUCT_NAME) photo use</string>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>location</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -46,8 +54,6 @@
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
-	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>$(PRODUCT_NAME) location use</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
 </dict>
--- a/mobile/package-lock.json
+++ b/mobile/package-lock.json
--- a/mobile/package.json
+++ b/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",
--- a/mobile/src/API.js
+++ b/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

--- a/mobile/src/ARViewer/ARViewer.js
+++ b/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 =
-            [forward[0] * 1.0, forward[1] * 1.0, forward[2]] * 1.0
+          const defaultPosition = [
+            forward[0] * 1.0,
+            forward[1] * 1.0,
+            forward[2] * 1.0,
+          ]
          let hitResultPosition = null

          // Filter the hit test results based on the position.
@@ -110,7 +113,6 @@ class WorkItemSceneAR extends React.Component {
    })
  }

-  @autobind
  updateInitialRotation() {
    this.arNode.getTransformAsync().then((retDict) => {
      let rotation = retDict.rotation
@@ -131,7 +133,6 @@ class WorkItemSceneAR extends React.Component {
    })
  }

-  @autobind
  handleTrackingUpdated(state, reason) {
    if (
      !this.state.trackingInitialized &&
@@ -141,12 +142,10 @@ class WorkItemSceneAR extends React.Component {
    }
  }

-  @autobind
  handleAnchorFound() {
    this.setState({ haveAnchor: true })
  }

-  @autobind
  handleClick(position, source) {
    const { workItemId } = this.props

@@ -182,7 +181,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 +192,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 +218,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 +230,6 @@ export class ARViewer extends React.Component {
    }
  }

-  @autobind
  handleBackPress() {
    this.props.history.replace("/")
  }
--- a/mobile/src/Activity/Activity.js
+++ b/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,24 +86,30 @@ 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
  }

+  componentDidMount() {
    const { search } = this.props.location
    const params = search ? new URLSearchParams(search) : { get: () => null }
    const id = params.get("id")
    const workItemId = params.get("workItemId")
-
    const getWorkItem = (id) => {
+      this.setState({ waitModal: { message: "Loading Work Item Details..." } })
      api
        .getWorkItem(id)
        .then((workItem) => {
+          this.setState({ waitModal: null })
          if (workItem) {
            const [lng, lat] = workItem.location.coordinates

@@ -116,19 +122,27 @@ 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) => {
          this.setState({
+            waitModal: null,
            messageModal: {
              icon: "hand",
              message: "Unable to get work item details",
@@ -140,9 +154,12 @@ export class Activity extends React.Component {
    }

    if (id) {
+      this.setState({ waitModal: { message: "Loading Activity..." } })
      api
        .getActivity(id)
        .then((activity) => {
+          this.setState({ waitModal: null })
+
          if (activity) {
            this.setState({
              binder: new FormBinder(activity, Activity.bindings),
@@ -153,6 +170,7 @@ export class Activity extends React.Component {
        })
        .catch((err) => {
          this.setState({
+            waitModal: null,
            messageModal: {
              icon: "hand",
              message: "Unable to get activity details",
@@ -170,7 +188,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 +205,6 @@ export class Activity extends React.Component {
    }
  }

-  @autobind
  handleBackPress() {
    const { history } = this.props

@@ -190,7 +215,6 @@ export class Activity extends React.Component {
    }
  }

-  @autobind
  handleDonePress() {
    const { binder } = this.state
    let obj = binder.getModifiedBindingValues()
@@ -228,7 +252,6 @@ export class Activity extends React.Component {
    }
  }

-  @autobind
  handleUploadStarted() {
    this.setState({
      progressModal: { message: "Uploading Photo..." },
@@ -236,7 +259,6 @@ export class Activity extends React.Component {
    })
  }

-  @autobind
  handleUploadProgress(uploadData) {
    if (this.state.progressModal) {
      this.setState({
@@ -250,12 +272,10 @@ export class Activity extends React.Component {
    }
  }

-  @autobind
  handleUploadEnded(successful, uploadData) {
    this.setState({ progressModal: null })
  }

-  @autobind
  handleUploadCanceled() {
    this.setState({ progressModal: null })
  }
@@ -266,7 +286,6 @@ export class Activity extends React.Component {
      messageModal,
      progressModal,
      waitModal,
-      region,
      dateTime,
      location,
      uploadPercent,
@@ -283,7 +302,12 @@ export class Activity extends React.Component {
        />
        <ScrollView style={styles.container}>
          <View style={styles.panel}>
-            <BoundInput binder={binder} name="resolution" label="Resolution:" />
+            <BoundInput
+              binder={binder}
+              name="resolution"
+              label="Resolution:"
+              message="You must supply a resolution for the activity"
+            />
          </View>
          <View style={styles.panel}>
            <BoundOptionStrip
@@ -296,16 +320,23 @@ export class Activity extends React.Component {
              ]}
              label="Status:"
              name="status"
+              message="You must supply a status for the activity"
            />
          </View>
          <View style={styles.panel}>
-            <BoundInput binder={binder} name="notes" label="Notes:" />
+            <BoundInput
+              binder={binder}
+              name="notes"
+              label="Notes:"
+              message="You must supply notes for the activity"
+            />
          </View>
          <View style={styles.panel}>
            <FormStaticInput label="Date &amp; Time:" value={dateTime} />
            <FormStaticInput label="Location:" value={location} />
            <View style={{ flexDirection: "column", justifyContent: "center" }}>
              <MapView
+                ref={(ref) => (this.mapView = ref)}
                style={{
                  flexDirection: "column",
                  justifyContent: "center",
@@ -324,7 +355,8 @@ export class Activity extends React.Component {
                showsScale={false}
                showsUserLocation
                cacheEnabled
-                region={region}
+                initialRegion={config.initialRegion}
+                onMapReady={this.handleOnMapReady}
              />
              <Icon
                name="target"
--- a/mobile/src/App.js
+++ b/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
--- a/mobile/src/Auth/Login.js
+++ b/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

--- a/mobile/src/Auth/ProtectedRoute.js
+++ b/mobile/src/Auth/ProtectedRoute.js
@@ -1,28 +1,35 @@
-import React from 'react'
-import { Route, Redirect } from 'react-router-native'
-import { PropTypes } from 'prop-types'
-import { api } from '../API'
-import autobind from 'autobind-decorator'
+import React from "react"
+import { Route, Redirect } from "react-router-native"
+import { PropTypes } from "prop-types"
+import { api } from "../API"
+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('logout', this.updateComponent)
+    api.addListener("login", this.updateComponent)
+    api.addListener("logout", this.updateComponent)
  }

  componentWillUnmount() {
-    api.removeListener('login', this.updateComponent)
-    api.removeListener('logout', this.updateComponent)
+    api.removeListener("login", 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} />
      }
--- a/mobile/src/Home/Home.js
+++ b/mobile/src/Home/Home.js
@@ -13,9 +13,9 @@ import {
 } from "react-native"
 import MapView, { Marker, Callout } from "react-native-maps"
 import { Icon, Header, Geolocation } from "../ui"
-import { MessageModal } from "../Modal"
+import { MessageModal, WaitModal } 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,19 @@ const neverAskForCameraKeyName = "NeverAskForCameraPermission"
 export class Home extends React.Component {
  constructor(props) {
    super(props)
+    reactAutoBind(this)
    this.state = {
+      waitModal: null,
+      messageModal: null,
      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(
@@ -94,7 +99,14 @@ export class Home extends React.Component {
      this.state.haveLocationPermission = true
      this.state.haveCameraPermission = true
    }
+  }

+  componentDidMount() {
+    this.loadWorkItems()
+  }
+
+  loadWorkItems() {
+    this.setState({ waitModal: { message: "Loading Work Items..." } })
    api
      .listTeams()
      .then((list) => {
@@ -102,6 +114,8 @@ export class Home extends React.Component {
        return api.listWorkItemActivities()
      })
      .then((list) => {
+        this.setState({ waitModal: null })
+
        list.items.forEach((item) => {
          item.data.forEach((datum) => {
            const team = this.teams.find((team) => team._id === datum.team)
@@ -111,15 +125,23 @@ export class Home extends React.Component {
        })
        this.setState({
          sections: list.items,
-          region:
+        })
+
+        this.region =
          regionContainingPoints(
            list.items.map((item) => item.coordinate),
-              0.02
-            ) || this.state.region,
-        })
+            config.homeRegionInset
+          ) || config.initialRegion
+
+        if (this.isMapReady) {
+          this.mapView.animateToRegion(this.region)
+        } else {
+          this.goToRegionWhenReady = true
+        }
      })
      .catch((err) => {
        this.setState({
+          waitModal: null,
          messageModal: {
            icon: "hand",
            message: "Unable to get a list of work items, activities and teams",
@@ -129,12 +151,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 +174,6 @@ export class Home extends React.Component {
    }
  }

-  @autobind
  handleWorkItemsListPress() {
    if (this.currentPosition) {
      const { coords } = this.currentPosition
@@ -156,29 +184,30 @@ export class Home extends React.Component {
    }
  }

-  @autobind
  handleItemSelect(activity) {
    this.props.history.push(`/activity?id=${activity._id}`)
  }

-  @autobind
  handleSectionSelect(workItem) {
-    const { latitude, longitude } = workItem.coordinate
-    const region = {
-      latitude,
-      longitude,
-      latitudeDelta: 0.01,
-      longitudeDelta: 0.01,
-    }
-    this.setState({ region })
+    if (!this.isMapReady) {
+      return
+    }
+
+    const { latitude, longitude } = workItem.coordinate
+
+    this.region = {
+      latitude,
+      longitude,
+      latitudeDelta: config.homeRegionDelta,
+      longitudeDelta: config.homeRegionDelta,
+    }
+    this.mapView.animateToRegion(this.region)
  }

-  @autobind
  handleLogoutPress() {
    this.props.history.replace("/logout")
  }

-  @autobind
  handleGlassesPress() {
    const { sections: workItems } = this.state

@@ -217,24 +246,27 @@ 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 })
+    const newShowWorkItems = !this.state.showWorkItems
+
+    this.setState({ showWorkItems: newShowWorkItems })
+
+    if (newShowWorkItems) {
+      this.loadWorkItems()
+    }
  }

-  @autobind
  handleCalloutPress(workItem) {
    if (api.loggedInUser.administrator) {
      this.props.history.push(
@@ -245,12 +277,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,8 +304,8 @@ export class Home extends React.Component {
    const {
      sections,
      showWorkItems,
-      region,
      messageModal,
+      waitModal,
      haveCameraPermission,
      haveLocationPermission,
    } = this.state
@@ -295,7 +325,7 @@ export class Home extends React.Component {
        />
        <MapView
          ref={(ref) => {
-            this.map = ref
+            this.mapView = ref
          }}
          style={[
            {
@@ -310,7 +340,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}
@@ -479,6 +510,10 @@ export class Home extends React.Component {
        {haveLocationPermission && (
          <Geolocation onUpdate={this.handlePositionUpdate} />
        )}
+        <WaitModal
+          open={!!waitModal}
+          message={waitModal ? waitModal.message : ""}
+        />
        <MessageModal
          open={!!messageModal}
          icon={messageModal ? messageModal.icon : ""}
--- a/mobile/src/Modal/ApiModal.js
+++ b/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 })
  }
--- a/mobile/src/Modal/ImageViewerModal.js
+++ b/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

--- a/mobile/src/Modal/MessageModal.js
+++ b/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()
--- a/mobile/src/Modal/ProgressModal.js
+++ b/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 = {
--- a/mobile/src/WorkItem/WorkItem.js
+++ b/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,36 +93,46 @@ 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
  }

+  componentDidMount() {
    const { search } = this.props.location
    const params = search ? new URLSearchParams(search) : { get: () => null }
    const id = params.get("id")

    if (id) {
+      this.setState({ waitModal: { message: "Loading Work Item..." } })
+
      api
        .getWorkItem(id)
        .then((workItem) => {
+          this.setState({ waitModal: null })
+
          if (workItem) {
            const [longitude, latitude] = workItem.location.coordinates
-            const region = {
+
+            this.region = {
              latitude,
              longitude,
-              latitudeDelta: 0.01,
-              longitudeDelta: 0.01,
+              latitudeDelta: config.workItemRegionDelta,
+              longitudeDelta: config.workItemRegionDelta,
            }

-            if (this.mapView) {
-              this.mapView.animateToRegion(region)
+            if (this.isMapReady) {
+              this.mapView.animateToRegion(this.region)
            } else {
-              this.goToRegion = region
+              this.goToRegionWhenReady = true
            }

            this.setState({
@@ -132,6 +142,7 @@ export class WorkItem extends React.Component {
        })
        .catch((err) => {
          this.setState({
+            waitModal: null,
            messageModal: {
              icon: "hand",
              message: "Unable to get work item details",
@@ -149,7 +160,6 @@ export class WorkItem extends React.Component {
    }
  }

-  @autobind
  handleBackPress() {
    const { history } = this.props

@@ -160,19 +170,22 @@ export class WorkItem extends React.Component {
    }
  }

-  @autobind
  handleDonePress() {
    const { binder } = this.state
    let obj = binder.getModifiedBindingValues()

+    this.setState({ waitModal: { message: "Creating Work Item..." } })
+
    if (!obj._id) {
      api
        .createWorkItem(obj)
        .then((workItem) => {
+          this.setState({ waitModal: null })
          this.handleBackPress()
        })
        .catch((error) => {
          this.setState({
+            waitModal: null,
            messageModal: {
              icon: "hand",
              message: "Unable to create work item",
@@ -188,6 +201,7 @@ export class WorkItem extends React.Component {
        })
        .catch((error) => {
          this.setState({
+            waitModal: null,
            messageModal: {
              icon: "hand",
              message: "Unable to update work item",
@@ -198,7 +212,6 @@ export class WorkItem extends React.Component {
    }
  }

-  @autobind
  handleMessageDismiss() {
    const back = this.state.messageModal.back
    this.setState({ messageModal: null })
@@ -207,10 +220,16 @@ export class WorkItem extends React.Component {
    }
  }

-  @autobind
  handleRegionChange(region) {
+    if (!this.isMapReady) {
+      // On iOS we get this after setting the initial region, before the map declared as ready!
+      return
+    }
+
    const { latitude, longitude } = region

+    this.region = region
+
    if (this.latLngInput) {
      this.latLngInput.handleChangeText(formatLatLng(latitude, longitude))
    }
@@ -226,15 +245,15 @@ export class WorkItem extends React.Component {
    )
  }

-  @autobind
  handleOnMapReady() {
-    if (this.goToRegion && this.mapView) {
-      this.mapView.animateToRegion(this.goToRegion)
-      this.goToRegion = null
-    }
+    if (this.goToRegionWhenReady) {
+      this.mapView.animateToRegion(this.region)
+      this.goToRegionWhenReady = false
+    }
+
+    this.isMapReady = true
  }

-  @autobind
  handleStartAddressLookup(latLng) {
    api
      .getAddress(latLng)
@@ -250,7 +269,6 @@ export class WorkItem extends React.Component {
      })
  }

-  @autobind
  handleUploadStarted() {
    this.setState({
      progressModal: { message: "Uploading Photo..." },
@@ -258,7 +276,6 @@ export class WorkItem extends React.Component {
    })
  }

-  @autobind
  handleUploadProgress(uploadData) {
    if (this.state.progressModal) {
      this.setState({
@@ -272,35 +289,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({
-      region: {
+    this.region = {
      latitude: coords.latitude,
      longitude: coords.longitude,
-        latitudeDelta: 0.02,
-        longitudeDelta: 0.02,
-      },
-    })
+      latitudeDelta: config.workItemRegionDelta,
+      longitudeDelta: config.workItemRegionDelta,
+    }
+
+    if (this.isMapReady) {
+      this.mapView.animateToRegion(this.region)
+    } else {
+      this.goToRegionWhenReady = true
+    }
  }

  render() {
@@ -310,7 +328,6 @@ export class WorkItem extends React.Component {
      waitModal,
      progressModal,
      uploadPercent,
-      region,
    } = this.state

    return (
@@ -358,10 +375,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}
              />
--- a/mobile/src/WorkItem/WorkItemList.js
+++ b/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

--- a/mobile/src/config.js
+++ b/mobile/src/config.js
@@ -2,16 +2,22 @@ import React from "react"
 import { Platform } from "react-native"

 export const config = {
-  localIPAddr: "192.168.1.175",
-  //localIPAddr: "192.168.1.14",
+  //localIPAddr: "192.168.1.175",
+  localIPAddr: "192.168.1.14",
  viroAPIKey: "06F37B6A-74DA-4A83-965A-7DE2209A5C46",
  googleGeocodeAPIKey: "AIzaSyCs4JVT6gysnY5dAJ7KjVJYeykLv_xz1GI",
  googleGeocodeURL: "https://maps.googleapis.com/maps/api/geocode/json",
  refererURL: "https://dar.kss.us.com",
  minDistanceToItem: 20,
+  workItemRegionDelta: 0.005,
+  activityRegionDelta: 0.005,
+  homeRegionInset: 0.02,
+  homeRegionDelta: 0.005,
  geocodeDelayMilliseconds: 500,
+
  //defaultUser: "john@lyon-smith.org",
  defaultUser: "",
+
  // This region is downtown Toronto
  initialRegion: {
    latitude: 43.653908,
@@ -19,6 +25,7 @@ export const config = {
    latitudeDelta: 0.0922,
    longitudeDelta: 0.0421,
  },
+
  // This region is Bainbridge Island
  // initialRegion: {
  //   latitude: 47.629536,
@@ -26,5 +33,6 @@ export const config = {
  //   latitudeDelta: 0.0922,
  //   longitudeDelta: 0.0421,
  // },
+
  // alwaysShowWorkItemInAR: true,
 }
--- a/mobile/src/ui/BoundButton.js
+++ b/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)
  }
--- a/mobile/src/ui/BoundHeader.js
+++ b/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)
  }
--- a/mobile/src/ui/BoundInput.js
+++ b/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

--- a/mobile/src/ui/BoundOptionStrip.js
+++ b/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)
--- a/mobile/src/ui/BoundPhotoPanel.js
+++ b/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)
-
-    const { name, binder } = this.props
-
-    this.state = binder.getBindingState(name)
+    reactAutoBind(this)
+    this.state = this.props.binder.getBindingState(this.props.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
--- a/mobile/src/ui/BoundSwitch.js
+++ b/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)
--- a/mobile/src/ui/FormStaticInput.js
+++ b/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 = {
--- a/mobile/src/ui/Geolocation.js
+++ b/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 = {
--- a/mobile/src/ui/OptionStrip.js
+++ b/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

--- a/mobile/src/version.js
+++ b/mobile/src/version.js
@@ -1,6 +1,6 @@
 export const versionInfo = {
-  version: '1.0.1',
-  fullVersion: '1.0.1-20180518.0',
+  version: '1.2.0',
+  fullVersion: '1.2.0-20180531.0',
  title: 'Deighton AR System',
  copyright: '© 2018, Kingston Software Solutions.',
  supportEmail: 'support@kss.us.com',
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "deighton-ar",
-  "version": "1.0.1",
+  "version": "1.2.0",
  "description": "Deighton AR Training System",
  "main": "index.js",
  "repository": {
--- a/server/config/default-test.json5
+++ b/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",
  }
 }
--- a/server/config/default.json5
+++ b/server/config/default.json5
@@ -22,6 +22,7 @@
    maxPasswordTokenAgeInHours: 3,
    sendEmailDelayInSeconds: 3,
    supportEmail: 'support@kss.us.com',
-    sendEmail: true
+    sendEmail: true,
+    appName: "Deighton AR",
  }
 }
--- a/server/nginx.conf
+++ b/server/nginx.conf
@@ -12,7 +12,7 @@ server {

  # Any route that starts with /api/ is for the backend
  location /api/ {
-    error_page 502 503 $scheme://$server_name/500.json;
+    error_page 502 503 504 $scheme://$server_name/500.json;

    proxy_pass http://127.0.0.1:3006/;
    proxy_buffering off;
--- a/server/package.json
+++ b/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",
--- a/server/src/api/routes/ActivityRoutes.js
+++ b/server/src/api/routes/ActivityRoutes.js
@@ -6,7 +6,11 @@ import { catchAll, TeamRoutes, BaseRoutes } from "."
@autobind
 export class ActivityRoutes extends BaseRoutes {
  constructor(container) {
-    super(container, container.db.Activity)
+    super({
+      container,
+      model: container.db.Activity,
+      nonAdmin: { listItems: true, createItem: true, getItem: true },
+    })

    const app = container.app

@@ -19,6 +23,12 @@ export class ActivityRoutes extends BaseRoutes {
  }

  async deleteAllActivities(req, res, next) {
+    const isAdmin = !!req.user.administrator
+
+    if (!isAdmin) {
+      throw createError.Forbidden()
+    }
+
    const Activity = this.db.Activity
    const Team = this.db.Team

--- a/server/src/api/routes/AssetRoutes.js
+++ b/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 "."
-
-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
-}
+import { pipeToPromise } from "../../util"

@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),
--- a/server/src/api/routes/AuthRoutes.js
+++ b/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({})
--- a/server/src/api/routes/BaseRoutes.js
+++ b/server/src/api/routes/BaseRoutes.js
@@ -3,14 +3,23 @@ import createError from "http-errors"
 import autobind from "autobind-decorator"
 import { catchAll } from "."

+// The list of functions you can list in options.nonAdmin is:
+//
+// listItems
+// createItem
+// updateItem
+// getItem
+// deleteItem
+
@autobind
 export class BaseRoutes {
-  constructor(container, model) {
-    this.model = model
+  constructor(options) {
+    const { container } = options
+    this.options = options
    this.log = container.log
    this.db = container.db

-    const basePath = "/" + model.collection.collectionName
+    const basePath = "/" + options.model.collection.collectionName
    const app = container.app

    app
@@ -41,7 +50,13 @@ export class BaseRoutes {
  }

  async listItems(req, res, next) {
-    const ItemModel = this.model
+    const isAdmin = !!req.user.administrator
+
+    if (!this.options.nonAdmin.listItems && !isAdmin) {
+      throw createError.Forbidden()
+    }
+
+    const ItemModel = this.options.model
    const limit = req.query.limit || 20
    const skip = req.query.skip || 0
    const partial = !!req.query.partial
@@ -74,14 +89,14 @@ export class BaseRoutes {
    })
  }

-  async createItem(req, res, next) {
-    const isAdmin = req.user.administrator
+  async createItem(req, res) {
+    const isAdmin = !!req.user.administrator

-    if (!isAdmin) {
-      return new createError.Forbidden()
+    if (!this.options.nonAdmin.createItem && !isAdmin) {
+      throw createError.Forbidden()
    }

-    const ItemModel = this.model
+    const ItemModel = this.options.model
    let item = new ItemModel(req.body)

    const newItem = await item.save()
@@ -89,11 +104,11 @@ export class BaseRoutes {
    res.json(newItem.toClient())
  }

-  async updateItem(req, res, next) {
-    const isAdmin = req.user.administrator
+  async updateItem(req, res) {
+    const isAdmin = !!req.user.administrator

-    if (!isAdmin) {
-      return new createError.Forbidden()
+    if (!this.options.nonAdmin.updateItem && !isAdmin) {
+      throw createError.Forbidden()
    }

    // Do this here because Mongoose will add it automatically otherwise
@@ -101,11 +116,11 @@ export class BaseRoutes {
      throw createError.BadRequest("No _id given in body")
    }

-    let ItemModel = this.model
+    let ItemModel = this.options.model
    let item = await ItemModel.findById(req.body._id)

    if (!item) {
-      return next(createError.NotFound(`Item with _id ${_id} was not found`))
+      throw createError.NotFound(`Item with _id ${_id} was not found`)
    }

    item.merge(new ItemModel(req.body))
@@ -115,8 +130,14 @@ export class BaseRoutes {
    res.json(savedItem.toClient())
  }

-  async getItem(req, res, next) {
-    const ItemModel = this.model
+  async getItem(req, res) {
+    const isAdmin = !!req.user.administrator
+
+    if (!this.options.nonAdmin.getItem && !isAdmin) {
+      throw createError.Forbidden()
+    }
+
+    const ItemModel = this.options.model
    const _id = req.params._id
    const item = await ItemModel.findById(_id)

@@ -127,14 +148,14 @@ export class BaseRoutes {
    res.json(item.toClient())
  }

-  async deleteItem(req, res, next) {
-    const isAdmin = req.user.administrator
+  async deleteItem(req, res) {
+    const isAdmin = !!req.user.administrator

-    if (!isAdmin) {
-      return new createError.Forbidden()
+    if (!this.options.nonAdmin.deleteItem && !isAdmin) {
+      throw createError.Forbidden()
    }

-    const ItemModel = this.model
+    const ItemModel = this.options.model
    const _id = req.params._id
    const item = await ItemModel.remove({ _id })

--- a/server/src/api/routes/TeamRoutes.js
+++ b/server/src/api/routes/TeamRoutes.js
@@ -8,7 +8,11 @@ import { catchAll, BaseRoutes } from "."
@autobind
 export class TeamRoutes extends BaseRoutes {
  constructor(container) {
-    super(container, container.db.Team)
+    super({
+      container,
+      model: container.db.Team,
+      nonAdmin: { listItems: true, getItem: true },
+    })

    container.app
      .route("/teams/status")
@@ -19,6 +23,12 @@ export class TeamRoutes extends BaseRoutes {
  }

  async getTeamStatus(req, res, next) {
+    const isAdmin = !!req.user.administrator
+
+    if (!isAdmin) {
+      throw createError.Forbidden()
+    }
+
    const Team = this.db.Team
    const Activity = this.db.Activity
    let teams = await Team.find({}).exec()
@@ -41,7 +51,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)
  }
--- a/server/src/api/routes/UserRoutes.js
+++ b/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)
    }
  }
 }
--- a/server/src/api/routes/WorkItemRoutes.js
+++ b/server/src/api/routes/WorkItemRoutes.js
@@ -7,7 +7,11 @@ import { catchAll, BaseRoutes } from "."
@autobind
 export class WorkItemRoutes extends BaseRoutes {
  constructor(container) {
-    super(container, container.db.WorkItem)
+    super({
+      container,
+      model: container.db.WorkItem,
+      nonAdmin: { listItems: true, getItem: true },
+    })
    const app = container.app

    app
@@ -25,6 +29,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()
@@ -54,6 +67,12 @@ export class WorkItemRoutes extends BaseRoutes {
  }

  async deleteAllWorkItems(req, res, next) {
+    const isAdmin = !!req.user.administrator
+
+    if (!isAdmin) {
+      throw createError.Forbidden()
+    }
+
    const Activity = this.db.Activity
    const WorkItem = this.db.WorkItem
    const Team = this.db.Team
--- a/server/src/util.js
+++ b/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
+}
--- a/server/src/version.js
+++ b/server/src/version.js
@@ -1,6 +1,6 @@
 export const versionInfo = {
-  version: '1.0.1',
-  fullVersion: '1.0.1-20180518.0',
+  version: '1.2.0',
+  fullVersion: '1.2.0-20180531.0',
  title: 'Deighton AR System',
  copyright: '© 2018, Kingston Software Solutions.',
  supportEmail: 'support@kss.us.com',
--- a/version.json5
+++ b/version.json5
@@ -15,11 +15,11 @@
  buildFormat: "full",
  tags: {
    major: 1,
-    minor: 0,
-    patch: 1,
-    build: 20180518,
+    minor: 2,
+    patch: 0,
+    build: 20180531,
    revision: 0,
-    sequence: 4,
+    sequence: 10,
    tz: "America/Los_Angeles",
    title: "Deighton AR System",
    copyright: "© 2018, Kingston Software Solutions.",
--- a/website/package.json
+++ b/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/"
  },
--- a/website/src/API.js
+++ b/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")
    }
--- a/website/src/App.js
+++ b/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" },
-                    { text: "Teams", path: "/app/teams" },
-                    { text: "Users", path: "/app/users" },
+                    { image: require("images/badge.png"), path: "/admin/home" },
+                    { text: "Teams", path: "/admin/teams" },
+                    { 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 admin path="/app/home" component={Home} />
-            <ProtectedRoute exact admin path="/app/teams" component={Teams} />
-            <ProtectedRoute exact admin path="/app/system" component={System} />
-            <ProtectedRoute exact admin path="/app/users" component={Users} />
-            <DefaultRoute redirect="/app/home" />
+            <ProtectedRoute exact path="/user/profile" component={Profile} />
+            <ProtectedRoute
+              exact
+              admin
+              path="/admin/profile"
+              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
--- a/website/src/Auth/ConfirmEmail.js
+++ b/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 : ""}
        />

--- a/website/src/Auth/DefaultRoute.js
+++ b/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
-    return <Route render={() => <Redirect to={this.props.redirect} />} />
+    const user = api.loggedInUser
+
+    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
+              }
+            />
+          )}
+        />
+      )
+    }
  }
 }
--- a/website/src/Auth/ForgotPassword.js
+++ b/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 : ""}
          />

--- a/website/src/Auth/Login.js
+++ b/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}
--- a/website/src/Auth/Parking.js
+++ b/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>
+    )
+  }
+}
--- a/website/src/Auth/ProtectedRoute.js
+++ b/website/src/Auth/ProtectedRoute.js
@@ -1,8 +1,7 @@
-import React from 'react'
-import { Route, Redirect } from 'react-router'
-import { PropTypes } from 'prop-types'
-import { api } from 'src/API'
-import autobind from 'autobind-decorator'
+import React from "react"
+import { Route, Redirect } from "react-router"
+import { PropTypes } from "prop-types"
+import { api } from "src/API"

 export class ProtectedRoute extends React.Component {
  static propTypes = {
@@ -13,34 +12,33 @@ 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 (
+          <Route
+            render={() => (
              <Redirect
                to={`/login?redirect=${this.props.location.pathname}${
                  this.props.location.search
                }`}
              />
+            )}
+          />
        )
      } else {
        return <Route {...this.props} />
--- a/website/src/Auth/ResetPassword.js
+++ b/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>
--- a/website/src/Auth/index.js
+++ b/website/src/Auth/index.js
@@ -1,7 +1,8 @@
-export { Login } from './Login'
-export { Logout } from './Logout'
-export { ResetPassword } from './ResetPassword'
-export { ForgotPassword } from './ForgotPassword'
-export { ConfirmEmail } from './ConfirmEmail'
-export { DefaultRoute } from './DefaultRoute'
-export { ProtectedRoute } from './ProtectedRoute'
+export { Login } from "./Login"
+export { Logout } from "./Logout"
+export { Parking } from "./Parking"
+export { ResetPassword } from "./ResetPassword"
+export { ForgotPassword } from "./ForgotPassword"
+export { ConfirmEmail } from "./ConfirmEmail"
+export { DefaultRoute } from "./DefaultRoute"
+export { ProtectedRoute } from "./ProtectedRoute"
--- a/website/src/Home/Home.js
+++ b/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 />
--- a/website/src/MasterDetail/MasterDetail.js
+++ b/website/src/MasterDetail/MasterDetail.js
@@ -352,7 +352,7 @@ export class MasterDetail extends Component {
          />

          <WaitModal
-            active={!!waitModal}
+            open={!!waitModal}
            message={waitModal ? waitModal.message : ""}
          />

--- a/website/src/MasterDetail/MasterList.js
+++ b/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 ? (
--- a/website/src/Modal/WaitModal.js
+++ b/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}>
-        <Loader />
-        {message && <Text size='huge' color='inverse'>{message}</Text>}
+      <Dimmer active={open}>
+        {loader && <Loader />}
+        {message && (
+          <Text size="huge" color="inverse">
+            {message}
+          </Text>
+        )}
      </Dimmer>
    )
  }
--- a/website/src/Profile/Profile.js
+++ b/website/src/Profile/Profile.js
@@ -166,7 +166,7 @@ export class Profile extends Component {
          />

          <WaitModal
-            active={!!waitModal}
+            open={!!waitModal}
            message={waitModal ? waitModal.message : ""}
          />

--- a/website/src/System/System.js
+++ b/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>
--- a/website/src/version.js
+++ b/website/src/version.js
@@ -1,6 +1,6 @@
 export const versionInfo = {
-  version: '1.0.1',
-  fullVersion: '1.0.1-20180518.0',
+  version: '1.2.0',
+  fullVersion: '1.2.0-20180531.0',
  title: 'Deighton AR System',
  copyright: '© 2018, Kingston Software Solutions.',
  supportEmail: 'support@kss.us.com',
Author	SHA1	Message	Date
John Lyon-Smith	a3b20d8ac1	Reduce sensitivity	2018-05-31 13:38:28 -07:00
John Lyon-Smith	519bc1c50b	Version 1.2.0-20180531.0	2018-05-31 11:16:42 -07:00
John Lyon-Smith	71e1816173	Added wait modals everywhere. Reduce required distance to item	2018-05-31 11:15:53 -07:00
John Lyon-Smith	9e55320a21	Fixing base route issues. Fix map scrolling issues on iOS	2018-05-31 07:20:29 -07:00
John Lyon-Smith	62876c94c9	Version 1.1.3-20180529.0	2018-05-29 13:09:48 -07:00
John Lyon-Smith	5e00b0dd23	Correct fix for background location services	2018-05-29 12:49:51 -07:00
John Lyon-Smith	fb8545110c	Revert to location when in use	2018-05-29 12:44:38 -07:00
John Lyon-Smith	323d047903	Version 1.1.2-20180529.0	2018-05-29 07:55:59 -07:00
John Lyon-Smith	9ec1e689eb	Production settings	2018-05-29 07:55:29 -07:00
John Lyon-Smith	bbd259f989	Version 1.1.1-20180528.0	2018-05-28 16:13:55 -07:00
John Lyon-Smith	f07c61c3b5	Remove autobind decorator. Fix bugs in AR view	2018-05-28 16:12:20 -07:00
John Lyon-Smith	eb3649547a	Update for new snap-tool	2018-05-28 12:23:53 -07:00
John Lyon-Smith	5d339a695e	Remove activities when deleting work item	2018-05-25 15:58:17 -07:00
John Lyon-Smith	c53d7339fb	Version 1.1.0-20180525.0	2018-05-25 14:55:36 -07:00
John Lyon-Smith	587052a509	Fix admin/user login issues	2018-05-25 10:16:28 -07:00
John Lyon-Smith	a33ca57d58	Version 1.0.2-20180518.0	2018-05-18 08:49:19 -07:00