Merge pull request #398 from TAMUSHPE/dev

Dev

.github/workflows/CITests.yml

@@ -5,6 +5,7 @@ on:
         branches: [ "main" ]
     pull_request:
         branches: [ "main", "dev" ]
+    workflow_dispatch:
 
 jobs:
     jest-test:
@@ -13,6 +14,7 @@ jobs:
         strategy:
             matrix:
                 node-version: [ 18.x ]
+                java-version: [ 21 ]
 
         steps:
         - uses: actions/checkout@v3
@@ -21,22 +23,46 @@ jobs:
           uses: actions/setup-node@v3
           with:
             node-version: ${{ matrix.node-version }}
+
+        - name: Use Java ${{ matrix.java-version }}
+          uses: actions/setup-java@v4
+          with:
+            distribution: 'zulu'
+            java-version: ${{ matrix.java-version }}
 
         - name: Set Environment Variables
           env:
             GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
             FLICKER_USER_ID: ${{ secrets.FLICKER_USER_ID }}
             FLICKER_API_KEY: ${{ secrets.FLICKER_API_KEY }}
             GOOGLE_PLACES_API_KEY: ${{ secrets.GOOGLE_PLACES_API_KEY }}
+            FIREBASE_EMULATOR_ADDRESS: 127.0.0.1
+            FIREBASE_AUTH_PORT: 9099
+            FIREBASE_FIRESTORE_PORT: 8080
+            FIREBASE_CLOUD_FUNCTIONS_PORT: 5001
+            FIREBASE_STORAGE_PORT: 9199
           run: echo "Environment variables set"
 
-        - name: Install dependencies
-          run: yarn install
-
-        - name: Run tests
+        - name: Install Dependencies
+          run: | 
+            yarn install
+            yarn global add firebase-tools
+            
+        - name: Build Cloud Functions
+          working-directory: ./functions
+          run: |
+            npm install
+            npm run build
+
+        - name: Run Tests
           env:
             GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
             FLICKER_USER_ID: ${{ secrets.FLICKER_USER_ID }}
             FLICKER_API_KEY: ${{ secrets.FLICKER_API_KEY }}
             GOOGLE_PLACES_API_KEY: ${{ secrets.GOOGLE_PLACES_API_KEY }}
-          run: yarn test
+            FIREBASE_EMULATOR_ADDRESS: 127.0.0.1
+            FIREBASE_AUTH_PORT: 9099
+            FIREBASE_FIRESTORE_PORT: 8080
+            FIREBASE_CLOUD_FUNCTIONS_PORT: 5001
+            FIREBASE_STORAGE_PORT: 9199
+          run: firebase emulators:exec 'yarn test'

app.json

@@ -2,11 +2,11 @@
   "expo": {
     "name": "TAMU SHPE",
     "slug": "TAMU-SHPE",
-    "version": "0.6.4",
+    "version": "1.0.0",
     "owner": "tamu-shpe",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
-    "userInterfaceStyle": "light",
+    "userInterfaceStyle": "automatic",
     "splash": {
       "image": "./assets/splash.png",
       "resizeMode": "contain",
@@ -52,11 +52,13 @@
       "permissions": [
         "android.permission.RECORD_AUDIO"
       ],
-      "versionCode": 31
+      "versionCode": 31,
+      "userInterfaceStyle": "automatic"
     },
     "ios": {
       "bundleIdentifier": "com.tamu.shpe",
-      "buildNumber": "1"
+      "buildNumber": "2",
+      "userInterfaceStyle": "automatic"
     },
     "extra": {
       "eas": {

assets/index.ts

@@ -1,4 +1,4 @@
-export const Images =  {
+export const Images = {
     LOGO_LIGHT: require("./logo_light.png"),
     DEFAULT_USER_PICTURE: require("./default_user_picture.png"),
     UPLOAD_ARROW: require("./upload_arrow.png"),
@@ -15,11 +15,16 @@ export const Images =  {
     GENEVA: require("./geneva.png"),
     INSTAGRAM: require("./Instagram-Logo.png"),
     FLICKER: require("./flicker.png"),
-    SHPE_LOGO_VERT:require("./SHPE_Logo_Vert.png"),
+    SHPE_LOGO_VERT: require("./SHPE_Logo_Vert.png"),
     COMMITTEE_1: require("./committee_1.png"),
     COMMITTEE_2: require("./committee_2.png"),
     COMMITTEE_3: require("./committee_3.png"),
     COMMITTEE_4: require("./committee_4.png"),
     COMMITTEE: require("./committee.png"),
     EVENT: require("./event.png"),
+    SHPE_NAVY: require("./SHPE_NAVY.png"),
+    SHPE_NAVY_HORIZ: require("./SHPE_NAVY_Horizontal.png"),
+    SHPE_NAVY_HEADER: require("./SHPE_NAVY_Header.png"),
+    SHPE_WHITE_HEADER: require("./SHPE_WHITE_Header.png"),
+    SHPE_WHITE: require("./SHPE_WHITE.png"),
 };