Merge pull request #72 from dcalacci/develop

Moves deployment to GKE and fixes login loop

.github/workflows/build-server.yml → .github/workflows/build-dev.yml

@@ -1,25 +1,31 @@
-name: Build and push to Docker Hub
+name: Build and push development code
 
 # Controls when the action will run. 
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ master ]
-    paths: 
-        - server/**
+    branches: [ develop ]
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-env:
-  AWS_DEFAULT_REGION: us-east-1
-  AWS_DEFAULT_OUTPUT: json
-  AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
-  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-  CONTAINER_IMAGE: gigbox-server:${{ github.sha }}
-
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
+env: 
+  API_URL: ${{ secrets.DEV_API_URL }}
+  ENV: DEVELOPMENT
 jobs:
+  build-and-release-expo-dev-channel:
+    name: Publish App to Development Release Channel
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+      - uses: expo/expo-github-action@v5
+        with:
+          expo-version: 4.x
+          expo-token: ${{ secrets.EXPO_TOKEN }}
+      - run: yarn install
+      - run: expo publish --release-channel=develop
   build-and-push-docker-hub:
     name: Build and push to Docker Hub
     runs-on: ubuntu-latest
@@ -47,7 +53,7 @@ jobs:
           push: true
           context: ./server
           file: ./server/Dockerfile.prod
-          tags: gigbox/gigbox-server:latest
+          tags: gigbox/gigbox-server:development
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/expo-cd.yml

@@ -1,4 +1,4 @@
-name: Expo Staging Release
+name: Build expo review app for pre-releases on staging channel
 
 on:
   release:

.github/workflows/build-dev-server.yml → .github/workflows/push-server-production.yml

@@ -1,13 +1,13 @@
-name: Build and push development server to docker hub
+name: Build and push production server
 
 # Controls when the action will run. 
 on:
   push:
-    branches: [ dev/server ]
-  # Allows you to run this workflow manually from the Actions tab
+    branches: [ master ]
+    paths: 
+        - server/**
   workflow_dispatch:
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   build-and-push-docker-hub:
     name: Build and push to Docker Hub
@@ -36,7 +36,7 @@ jobs:
           push: true
           context: ./server
           file: ./server/Dockerfile.prod
-          tags: gigbox/gigbox-server:development
+          tags: gigbox/gigbox-server:latest
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/build-expo.yml → .github/workflows/review-expo-app.yml

@@ -1,4 +1,4 @@
-name: Expo Review
+name: Build expo review app on pull request
 on: [pull_request]
 env: 
   API_URL: ${{ secrets.DEV_API_URL }}

app.config.js

@@ -2,7 +2,7 @@ export default {
     name: 'Gigbox',
     slug: 'gigbox',
     description: 'Free, open-source work tracker designed with & for gig workers.',
-    version: '1.0.0',
+    version: '1.0.1',
     orientation: 'portrait',
     icon: './assets/images/icon.png',
     primaryColor: '#2BBC8A',

features/consent/InitialSurvey.tsx

@@ -28,7 +28,6 @@ export const InitialSurvey = ({ onSurveyFinish }: { onSurveyFinish: () => void }
         onSuccess: (data) => {
             console.log("data:", data)
             queryClient.invalidateQueries('userInfo');
-            queryClient.invalidateQueries('loggedIn');
             onSurveyFinish();
         },
     });