Skip to content

Commit

Permalink
BoG Spring 24 Deployment - Friends Feature (#328)
Browse files Browse the repository at this point in the history
🚀

---------

Co-authored-by: Hailey Ho <[email protected]>
Co-authored-by: Hailey Ho <[email protected]>
Co-authored-by: Samarth Chandna <[email protected]>
Co-authored-by: Nghi Ho <[email protected]>
Co-authored-by: EmilyAL001 <[email protected]>
Co-authored-by: Sophia Lin <[email protected]>
Co-authored-by: Nathan Gong <[email protected]>
Co-authored-by: Hailey Ho <[email protected]>
Co-authored-by: Hailey Ho <[email protected]>
Co-authored-by: Hailey Ho <[email protected]>
Co-authored-by: Hailey Ho <[email protected]>
Co-authored-by: Hailey Ho <[email protected]>
Co-authored-by: Hailey Ho <[email protected]>
Co-authored-by: Samarth Chandna <[email protected]>
Co-authored-by: EmilyAL001 <[email protected]>
Co-authored-by: nhatnghiho <[email protected]>
Co-authored-by: Brandon Ho <[email protected]>
Co-authored-by: aeluro1 <[email protected]>
Co-authored-by: Nathan Papa <[email protected]>
Co-authored-by: Joanna Cheng <[email protected]>
  • Loading branch information
21 people authored Apr 2, 2024
1 parent a5a78a1 commit 594219a
Show file tree
Hide file tree
Showing 93 changed files with 6,574 additions and 325 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
/tests/fixtures/**
/tests/performance/**
/tmp/**
/src/vendor/**
/src/vendor/**
7 changes: 6 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@
}
],
"no-plusplus": ["warn", { "allowForLoopAfterthoughts": true }],
"prettier/prettier": "warn",
"prettier/prettier": [
"warn",
{
"endOfLine": "auto"
}
],
"react/require-default-props": "off",
"no-await-in-loop": "off",
"camelcase": "off",
Expand Down
21 changes: 18 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
node-version: '18'
cache: 'yarn'

- name: Install
run: yarn install --frozen-lockfile
Expand All @@ -28,7 +33,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
node-version: '18'
cache: 'yarn'

- name: Install
run: yarn install --frozen-lockfile
Expand Down Expand Up @@ -58,7 +68,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
node-version: '18'
cache: 'yarn'

- name: Install
run: yarn install --frozen-lockfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
persist-credentials: false
# Fetch all history for Sentry to properly create the release
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"@fortawesome/react-fontawesome": "^0.2.0",
"@sentry/react": "^6.12.0",
"@sentry/tracing": "^6.12.0",
"@types/lodash": "^4.14.192",
"@types/react-map-gl": "^6.1.3",
"axios": "^0.21.4",
"cheerio": "^1.0.0-rc.3",
Expand All @@ -23,6 +24,7 @@
"html-entities": "^2.3.3",
"immer": "^9.0.6",
"js-cookie": "^3.0.1",
"lodash": "^4.17.21",
"mapbox-gl": "^2.4.1",
"node-sass": "^6.0.1",
"normalize.css": "^8.0.1",
Expand All @@ -32,6 +34,7 @@
"react-map-gl": "5.2.11",
"react-overlays": "^5.1.1",
"react-resize-panel": "^0.3.5",
"react-router-dom": "^6.17.0",
"react-scripts": "5.0.1",
"react-tooltip": "^5.5.1",
"react-transition-group": "^4.4.2",
Expand Down Expand Up @@ -84,7 +87,7 @@
"secrets:linux": "echo Enter Bitwarden Password: && read BW_PASSWORD && (bw logout || exit 0) && export BW_SESSION=`bw login [email protected] $BW_PASSWORD --raw` && npm run secrets:get",
"secrets:windows": "set /p BW_PASSWORD=Enter Bitwarden Password:&& (bw logout || VER>NUL) && npm run secrets:login",
"secrets:login": "FOR /F %a IN ('bw login [email protected] %BW_PASSWORD% --raw') DO SET BW_SESSION=%a && npm run secrets:get",
"secrets:get": "bw sync && bw get item gt-scheduler/.env.development.local | fx .notes > \".env\""
"secrets:get": "bw sync && bw get item gt-scheduler/website/.env.development.local | fx .notes > \".env\""
},
"eslintConfig": {
"extends": "react-app"
Expand Down
Binary file removed public/bitsOfGood.png
Binary file not shown.
12 changes: 12 additions & 0 deletions public/bitsOfGood.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/compare_panel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/compare_schedule.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/donate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file added public/exportIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/invitation-succesful.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 594219a

Please sign in to comment.