Merge branch 'onboarding_routing_sept_2023' into master

.gitignore

@@ -14,9 +14,5 @@ app-settings.json
 *.app.zip
 *.ipa
 www/dist/
-www/js/control/collect-settings.js
-www/templates/control/main-collect-settings.html
-www/js/control/sync-settings.js
-www/templates/control/main-sync-settings.html
 config.xml
 package.json

package.cordovabuild.json

@@ -8,7 +8,6 @@
     "url": "git+https://github.com/e-mission/e-mission-phone.git"
   },
   "scripts": {
-    "setup-native": "./bin/download_settings_controls.js",
     "build": "npx webpack --config webpack.prod.js && npx cordova build",
     "build-dev": "npx webpack --config webpack.dev.js && npx cordova build",
     "build-dev-android": "npx webpack --config webpack.dev.js && npx cordova build android",

package.serve.json

@@ -8,7 +8,7 @@
     "url": "git+https://github.com/e-mission/e-mission-phone.git"
   },
   "scripts": {
-    "setup-serve": "./bin/download_settings_controls.js && ./bin/setup_autodeploy.js",
+    "setup-serve": "./bin/setup_autodeploy.js",
     "serve": "webpack --config webpack.dev.js && concurrently -k \"phonegap --verbose serve\" \"webpack --config webpack.dev.js --watch\"",
     "serve-prod": "webpack --config webpack.prod.js && concurrently -k \"phonegap --verbose serve\" \"webpack --config webpack.prod.js --watch\"",
     "serve-only": "phonegap --verbose serve",

setup/setup_shared_native.sh

@@ -10,8 +10,6 @@ cp setup/google-services.fake.for_ci.json google-services.json
 echo "Setting up all npm packages"
 npm install
 
-npm run setup-native
-
 # By default, node doesn't fail if any of the steps fail. This makes it hard to
 # use in a CI environment, and leads to people reporting the node error rather
 # than the underlying error. One solution is to pass in a command line argument to node

webpack.config.js

@@ -50,6 +50,7 @@ module.exports = {
       {
         test: /\.(jpg|png|woff|woff2|eot|ttf|svg)$/,
         include: [path.resolve(__dirname, 'www'),
+                  path.resolve(__dirname, 'resources'),
                   path.resolve(__dirname, 'node_modules/react-native-vector-icons')],
         type: 'asset/resource',
       },

www/css/style.css

@@ -44,11 +44,6 @@ label-tab > div {
   --accent-dark: hsl(200 100% 30%);
 }
 
-body.platform-ios {
-  padding-top: calc(env(safe-area-inset-top) / 2);
-  margin: 0 10px 0 0;
-}
-
 .view-container.tab-content {
   height: auto !important;
   bottom: 50px !important;

www/i18n/en.json

@@ -12,7 +12,7 @@
     },
 
     "control":{
-        "profile": "Profile",
+        "profile-tab": "Profile",
         "edit-demographics": "Edit Demographics",
         "tracking": "Tracking",
         "app-status": "App Status",
@@ -73,6 +73,7 @@
     },
 
     "metrics":{
+        "dashboard-tab": "Dashboard",
         "cancel": "Cancel",
         "confirm": "Confirm",
         "get": "Get",
@@ -112,6 +113,7 @@
     },
 
     "diary": {
+        "label-tab": "Label",
         "distance-in-time": "{{distance}} {{distsuffix}} in {{time}}",
         "distance": "Distance",
         "time": "Time",
@@ -145,7 +147,6 @@
     },
 
     "main-metrics":{
-        "dashboard": "Dashboard",
         "summary": "My Summary",
         "chart": "Chart",
         "change-data": "Change dates:",
@@ -183,10 +184,6 @@
         "footprint-label": "Footprint (kg CO₂)"
     },
 
-    "main-inf-scroll" : {
-        "tab": "Label"
-    },
-
     "details":{
         "speed": "Speed",
         "time": "Time"
@@ -227,6 +224,7 @@
     },
 
     "intro": {
+        "proceed": "Proceed",
         "appstatus": {
             "fix": "Fix",
             "refresh":"Refresh",
@@ -286,10 +284,7 @@
             },
             "ignorebatteryopt": {
                 "name": "Ignore battery optimizations",
-                "description": {
-                    "android-disable": "On the optimization page, go to all apps, search for this app and turn off optimizations.",
-                    "ios": "Please allow."
-                }
+                "description": "Please allow."
             }
         },
         "permissions": {
@@ -332,22 +327,23 @@
         "enketo-timestamps-invalid": "The times you entered are invalid. Please ensure that the start time is before the end time."
     },
     "join": {
-        "welcome-to-nrel-openpath": "Welcome to NREL OpenPATH",
-        "proceed-further": "To proceed further, you need to enter a valid OPcode (token)",
-        "what-is-opcode": "The OPcode is a long string starting with 'nrelop' that has been provided by your program admin through a website, email, text or printout.",
-        "or": "or",
-        "scan-button": "Scan the QR code ",
-        "scan-details": "The OPcode will be written at the top of the image",
-        "paste-button": "Paste the OPcode",
-        "paste-details": "We suggest copy-pasting instead of typing since the OPcode is long and jumbled",
+        "welcome-to-app": "Welcome to <b>{{appName}}!</b>",
+        "app-name": "NREL OpenPATH",
+        "to-proceed-further": "To proceed further, please scan or paste an access code that has been provided by your program administrator through a website, email, text message, or printout.",
+        "code-hint": "The code begins with ‘nrelop’ and may be in barcode or text format.",
+        "scan-code": "Scan code",
+        "paste-code": "Paste code",
+        "scan-hint": "Scan the barcode with your phone camera",
+        "paste-hint": "Or, paste the code as text",
+        "about-app-title": "About {{appName}}",
         "about-app-para-1": "The National Renewable Energy Laboratory’s Open Platform for Agile Trip Heuristics (NREL OpenPATH) enables people to track their travel modes—car, bus, bike, walking, etc.—and measure their associated energy use and carbon footprint.",
         "about-app-para-2": "The app empowers communities to understand their travel mode choices and patterns, experiment with options to make them more sustainable, and evaluate the results. Such results can inform effective transportation policy and planning and be used to build more sustainable and accessible cities.",
         "about-app-para-3": "It does so by building an automatic diary of all your trips, across all transportation modes. It reads multiple sensors, including location, in the background, and turns GPS tracking on and off automatically for minimal power consumption. The choice of the travel pattern information and the carbon footprint display style are study-specific.",
+        "tips-title": "Tip(s) for correct operation:",
         "all-green-status": "Make sure that all status checks are green",
         "dont-force-kill": "Do not force kill the app",
         "background-restrictions": "On Samsung and Huwaei phones, make sure that background restrictions are turned off",
-        "close": "Close",
-        "tips-title": "Tip(s) for correct operation:"
+        "close": "Close"
     },
     "config": {
         "unable-read-saved-config": "Unable to read saved config",
@@ -363,6 +359,8 @@
         "survey-missing-formpath": "Error while fetching resources in config: survey_info.surveys has a survey without a formPath"
     },
     "errors": {
+      "registration-check-token": "User registration error. Please check your token and try again.",
+      "not-registered-cant-contact": "User is not registered, so the server cannot be contacted.",
       "while-populating-composite": "Error while populating composite trips",
       "while-loading-another-week": "Error while loading travel of {{when}} week",
       "while-loading-specific-week": "Error while loading travel for the week of {{day}}",

www/index.html

@@ -11,19 +11,8 @@
   </head>
 
   <body ng-app="emission">
-    <!--
-      The nav bar that will be updated as we navigate between views.
-    -->
-    <ion-nav-bar class="bar-stable" style="background-color: #212121 !important;">
-      <ion-nav-back-button>
-      </ion-nav-back-button>
-    </ion-nav-bar>
-    <!--
-      The views will be rendered in the <ion-nav-view> directive below
-      Templates are in the /templates folder (but you could also
-      have templates inline in this html file if you'd like).
-    -->
-    <ion-nav-view></ion-nav-view>
+    <!-- <ion-nav-view></ion-nav-view> -->
+    <div id="appRoot" class="fill-container" style="width: 100vw; height: 100vh;"></div>
   </body>
   <script src="dist/bundle.js"></script>
 </html>