Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BoG Spring 24 Deployment - Friends Feature #253

Merged
merged 99 commits into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
5086bb2
Enable preview per PR
Jan 22, 2023
3753ea3
Merge branch 'main' into bog-changes-s23
Jan 22, 2023
383152c
Migrate schedule data schema to version 3; fix deploy preview bugs
Jan 22, 2023
28fdaba
Add yarn secrets
Jan 25, 2023
76d2a2d
Create PR template
Jan 25, 2023
c4d5702
Fix deploy preview bugs
Jan 29, 2023
8109464
Update Course Combination Algorithm (#155)
samarth52 Feb 5, 2023
06c2ae9
Emily/148-seperate-course-reccuring (#156)
EmilyAL001 Feb 7, 2023
6b7db7c
Create Event component (#157)
sophiazlin Feb 7, 2023
8808a65
Recurring Event Input Form (#158)
nathangong Feb 7, 2023
8fee760
Yatharth/152 conflict algo update (#159)
yatharth-b Feb 7, 2023
cdbc873
Integrate event components (#166)
nhatnghiho Feb 13, 2023
a6a84e6
Display custom blocks (#165)
sophiazlin Feb 23, 2023
efac436
Update sort algorithm for "most compact" (#167)
nathangong Feb 23, 2023
0fa5e8f
Add Initial Friends Schema (#168)
yatharth-b Feb 24, 2023
97c5ae9
Emily/162 send invitation modal (#169)
EmilyAL001 Feb 24, 2023
75d4eea
Send Email Invitation to Friends (#170)
samarth52 Feb 24, 2023
d19cd13
lint
yatharth-b Mar 2, 2023
490718b
lint
yatharth-b Mar 2, 2023
5aa39ca
fix tests
yatharth-b Mar 27, 2023
7ed7ad8
fix all tests
yatharth-b Mar 27, 2023
f46af2c
make changes
yatharth-b Mar 28, 2023
20c58a2
Merge branch 'main' into bog-changes-s23
Mar 31, 2023
adfc241
Merge branch 'main' into bog-changes-s23
Mar 31, 2023
f0c3319
Merge branch 'main' into bog-changes-s23
Apr 21, 2023
59aaf5e
minor fixes
Apr 21, 2023
0723be4
Merge branch 'bog-changes-s23' into yatharth/173-invitation-modal-fun…
nhatnghiho Apr 21, 2023
63f2b94
fix ci error
Apr 21, 2023
749ecd2
Merge branch 'sophia/182-fix-modal' of https://github.com/gt-schedule…
samarth52 Oct 19, 2023
f87c046
Squashed commit of the following:
samarth52 Oct 19, 2023
83f447e
Create email invite confirmation screen (#215)
nathangong Oct 19, 2023
da7d0c0
Updated actions/checkout version and added yarn cache for GitHub actions
samarth52 Oct 19, 2023
fdf35fe
Compare Panel (#185)
sophiazlin Oct 19, 2023
cbf6d98
Added yarn cache for build and test GitHub actions
samarth52 Oct 19, 2023
a225009
Emily/208 minor UI enhancements (#214)
EmilyAL001 Oct 19, 2023
ef99fd6
Implement a Rate Limiter (#216)
samarth52 Oct 20, 2023
49f9d5f
Compare functionality (#217)
sophiazlin Oct 20, 2023
7ae3dae
Fix mobile course container overflow issue (#227)
nathangong Oct 20, 2023
8861839
Allow Events to Be Duplicated (#235)
nathangong Oct 20, 2023
a96b4a4
Fix Exported Calendar Does Not Account for Local Timezone (#238)
samarth52 Oct 20, 2023
ace9ae0
Minor design changes
samarth52 Oct 20, 2023
780c4de
Delete Friend From Invitation Modal (#237)
samarth52 Oct 20, 2023
1bdcfe8
Invitation cannot be sent to pre-existing friend
samarth52 Oct 20, 2023
2c1b75e
Pin own schedule by default in compare panel
samarth52 Oct 20, 2023
0ab21fe
Fixed PR Preview auto redirect
samarth52 Oct 21, 2023
531135e
Add borders to separate overlapping blocks
nhatnghiho Oct 21, 2023
f6435ec
Fixes PR Preview Link Auto Redirecting (#254)
samarth52 Jan 16, 2024
00732b6
nits
samarth52 Feb 2, 2024
ae32720
New Time Picker Component for Recurring Events (#240)
nathangong Feb 4, 2024
8f3616a
Revert "New Time Picker Component for Recurring Events" (#272)
yatharth-b Feb 4, 2024
64050b2
Merge branch 'main' into bog-changes-s23-merged
yatharth-b Feb 26, 2024
983c711
Compare Panel UI changes (#286)
iphonecats Feb 27, 2024
8e654a1
Merge branch 'main' into bog-changes-s23-merged
yatharth-b Feb 27, 2024
1121124
Merge branch 'bog-changes-s23-merged' of https://github.com/gt-schedu…
yatharth-b Feb 27, 2024
1bda38a
Share schedule back feature (#289)
iphonecats Feb 27, 2024
7ed9aac
Merge branch 'main' into bog-changes-s23-merged
yatharth-b Feb 27, 2024
010f9ce
Completed multi-invite link handling (#279)
aeluro1 Feb 28, 2024
b75b757
fix redirects and auth
yatharth-b Feb 28, 2024
846c6f4
Redirect Modal for Share Schedule (#295)
yatharth-b Feb 28, 2024
64cf3f3
Preserve State for Compare Schedule (#298)
Nathan-Papa Mar 3, 2024
fd42ea6
Brandon/293 share schedule UI changes (#296)
iphonecats Mar 4, 2024
5ef3f07
nit
yatharth-b Mar 4, 2024
5b39b9a
Merge branch 'bog-changes-s23-merged' of https://github.com/gt-schedu…
yatharth-b Mar 4, 2024
ea11eff
Open compare schedule on accepting invitation (#304)
Nathan-Papa Mar 13, 2024
99c46e2
Brandon/305 compare panel UI changes (#307)
iphonecats Mar 13, 2024
b1e6424
Show Friend Schedule on Hover (#303)
joannacheng21 Mar 13, 2024
aff60a3
Updated new features modal (#308)
Nathan-Papa Mar 13, 2024
57e70e2
Error Modal after Accepting Invitations (#311)
yatharth-b Mar 14, 2024
2cc88da
Updated shared schedule deletion API calls (#297)
aeluro1 Mar 23, 2024
e5933ec
Refactor Delete Friend Functions Compare Panel (#312)
yatharth-b Mar 23, 2024
a1f180b
Invitation modal (#287)
joannacheng21 Mar 23, 2024
6f9e03f
nit
yatharth-b Mar 25, 2024
9e2db35
Use variables for colors in invitation modal and comparison panel (#317)
joannacheng21 Mar 30, 2024
c183ab2
remove hover from gts logo
yatharth-b Mar 31, 2024
70ed9bf
Redirect Modal Changes (#319)
yatharth-b Mar 31, 2024
94aafb6
Invitation Modal Changes (#321)
yatharth-b Mar 31, 2024
77d179a
Multiple schedule selection (#320)
aeluro1 Mar 31, 2024
2ace596
nit
yatharth-b Mar 31, 2024
de6e217
merge base
yatharth-b Mar 31, 2024
c455bde
remove test file
yatharth-b Mar 31, 2024
b00b78c
Light mode invitation accept modal (#323)
joannacheng21 Mar 31, 2024
fc0af9f
Nathan/UI changes (#324)
Nathan-Papa Apr 1, 2024
5d76c0d
remove hover from donate today
yatharth-b Apr 1, 2024
bbc86bf
edit expiration choices
yatharth-b Apr 1, 2024
cba53e4
open most recent finalized term on first open of app
yatharth-b Apr 1, 2024
f76aebc
switch to the term for which the invite was accepted
yatharth-b Apr 1, 2024
fd0806e
let user know that schedules have already been accepted
yatharth-b Apr 1, 2024
1cfafc4
center share schedule button on compare panel
yatharth-b Apr 1, 2024
9921ed0
Brandon Sprint 5 Compare Feature UI changes (#318)
iphonecats Apr 1, 2024
edf1d2a
only show big share back button when all schedules haven't been shared
yatharth-b Apr 1, 2024
f9c64df
Merge branch 'bog-changes-s23-merged' of https://github.com/gt-schedu…
yatharth-b Apr 1, 2024
11ef16f
fix redirect modal styling
yatharth-b Apr 1, 2024
8c9bca5
temp store images in firebase for preview
yatharth-b Apr 1, 2024
ee856c8
replace search parameters with root route after redirect modal closes
yatharth-b Apr 1, 2024
1d02f0f
change styling of some things
yatharth-b Apr 1, 2024
4b8ef4b
more styling changes
yatharth-b Apr 1, 2024
19bd976
Light mode share back fix design (#325)
joannacheng21 Apr 1, 2024
f6169d6
fix share back on redirect modal
yatharth-b Apr 2, 2024
b63aa9d
final changes
yatharth-b Apr 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading