Skip to content

Commit

Permalink
Merge pull request #204 from codeforboston/develop
Browse files Browse the repository at this point in the history
Merge for code after sprint III
  • Loading branch information
jedpittman authored Dec 2, 2020
2 parents e6553cc + f4e2283 commit b000365
Show file tree
Hide file tree
Showing 166 changed files with 463,087 additions and 2,063 deletions.
13 changes: 0 additions & 13 deletions .dockerignore

This file was deleted.

6 changes: 6 additions & 0 deletions .env.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
SECRET_KEY=''
DB_NAME='jobhopperdatabase'
DB_USER='jobuser'
DB_PASSWORD='jobuser'
DB_HOST='127.0.0.1'
DB_EXTERNAL_PORT=5432
36 changes: 36 additions & 0 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: "Chromatic Deployment"

on: push

jobs:
chromatic-deployment:
runs-on: ubuntu-latest

defaults:
run:
working-directory: frontend

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Cache node modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: 14.x
- run: npm ci
- name: Deploy to Chromatic
env:
CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
run: npm run chromatic:ci
48 changes: 48 additions & 0 deletions .github/workflows/deploy-frontend.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Deploy Frontend

on:
push:
branches:
- develop

jobs:
build:
runs-on: ubuntu-latest

defaults:
run:
working-directory: frontend

steps:
- uses: actions/checkout@v2
- name: Cache node modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: 14.x
- run: npm ci
- run: npm run build
- name: Set Deploy Credentials
env:
FIREBASE_DEPLOY_PASSPHRASE: ${{ secrets.FIREBASE_DEPLOY_PASSPHRASE }}
run: |
echo "$FIREBASE_DEPLOY_PASSPHRASE" > firebase-deploy-passphrase
gpg \
--batch \
--passphrase-file firebase-deploy-passphrase \
--output firebase-deploy-credentials.json \
--decrypt firebase-deploy-credentials.json.gpg
- name: Deploy to Firebase
run: |
export GOOGLE_APPLICATION_CREDENTIALS="$(pwd)/firebase-deploy-credentials.json"
npm run deploy
2 changes: 1 addition & 1 deletion .github/workflows/lint-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm -s ci
- run: npm ci
- run: npm -s run ci:lint-and-test
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,9 @@ node_modules

# IDE settings
.idea
.vscode


firebase-deploy-credentials.json
firebase-deploy-passphrase
build-storybook.log
18 changes: 0 additions & 18 deletions Dockerfile

This file was deleted.

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ Jobhopper is an application for analyzing and querying career mobility and outsi

# Installation Overview

For details on setup, see [Overview](./References/Overview.md)
For details on setup, see [Installation](./docs/Installation.md)

# Technologies Used

| Front End | Logic & Data Processing: | Database: |
| ------------------ | ------------------------ | --------- |
| React (JavaScript) | Django (Python 3.7) | Postgres |

For more details, see [Architecture](./References/Architecture.md)
Also details on [Data Setup](./References/DataREADME.md) and [Django Data Migrations](./References/DjangoData.md) are available.
For more details, see [Architecture](./docs/Architecture.md)
Also details on [Data Setup](./docs/DataREADME.md) and [Django Data Migrations](./docs/DjangoData.md) are available.

## Additional Resources

The following provides details on how the data was sourced etc.
[Data References](./References/References.md)
[Data References](./docs/References.md)
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit b000365

Please sign in to comment.