Merge remote-tracking branch 'upstream/master' into prune-api

goodjoblife · Sep 10, 2023 · e37fb00 · e37fb00
2 parents 74806e6 + d4364b7
commit e37fb00
Show file tree

Hide file tree

Showing 240 changed files with 6,369 additions and 6,147 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
     build:
         working_directory: ~/app
         docker:
-            - image: node:12
+            - image: node:14
         steps:
             - checkout
             - restore_cache:

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -46,6 +46,8 @@ module.exports = {
               contexts: path.resolve('./src/contexts'),
               constants: path.resolve('./src/constants'),
               apis: path.resolve('./src/apis'),
+              actions: path.resolve('./src/actions'),
+              selectors: path.resolve('./src/selectors'),
             },
           },
         },

diff --git a/.flowconfig b/.flowconfig
diff --git a/.github/docker-compose-dev.yml b/.github/docker-compose-dev.yml
@@ -8,7 +8,10 @@ services:
       args:
         - RAZZLE_API_HOST=https://api-dev.goodjob.life
         - RAZZLE_FACEBOOK_APP_ID=1844389232511081
-        - RAZZLE_GA_ID=UA-79990667-2
+        - RAZZLE_GA_MEASUREMENT_ID=G-CYK1FN5G9P
         - RAZZLE_GTM_ID=GTM-KVZ7DZQ
         - RAZZLE_GOOGLE_APP_ID=879657963776-d8j1hq8dk38alp456ncvnq6mqh4f6bua.apps.googleusercontent.com
-        - RAZZLE_AMPLITUDE_API_KEY=d0b279a29601ca776f6557710220b79a
+        - RAZZLE_ENVIRONMENT=dev
+        - RAZZLE_TAP_PAY_APP_ID=125271
+        - RAZZLE_TAP_PAY_APP_KEY=app_WBWcR9mkiSMUQ3qZV5tUidkq7vfamUzmdWi5QR33ksT6ttbiZ9BJxbz5Fvma
+        - RAZZLE_TAP_PAY_SERVER_TYPE=sandbox
diff --git a/.github/docker-compose-production.yml b/.github/docker-compose-production.yml
@@ -8,10 +8,11 @@ services:
       args:
         - RAZZLE_API_HOST=https://api.goodjob.life
         - RAZZLE_FACEBOOK_APP_ID=1750216878594984
-        - RAZZLE_GA_ID=UA-79990667-1
+        - RAZZLE_GA_MEASUREMENT_ID=G-WR236FSVVY
         - RAZZLE_PIXEL_ID=603414113402034
-        - RAZZLE_SENTRY_DSN=https://[email protected]/1269010
-        - RAZZLE_GIT_SHA1=${CIRCLE_SHA1}
         - RAZZLE_GTM_ID=GTM-54PH93D
         - RAZZLE_GOOGLE_APP_ID=879657963776-nb0kdpkb5sfdf0285ov9o353dnt0l5iq.apps.googleusercontent.com
-        - RAZZLE_AMPLITUDE_API_KEY=4d69f09de855a21f8790bf0f42c47cda
+        - RAZZLE_ENVIRONMENT=production
+        - RAZZLE_TAP_PAY_APP_ID=125271
+        - RAZZLE_TAP_PAY_APP_KEY=app_WBWcR9mkiSMUQ3qZV5tUidkq7vfamUzmdWi5QR33ksT6ttbiZ9BJxbz5Fvma
+        - RAZZLE_TAP_PAY_SERVER_TYPE=production
diff --git a/.github/docker-compose-stage.yml b/.github/docker-compose-stage.yml
@@ -8,7 +8,7 @@ services:
       args:
         - RAZZLE_API_HOST=https://api.goodjob.life
         - RAZZLE_FACEBOOK_APP_ID=1750216878594984
-        - RAZZLE_GA_ID=UA-79990667-2
+        - RAZZLE_GA_MEASUREMENT_ID=G-CYK1FN5G9P
         - RAZZLE_GTM_ID=GTM-KVZ7DZQ
-        - RAZZLE_GOOGLE_APP_ID=879657963776-d8j1hq8dk38alp456ncvnq6mqh4f6bua.apps.googleusercontent.com
-        - RAZZLE_AMPLITUDE_API_KEY=d0b279a29601ca776f6557710220b79a
+        - RAZZLE_GOOGLE_APP_ID=879657963776-nb0kdpkb5sfdf0285ov9o353dnt0l5iq.apps.googleusercontent.com
+        - RAZZLE_ENVIRONMENT=stage
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [12, 14]
+        node: [14, 16]
     steps:
       - name: Checkout
         uses: actions/checkout@v1

diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npm run lint-staged
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,28 +1,30 @@
-FROM node:12
+FROM node:16
 
 COPY . /app
 
 WORKDIR /app
 
 ARG RAZZLE_API_HOST
 ARG RAZZLE_FACEBOOK_APP_ID
-ARG RAZZLE_GA_ID
+ARG RAZZLE_GA_MEASUREMENT_ID
 ARG RAZZLE_GTM_ID
 ARG RAZZLE_PIXEL_ID
-ARG RAZZLE_SENTRY_DSN
-ARG RAZZLE_GIT_SHA1
 ARG RAZZLE_GOOGLE_APP_ID
-ARG RAZZLE_AMPLITUDE_API_KEY
+ARG RAZZLE_ENVIRONMENT
+ARG RAZZLE_TAP_PAY_APP_ID
+ARG RAZZLE_TAP_PAY_APP_KEY
+ARG RAZZLE_TAP_PAY_SERVER_TYPE
 
 ENV RAZZLE_API_HOST="${RAZZLE_API_HOST}" \
     RAZZLE_FACEBOOK_APP_ID="${RAZZLE_FACEBOOK_APP_ID}" \
-    RAZZLE_GA_ID="$RAZZLE_GA_ID" \
+    RAZZLE_GA_MEASUREMENT_ID="$RAZZLE_GA_MEASUREMENT_ID" \
     RAZZLE_GTM_ID="$RAZZLE_GTM_ID" \
     RAZZLE_PIXEL_ID="$RAZZLE_PIXEL_ID" \
-    RAZZLE_SENTRY_DSN="$RAZZLE_SENTRY_DSN" \
-    RAZZLE_GIT_SHA1="$RAZZLE_GIT_SHA1" \
     RAZZLE_GOOGLE_APP_ID="$RAZZLE_GOOGLE_APP_ID" \
-    RAZZLE_AMPLITUDE_API_KEY="$RAZZLE_AMPLITUDE_API_KEY"
+    RAZZLE_ENVIRONMENT="$RAZZLE_ENVIRONMENT" \
+    RAZZLE_TAP_PAY_APP_ID="$RAZZLE_TAP_PAY_APP_ID" \
+    RAZZLE_TAP_PAY_APP_KEY="$RAZZLE_TAP_PAY_APP_KEY" \
+    RAZZLE_TAP_PAY_SERVER_TYPE="$RAZZLE_TAP_PAY_SERVER_TYPE"
 
 RUN yarn install && yarn run build && yarn cache clean