diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index 12bd1e2d..53c3d3b3 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -20,12 +20,11 @@ jobs: steps: - uses: actions/checkout@v2 - run: echo "REACT_APP_BACKEND_URL=${{ secrets.DEV_BACKEND_URL }}" > .env - - run: echo "REACT_APP_OAUTH_CLIENT_ID=${{ secrets.DEV_OAUTH_CLIENT_ID }}" >> .env - run: rm -rf node_modules && yarn install --frozen-lockfile && yarn build - uses: FirebaseExtended/action-hosting-deploy@v0 with: repoToken: "${{ secrets.GITHUB_TOKEN }}" - firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_UW_BLUEPRINT_STARTER_CODE }}" + firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_BLUEPRINTSUPPORTIVEHOUSING }}" channelId: live projectId: "${{ secrets.DEV_PROJECT_ID }}" entryPoint: ./frontend diff --git a/.github/workflows/heroku-deploy-dev-py.yml b/.github/workflows/heroku-deploy-dev-py.yml index b3247eef..e4b4356b 100644 --- a/.github/workflows/heroku-deploy-dev-py.yml +++ b/.github/workflows/heroku-deploy-dev-py.yml @@ -5,7 +5,7 @@ on: branches: - main paths: - - "backend/python/**" + - "backend/**" jobs: deploy: @@ -31,52 +31,30 @@ jobs: - name: Add Heroku git remote run: heroku git:remote --app $HEROKU_APP_NAME env: - HEROKU_APP_NAME: "${{ secrets.DEV_PROJECT_ID }}" + HEROKU_APP_NAME: "${{ secrets.HEROKU_APP_NAME }}" - name: Set Heroku config vars run: | - mongodb { - heroku config:set MG_DATABASE_URL="${{ secrets.DEV_MG_DATABASE_URL }}" -a $HEROKU_APP_NAME && \ - } mongodb - auth { - heroku config:set FIREBASE_WEB_API_KEY="${{ secrets.DEV_FIREBASE_WEB_API_KEY }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_REQUEST_URI="${{ secrets.DEV_FIREBASE_REQUEST_URI }}" -a $HEROKU_APP_NAME && \ - file-storage { - heroku config:set FIREBASE_STORAGE_DEFAULT_BUCKET="${{ secrets.DEV_FIREBASE_STORAGE_DEFAULT_BUCKET }}" -a $HEROKU_APP_NAME && \ - } file-storage + heroku config:set DATABASE_URL="${{ secrets.DATABASE_URL }}" -a $HEROKU_APP_NAME && \ + heroku config:set FIREBASE_WEB_API_KEY="${{ secrets.FIREBASE_WEB_API_KEY }}" -a $HEROKU_APP_NAME && \ + heroku config:set FIREBASE_REQUEST_URI="${{ secrets.FIREBASE_REQUEST_URI }}" -a $HEROKU_APP_NAME && \ + heroku config:set FIREBASE_STORAGE_DEFAULT_BUCKET="${{ secrets.FIREBASE_STORAGE_DEFAULT_BUCKET }}" -a $HEROKU_APP_NAME && \ heroku config:set FIREBASE_PROJECT_ID="${{ secrets.DEV_PROJECT_ID }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_SVC_ACCOUNT_PRIVATE_KEY_ID="${{ secrets.DEV_FIREBASE_SVC_ACCOUNT_PRIVATE_KEY_ID }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_SVC_ACCOUNT_PRIVATE_KEY="${{ secrets.DEV_FIREBASE_SVC_ACCOUNT_PRIVATE_KEY }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_SVC_ACCOUNT_CLIENT_EMAIL="${{ secrets.DEV_FIREBASE_SVC_ACCOUNT_CLIENT_EMAIL }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_SVC_ACCOUNT_CLIENT_ID="${{ secrets.DEV_FIREBASE_SVC_ACCOUNT_CLIENT_ID }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_SVC_ACCOUNT_AUTH_URI="${{ secrets.DEV_FIREBASE_SVC_ACCOUNT_AUTH_URI }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_SVC_ACCOUNT_TOKEN_URI="${{ secrets.DEV_FIREBASE_SVC_ACCOUNT_TOKEN_URI }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_SVC_ACCOUNT_AUTH_PROVIDER_X509_CERT_URL="${{ secrets.DEV_FIREBASE_SVC_ACCOUNT_AUTH_PROVIDER_X509_CERT_URL }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_SVC_ACCOUNT_CLIENT_X509_CERT_URL="${{ secrets.DEV_FIREBASE_SVC_ACCOUNT_CLIENT_X509_CERT_URL }}" -a $HEROKU_APP_NAME && \ - } auth - no-auth { - file-storage { - heroku config:set FIREBASE_WEB_API_KEY="${{ secrets.DEV_FIREBASE_WEB_API_KEY }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_REQUEST_URI="${{ secrets.DEV_FIREBASE_REQUEST_URI }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_STORAGE_DEFAULT_BUCKET="${{ secrets.DEV_FIREBASE_STORAGE_DEFAULT_BUCKET }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_PROJECT_ID="${{ secrets.DEV_PROJECT_ID }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_SVC_ACCOUNT_PRIVATE_KEY_ID="${{ secrets.DEV_FIREBASE_SVC_ACCOUNT_PRIVATE_KEY_ID }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_SVC_ACCOUNT_PRIVATE_KEY="${{ secrets.DEV_FIREBASE_SVC_ACCOUNT_PRIVATE_KEY }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_SVC_ACCOUNT_CLIENT_EMAIL="${{ secrets.DEV_FIREBASE_SVC_ACCOUNT_CLIENT_EMAIL }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_SVC_ACCOUNT_CLIENT_ID="${{ secrets.DEV_FIREBASE_SVC_ACCOUNT_CLIENT_ID }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_SVC_ACCOUNT_AUTH_URI="${{ secrets.DEV_FIREBASE_SVC_ACCOUNT_AUTH_URI }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_SVC_ACCOUNT_TOKEN_URI="${{ secrets.DEV_FIREBASE_SVC_ACCOUNT_TOKEN_URI }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_SVC_ACCOUNT_AUTH_PROVIDER_X509_CERT_URL="${{ secrets.DEV_FIREBASE_SVC_ACCOUNT_AUTH_PROVIDER_X509_CERT_URL }}" -a $HEROKU_APP_NAME && \ - heroku config:set FIREBASE_SVC_ACCOUNT_CLIENT_X509_CERT_URL="${{ secrets.DEV_FIREBASE_SVC_ACCOUNT_CLIENT_X509_CERT_URL }}" -a $HEROKU_APP_NAME && \ - } file-storage - } no-auth - heroku config:set MAILER_USER="${{ secrets.DEV_MAILER_USER }}" -a $HEROKU_APP_NAME && \ - heroku config:set MAILER_CLIENT_ID="${{ secrets.DEV_MAILER_CLIENT_ID }}" -a $HEROKU_APP_NAME && \ - heroku config:set MAILER_CLIENT_SECRET="${{ secrets.DEV_MAILER_CLIENT_SECRET }}" -a $HEROKU_APP_NAME && \ - heroku config:set MAILER_REFRESH_TOKEN="${{ secrets.DEV_MAILER_REFRESH_TOKEN }}" -a $HEROKU_APP_NAME && \ + heroku config:set FIREBASE_SVC_ACCOUNT_PRIVATE_KEY_ID="${{ secrets.FIREBASE_SVC_ACCOUNT_PRIVATE_KEY_ID }}" -a $HEROKU_APP_NAME && \ + heroku config:set FIREBASE_SVC_ACCOUNT_PRIVATE_KEY="${{ secrets.FIREBASE_SVC_ACCOUNT_PRIVATE_KEY }}" -a $HEROKU_APP_NAME && \ + heroku config:set FIREBASE_SVC_ACCOUNT_CLIENT_EMAIL="${{ secrets.FIREBASE_SVC_ACCOUNT_CLIENT_EMAIL }}" -a $HEROKU_APP_NAME && \ + heroku config:set FIREBASE_SVC_ACCOUNT_CLIENT_ID="${{ secrets.FIREBASE_SVC_ACCOUNT_CLIENT_ID }}" -a $HEROKU_APP_NAME && \ + heroku config:set FIREBASE_SVC_ACCOUNT_AUTH_URI="${{ secrets.FIREBASE_SVC_ACCOUNT_AUTH_URI }}" -a $HEROKU_APP_NAME && \ + heroku config:set FIREBASE_SVC_ACCOUNT_TOKEN_URI="${{ secrets.FIREBASE_SVC_ACCOUNT_TOKEN_URI }}" -a $HEROKU_APP_NAME && \ + heroku config:set FIREBASE_SVC_ACCOUNT_AUTH_PROVIDER_X509_CERT_URL="${{ secrets.FIREBASE_SVC_ACCOUNT_AUTH_PROVIDER_X509_CERT_URL }}" -a $HEROKU_APP_NAME && \ + heroku config:set FIREBASE_SVC_ACCOUNT_CLIENT_X509_CERT_URL="${{ secrets.FIREBASE_SVC_ACCOUNT_CLIENT_X509_CERT_URL }}" -a $HEROKU_APP_NAME && \ + heroku config:set MAILER_USER="${{ secrets.MAILER_USER }}" -a $HEROKU_APP_NAME && \ + heroku config:set MAILER_CLIENT_ID="${{ secrets.MAILER_CLIENT_ID }}" -a $HEROKU_APP_NAME && \ + heroku config:set MAILER_CLIENT_SECRET="${{ secrets.MAILER_CLIENT_SECRET }}" -a $HEROKU_APP_NAME && \ + heroku config:set MAILER_REFRESH_TOKEN="${{ secrets.MAILER_REFRESH_TOKEN }}" -a $HEROKU_APP_NAME && \ heroku config:set PREVIEW_DEPLOY=true -a $HEROKU_APP_NAME && \ - heroku config:set FLASK_CONFIG="${{ secrets.DEV_FLASK_CONFIG }}" -a $HEROKU_APP_NAME && \ + heroku config:set FLASK_CONFIG="${{ secrets.FLASK_CONFIG }}" -a $HEROKU_APP_NAME && \ heroku config:set FLASK_APP=app -a $HEROKU_APP_NAME env: - HEROKU_APP_NAME: "${{ secrets.DEV_PROJECT_ID }}" + HEROKU_APP_NAME: "${{ secrets.HEROKU_APP_NAME }}" - name: Push to Heroku - run: git push heroku `git subtree split --prefix backend/python`:main --force + run: git push heroku `git subtree split --prefix backend`:refs/heads/main --force \ No newline at end of file diff --git a/backend/Procfile b/backend/Procfile new file mode 100644 index 00000000..3d7dfb27 --- /dev/null +++ b/backend/Procfile @@ -0,0 +1 @@ +web: flask db upgrade && python server.py diff --git a/backend/delete.txt b/backend/delete.txt new file mode 100644 index 00000000..9ae9e86b --- /dev/null +++ b/backend/delete.txt @@ -0,0 +1 @@ +ab \ No newline at end of file diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 9b46d637..1e54a574 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -11209,10 +11209,10 @@ typedarray@^0.0.6: resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz" integrity "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" -typescript@4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.2.tgz#6369ef22516fe5e10304aae5a5c4862db55380e9" - integrity sha512-thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ== +typescript@^4.1.2: + version "4.9.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" + integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== unbox-primitive@^1.0.0: version "1.0.1"