diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index 7234ff81..12bd1e2d 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -20,9 +20,7 @@ jobs: steps: - uses: actions/checkout@v2 - run: echo "REACT_APP_BACKEND_URL=${{ secrets.DEV_BACKEND_URL }}" > .env - auth { - run: echo "REACT_APP_OAUTH_CLIENT_ID=${{ secrets.DEV_OAUTH_CLIENT_ID }}" >> .env - } auth - run: rm -rf node_modules && yarn install --frozen-lockfile && yarn build - uses: FirebaseExtended/action-hosting-deploy@v0 with: diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml index 42b5faa6..b5e9e313 100644 --- a/.github/workflows/firebase-hosting-pull-request.yml +++ b/.github/workflows/firebase-hosting-pull-request.yml @@ -1,12 +1,8 @@ # This file was auto-generated by the Firebase CLI # https://github.com/firebase/firebase-tools -name: Deploy frontend to Firebase Hosting preview - -on: - pull_request: - paths: - - "frontend/**" +name: Deploy to Firebase Hosting on PR +"on": pull_request defaults: run: @@ -14,18 +10,16 @@ defaults: jobs: build_and_preview: - if: "${{ github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main' }}" + if: "${{ github.event.pull_request.head.repo.full_name == github.repository }}" runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - run: echo "REACT_APP_BACKEND_URL=${{ secrets.PREVIEW_BACKEND_URL }}" > .env - auth { - - run: echo "REACT_APP_OAUTH_CLIENT_ID=${{ secrets.DEV_OAUTH_CLIENT_ID }}" >> .env - } auth - - run: rm -rf node_modules && yarn install --frozen-lockfile && yarn build + - run: | + export NODE_OPTIONS="--max_old_space_size=4096" + rm -rf node_modules && yarn install && yarn build - uses: FirebaseExtended/action-hosting-deploy@v0 with: repoToken: "${{ secrets.GITHUB_TOKEN }}" - firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_UW_BLUEPRINT_STARTER_CODE }}" - projectId: "${{ secrets.DEV_PROJECT_ID }}" + firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_BLUEPRINTSUPPORTIVEHOUSING }}" + projectId: blueprintsupportivehousing entryPoint: ./frontend diff --git a/.github/workflows/heroku-deploy-dev-py.yml b/.github/workflows/heroku-deploy-dev-py.yml index 936fa2f7..b3247eef 100644 --- a/.github/workflows/heroku-deploy-dev-py.yml +++ b/.github/workflows/heroku-deploy-dev-py.yml @@ -9,7 +9,6 @@ on: jobs: deploy: - if: ${{ false }} runs-on: ubuntu-latest steps: - name: Check out repository diff --git a/backend/app/__init__.py b/backend/app/__init__.py index 3b91d4f8..0ddc222f 100644 --- a/backend/app/__init__.py +++ b/backend/app/__init__.py @@ -40,9 +40,9 @@ def create_app(config_name="development"): app.config["CORS_ORIGINS"] = [ "http://localhost:3000", - "https://uw-blueprint-starter-code.firebaseapp.com", - "https://uw-blueprint-starter-code.web.app", - re.compile("^https:\/\/uw-blueprint-starter-code--pr.*\.web\.app$"), + "https://blueprint-supportive-housing.firebaseapp.com", + "https://blueprint-supportive-housing.web.app", + re.compile("^https:\/\/blueprint-supportive-housing--pr.*\.web\.app$"), ] app.config["CORS_SUPPORTS_CREDENTIALS"] = True CORS(app) diff --git a/frontend/.firebaserc b/frontend/.firebaserc index 32c94782..fbd8754f 100644 --- a/frontend/.firebaserc +++ b/frontend/.firebaserc @@ -1,5 +1,5 @@ { "projects": { - "default": "uw-blueprint-starter-code" + "default": "blueprintsupportivehousing" } } diff --git a/frontend/.gitignore b/frontend/.gitignore new file mode 100644 index 00000000..dbb58ffb --- /dev/null +++ b/frontend/.gitignore @@ -0,0 +1,66 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +firebase-debug.log* +firebase-debug.*.log* + +# Firebase cache +.firebase/ + +# Firebase config + +# Uncomment this if you'd like others to create their own Firebase project. +# For a team working on the same Firebase project(s), it is recommended to leave +# it commented so all members can deploy to the same project(s) in .firebaserc. +# .firebaserc + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env diff --git a/frontend/package.json b/frontend/package.json index 9c97be6d..6b3f33b9 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -51,7 +51,7 @@ }, "scripts": { "start": "react-scripts start", - "build": "react-scripts build", + "build": "react-scripts --openssl-legacy-provider build", "test": "react-scripts test", "eject": "react-scripts eject", "lint": "eslint . --ext .ts,.tsx,.js,.jsx",