Merge branch 'main' into 173-frontend-create-new-workout-functionality

.github/workflows/cov.yml

@@ -1,10 +1,10 @@
-name: Barbell Github Action 
+name: Barbell Github Action
 
 on:
   pull_request:
-    branches: ["*"]
+    branches: ['*']
   push:
-    branches: ["main"]
+    branches: ['main']
 
 jobs:
   # > Jobs 1
@@ -16,44 +16,60 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-      
+
       - name: Set up pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: 8.x 
-      
+          version: 8.x
+
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
           node-version: 18.x
           cache: 'pnpm'
           cache-dependency-path: '**/pnpm-lock.yaml'
-          
+
       - name: Install root dependencies
         run: pnpm install --no-frozen-lockfile
 
-      - name: Install dependencies and setup Prisma
+
+      - name: Setup Prisma Schema
+        working-directory: .
         run: |
           cd packages/db && pnpm prisma generate && pnpm dotenv -e ../../.env prisma db push
-        working-directory: .
-
+        
       # - name: Run tests and collect coverage
       #   run: |
       #     pnpm run jest
       #   env:
       #     CI: true
-      
+
       - name: Run tests in expo
+        working-directory: .
+        env:
+          CI: true
         run: |
-          cd apps/expo && pnpm run test
+          cd apps/expo && pnpm run jest
+
+      - name: Run tests in api
         working-directory: .
         env:
           CI: true
+        run: |
+          cd packages/api && pnpm run vitest
 
-      - name: Upload coverage reports to Codecov
+      - name: Upload expo coverage reports to Codecov
         uses: codecov/codecov-action@v4.0.1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           slug: UNLV-CS472-672/2024-S-GROUP3-Barbell
-          directory: ./apps/expo/coverage/
+          directory: ./apps/expo/jest-coverage/
           fail_ci_if_error: true
+
+      # - name: Upload api coverage reports to Codecov
+      #   uses: codecov/codecov-action@v4.0.1
+      #   with:
+      #     token: ${{ secrets.CODECOV_TOKEN }}
+      #     slug: UNLV-CS472-672/2024-S-GROUP3-Barbell
+      #     directory: ./packages/api/vitest-coverage/
+      #     fail_ci_if_error: true

README.md

@@ -91,6 +91,8 @@ Tasks are assigned to team members by their first name. For tasks with multiple
 - [ ] [Ah yes, you can only for android OS on an Apple OS](https://github.com/expo/eas-cli/issues/1726)
 - [ ] [Invarient Violation](https://github.com/JesperLekland/react-native-svg-charts/issues/201)
 - [ ] [svg being funny](https://github.com/software-mansion/react-native-svg/issues/1405)
+- [ ] [nativewind is really really really bad](https://github.com/marklawlor/nativewind/issues/556)
+- [ ] [isn't this amazing SafeAreaView, Fk you](https://github.com/marklawlor/nativewind/issues/628)
 
 In case you encountered, Failed to get localhost. Please point to your production server.
 
@@ -102,3 +104,13 @@ In case you encountered, Failed to get localhost. Please point to your productio
 ### Adding/changing the database schema
 
 TBA
+
+### EAS UPDATE BRANCHES
+
+```
+<!-- sync development build with [yap] -->
+eas update --auto
+
+<!-- build android aab (apk successor) -->
+eas build --platform android
+```

apps/expo/app.config.ts

@@ -1,4 +1,4 @@
-import type { ExpoConfig } from '@expo/config'
+import type { ExpoConfig } from 'expo/config'
 
 const defineConfig = (): ExpoConfig => ({
   name: 'expo',
@@ -7,7 +7,7 @@ const defineConfig = (): ExpoConfig => ({
   version: '0.1.0',
   orientation: 'portrait',
   icon: './assets/icon.png',
-  userInterfaceStyle: 'light',
+  userInterfaceStyle: 'automatic',
   splash: {
     image: './assets/icon.png',
     resizeMode: 'contain',
@@ -30,19 +30,13 @@ const defineConfig = (): ExpoConfig => ({
     },
     jsEngine: 'hermes',
   },
-  // extra: {
-  //   eas: {
-  //     projectId: "your-eas-project-id",
-  //   },
-  // },
   extra: {
     // this is commented out so you don't have to log in to run expo start locally
     // eas: {
     //   projectId: 'a5b98934-bf53-4573-ba91-972c22a6759a',
     // },
     clerkPublishableKey: process.env.EXPO_PUBLIC_CLERK_PUBLISHABLE_KEY,
-    expoPublicClerkPublishableKey:
-      process.env.EXPO_PUBLIC_CLERK_PUBLISHABLE_KEY,
+    expoPublicClerkPublishableKey: process.env.EXPO_PUBLIC_CLERK_PUBLISHABLE_KEY,
   },
   runtimeVersion: {
     policy: 'appVersion',
@@ -54,8 +48,11 @@ const defineConfig = (): ExpoConfig => ({
   // jsEngine: 'hermes',
   plugins: [
     /* don't touch this */
-    'expo-router',
-    './expo-plugins/with-modify-gradle.js',
+    ["expo-router", { "root": "./src/app/" }],
+    'expo-font',
+    'expo-secure-store',
+    // 'expo-router',
+    // './expo-plugins/with-modify-gradle.js',
   ],
 })
 

apps/expo/babel.config.js

@@ -4,24 +4,15 @@ module.exports = (api) => {
   api.cache(true)
 
   return {
-    presets: [
-      'nativewind/babel',
-      ['babel-preset-expo', { jsxImportSource: 'nativewind' }], 
-    ],
+    presets: [['babel-preset-expo', { jsxImportSource: 'nativewind' }], 'nativewind/babel'],
     plugins: [
-      ['module:react-native-dotenv'],
-      require.resolve('expo-router/babel'),
-      require.resolve('react-native-reanimated/plugin'),
+      /* 50 */
+      'react-native-reanimated/plugin',
 
-      /* aliases */
-      [
-        'module-resolver',
-        {
-          alias: {
-            '~assets': './assets',
-          },
-        },
-      ],
+      /* 49 */
+      // ['module:react-native-dotenv'],
+      // require.resolve('expo-router/babel'),
+      // require.resolve('react-native-reanimated/plugin'),
     ],
   }
 }

apps/expo/eas.json

@@ -1,48 +1,46 @@
-  {
-    "cli": {
-      "version": ">= 5.8.0"
+{
+  "cli": {
+    "version": ">= 4.1.2"
+  },
+  "build": {
+    "base": {
+      "node": "18.18.2",
+      "pnpm": "8.15.4",
+      "ios": {
+        "resourceClass": "m-medium"
+      }
     },
-    "build": {
-      "base": {
-        "node": "18.16.1",
-        "ios": {
-          "resourceClass": "m-medium"
-        }
-      },
-      "development": {
-        "extends": "base",
-        "developmentClient": true,
-        "distribution": "internal",
-        "releaseChannel": "default",
-        "android": {
-          "buildType": "apk"
-        }
-      },
-      "preview": {
-        "extends": "base",
-        "distribution": "internal",
-        "releaseChannel": "preview",
-        "android": {
-          "buildType": "apk"
-        }
-      },
-      "production": {
-        "extends": "base"
-      },
-      "devclient": {
-        "extends": "base",
-        "releaseChannel": "default",
-        "distribution": "internal",
-        "developmentClient": true,
-        "android": {
-          "buildType": "apk"
-        },
-        "ios": {
-          "simulator": true
-        }
+    "development": {
+      "extends": "base",
+      "developmentClient": true,
+      "distribution": "internal",
+      "releaseChannel": "default"
+    },
+    "preview": {
+      "extends": "base",
+      "distribution": "internal",
+      "ios": {
+        "simulator": true
       }
     },
-    "submit": {
-      "production": {}
+    "production": {
+      "extends": "base",
+      "releaseChannel": "default"
+    },
+    "devclient": {
+      "extends": "base",
+      "releaseChannel": "default",
+      "distribution": "internal",
+      "developmentClient": true,
+      "android": {
+        "buildType": "apk"
+      },
+      "ios": {
+        "simulator": true
+      }
     }
+  },
+  "submit": {
+    "production": {}
   }
+}