thinknimble · paribaker · Aug 23, 2023 · Jul 16, 2023 · Jul 16, 2023 · Jul 16, 2023
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Pytest, McCabe, and Coverage
         run: |
           cd my_project
-          pipenv install --dev --deploy --skip-lock
+          pipenv install --dev --deploy
           mkdir -p client/dist/static
           pipenv run python server/manage.py collectstatic
           pipenv run pytest --mccabe --cov=my_project -vv server/my_project

diff --git a/{{cookiecutter.project_slug}}/clients/mobile/react-native/README.md b/{{cookiecutter.project_slug}}/clients/mobile/react-native/README.md
@@ -20,9 +20,9 @@ alternatively if you want to use expo run command
 
 1. Download and install ngrok 
 2. Set up ngrok auth token (request an account from William Huster)
-3. run ngrok `~/.ngrok http 8000 --subdomain <yourname>-thinknimble` PLEASE NOTICE THE DASH APPENDED NAME `--subdomain <yourname>-thinknimble` DO NOT USE `--subdomain thinknimble`
+3. run ngrok `~/.ngrok http 8000 --subdomain <a domain>`
 4. add your new subomain to the `.env` IN MOBILE DIR as BACKEND_DEV_SERVER 
-5. append your new subdomain to the `.env` in ROOT DIR to ALLOW_HOSTS e.g `ALLOW_HOSTS=[localhost:8080,<yourname>-thinknimble.ngrok.io]`
+5. append your new subdomain to the `.env` in ROOT DIR to ALLOW_HOSTS e.g `ALLOW_HOSTS=[localhost:8080,<your domain>.ngrok.io]`
 
 
 
@@ -229,3 +229,24 @@ _expo-teststore-build-ios.yml_
 Run this workflow to deploy an emergency code related bugfix
 
 expo-emergency-prod-update.yml
+
+
+#### Important note about custom native modules and expo eject
+
+We can easily use our own native or non supported RN pacakges by checking if we are running an expo build or not, these will only work in expo builds not expo go. 
+When building for local testing/development we use the alternative builds in our eas.json
+Recently Expo has changed the `expo eject` command for `expo pre-build` this will create the iOS and Android folders and allow you to run your project in xcode or android studio as well you will need to activate your .env file since some vars are supplied from there. 
+
+You can accomplish this with `npm run prebuild:local` this will ensure that your `.env` file is sourced!
+
+Expo will automatically change your package.json and add/remove/change the following
+
+- `"main"` entry will be removed 
+- `"start"`: `"expo start --dev-client"` will change to this <----
+
+therefore when running prebuild ensure not to commit these changes!
+
+
+
+
+
diff --git a/{{cookiecutter.project_slug}}/clients/mobile/react-native/eas.json b/{{cookiecutter.project_slug}}/clients/mobile/react-native/eas.json
@@ -16,7 +16,7 @@
         "SENTRY_DSN": "<REPLACE_WITH_LOCAL_SENTRY_DSN>"
       }
     },
-    "development-review": {
+    "development_review": {
       "developmentClient": true,
       "distribution": "internal",
       "channel": "review",
@@ -42,31 +42,30 @@
       "ios": {
         "simulator": true
       }
+    },
+    "staging": {
+      "distribution": "internal",
+      "channel": "staging",
+      "env": {
+        "BACKEND_SERVER_URL": "<REPLACE_WITH_STAGING_BACKEND_SERVER_URL>",
+        "BUILD_ENV": "staging",
+        "ROLLBAR_ACCESS_TOKEN": "<REPLACE_WITH_STAGING_ROLLBAR_TOKEN>",
+        "SENTRY_PROJECT_NAME": "<REPLACE_WITH_STAGING_SENTRY_PROJECT_NAME>",
+        "SENTRY_DSN": "<REPLACE_WITH_STAGING_SENTRY_DSN>"
+      }
+    },
+    "production": {
+      "channel": "production",
+      "autoIncrement": true,
+      "env": {
+        "BACKEND_SERVER_URL": "<REPLACE_WITH_PROD_BACKEND_SERVER_URL>",
+        "BUILD_ENV": "production",
+        "ROLLBAR_ACCESS_TOKEN": "<REPLACE_WITH_PROD_ROLLBAR_TOKEN>",
+        "SENTRY_PROJECT_NAME": "<REPLACE_WITH_PROD_SENTRY_PROJECT_NAME>",
+        "SENTRY_DSN": "<REPLACE_WITH_PROD_SENTRY_DSN>"
+      }
     }
   },
-  "staging": {
-    "distribution": "internal",
-    "channel": "staging",
-    "env": {
-      "BACKEND_SERVER_URL": "<REPLACE_WITH_STAGING_BACKEND_SERVER_URL>",
-      "BUILD_ENV": "staging",
-      "ROLLBAR_ACCESS_TOKEN": "<REPLACE_WITH_STAGING_ROLLBAR_TOKEN>",
-      "SENTRY_PROJECT_NAME": "<REPLACE_WITH_STAGING_SENTRY_PROJECT_NAME>",
-      "SENTRY_DSN": "<REPLACE_WITH_STAGING_SENTRY_DSN>"
-    }
-  },
-  "production": {
-    "channel": "production",
-    "autoIncrement": true,
-    "env": {
-      "BACKEND_SERVER_URL": "<REPLACE_WITH_PROD_BACKEND_SERVER_URL>",
-      "BUILD_ENV": "production",
-      "ROLLBAR_ACCESS_TOKEN": "<REPLACE_WITH_PROD_ROLLBAR_TOKEN>",
-      "SENTRY_PROJECT_NAME": "<REPLACE_WITH_PROD_SENTRY_PROJECT_NAME>",
-      "SENTRY_DSN": "<REPLACE_WITH_PROD_SENTRY_DSN>"
-    }
-  }
-},
 "submit": {
   "production": {
     "ios": {

diff --git a/{{cookiecutter.project_slug}}/clients/mobile/react-native/package.json b/{{cookiecutter.project_slug}}/clients/mobile/react-native/package.json
@@ -6,15 +6,16 @@
   "main": "node_modules/expo/AppEntry.js",
   "scripts": {
     "start": "yarn run start:nc --clear",
-    "start:nc": "source .env npx expo start",
-    "start:prod": "source .env npx expo start --no-dev --minify",
-    "start:android": "source .env npx expo start --android",
-    "start:ios": "source .env npx expo start --ios",
-    "start:web": "source .env npx expo start --web",
+    "start:nc": "source .env && npx expo start",
+    "start:prod": "source .env && npx expo start --no-dev --minify",
+    "start:android": "source .env && npx expo start --android",
+    "start:ios": "source .env && npx expo start --ios",
+    "start:web": "source .env && npx expo start --web",
     "prebuild": "npx expo prebuild",
-    "run:android": "source .env npx expo run:android --clear",
+    "prebuild:local" : "source .env && SENTRY_PROJECT_NAME=${SENTRY_PROJECT_NAME} SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN} expo prebuild",
+    "run:android": "source .env && npx expo run:android --clear",
     "run:android:release": "npx expo run:android --variant release",
-    "run:ios": "source .env npx expo run:ios --clear",
+    "run:ios": "source .env && npx expo run:ios --clear",
     "run:ios:release": "npx expo run:ios --configuration Release",
     "pub:web": "npx expo export:web && cd web-build && vercel --prod && cd ..",
     "format": "prettier --check ./src",
@@ -35,7 +36,7 @@
     "@tanstack/react-query": "^4.24.4",
     "@thinknimble/tn-forms": "^3.1.3",
     "@thinknimble/tn-forms-react": "^1.0.3",
-    "@thinknimble/tn-models-fp": "2.5.3",
+    "@thinknimble/tn-models-fp": "^2.13.0",
     "axios": "^1.3.2",
     "date-fns": "^2.29.3",
     "expo": "^48.0.9",
@@ -90,7 +91,7 @@
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
     "prettier": "^2.7.1",
-    "tailwindcss": "^3.2.6",
+    "tailwindcss": "3.3.2",
     "typescript": "^4.9.4"
   },
   "resolutions": {

diff --git a/{{cookiecutter.project_slug}}/clients/mobile/react-native/src/services/axios-instance.ts b/{{cookiecutter.project_slug}}/clients/mobile/react-native/src/services/axios-instance.ts
@@ -4,7 +4,7 @@ import { useAuth } from '../stores/auth'
 
 const appConfig = Config as any
 export const axiosInstance = axios.create({
-  baseURL: appConfig?.backendServerUrl,
+  baseURL: `${appConfig?.backendServerUrl}/api`,
 })
 
 axiosInstance.interceptors.request.use(

diff --git a/{{cookiecutter.project_slug}}/clients/mobile/react-native/src/services/user/api.ts b/{{cookiecutter.project_slug}}/clients/mobile/react-native/src/services/user/api.ts
@@ -9,7 +9,7 @@ const login = createCustomServiceCall(
     outputShape: userShape,
   },
   async ({ client, input, utils }) => {
-    const res = await client.post('api/login/', utils.toApi(input))
+    const res = await client.post('/login/', utils.toApi(input))
     return utils.fromApi(res.data)
   },
 )
@@ -19,25 +19,26 @@ const requestPasswordResetCode = createCustomServiceCall(
     inputShape: forgotPasswordShape,
   },
   async ({ client, input, utils }) => {
-    await client.get(`api/password/reset/code/${input.email}/`)
+    await client.get(`/password/reset/code/${input.email}/`)
   },
 )
+
 const resetPassword = createCustomServiceCall(
   {
     inputShape: { email: z.string().email(), code: z.string(), password: z.string() },
     outputShape: userShape,
   },
   async ({ client, input, utils }) => {
     const { email, ...rest } = utils.toApi(input)
-    const res = await client.post(`api/password/reset/code/confirm/${input.email}/`, rest)
+    const res = await client.post(`/password/reset/code/confirm/${input.email}/`, rest)
     return utils.fromApi(res.data)
   },
 )
 
 export const userApi = createApi(
   {
     client: axiosInstance,
-    baseUri: '/api/users/',
+    baseUri: '/users/',
     models: {
       create: userCreateShape,
       entity: userShape,

diff --git a/{{cookiecutter.project_slug}}/clients/mobile/react-native/src/services/user/models.ts b/{{cookiecutter.project_slug}}/clients/mobile/react-native/src/services/user/models.ts
@@ -5,23 +5,25 @@
  *
  */
 
-import { GetInferredFromRaw } from '@thinknimble/tn-models-fp'
 import { z } from 'zod'
+import { GetInferredFromRaw, readonly } from '@thinknimble/tn-models-fp'
 import { baseModelShape } from '../base-model'
 
+
 export const userShape = {
   ...baseModelShape,
   email: z.string().email(),
   firstName: z.string(),
   lastName: z.string(),
-  token: z.string().nullable(),
+  token: readonly(z.string().nullable()),
 }
 export type UserShape = GetInferredFromRaw<typeof userShape>
 
 export const userCreateShape = {
-  ...userShape,
+  email: userShape.email,
+  firstName: userShape.firstName,
+  lastName:userShape.lastName,
   password: z.string(),
-  confirmPassword: z.string(),
 }
 
 export const forgotPasswordShape = {