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

Invitation modal #287

Merged
merged 28 commits into from
Mar 23, 2024
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
232b2f3
add basic checkboxes for schedule version selection
joannacheng21 Feb 22, 2024
b79c7eb
create basic footer
joannacheng21 Feb 22, 2024
3ffd199
style checkboxes
joannacheng21 Feb 23, 2024
cf3d847
modify for multiple schedule versions
joannacheng21 Feb 24, 2024
61a9e43
add all friends to schedule context
joannacheng21 Feb 24, 2024
3287dfe
add dropdown for other schedules (more than 3)
joannacheng21 Feb 24, 2024
946457b
removing users with multiple schedule versions
joannacheng21 Feb 24, 2024
6ec267e
add logic to check if invite already accepted
joannacheng21 Feb 24, 2024
b45787f
create dropdown for link expiration
joannacheng21 Feb 24, 2024
2e96256
fixes
joannacheng21 Feb 24, 2024
5cd0132
clean up code
joannacheng21 Feb 24, 2024
c72b31a
add dependencies for useCallback
joannacheng21 Feb 24, 2024
8e8236f
Merge remote-tracking branch 'origin/bog-changes-s23-merged' into inv…
joannacheng21 Feb 26, 2024
8e317d7
fix styling
joannacheng21 Feb 26, 2024
7df9cd1
nit
yatharth-b Feb 27, 2024
53d3481
Merge branch 'bog-changes-s23-merged' into invitation-modal
yatharth-b Feb 27, 2024
9e98249
ran lint
yatharth-b Feb 27, 2024
7976912
in progress
yatharth-b Feb 28, 2024
8149a51
Merge branch 'bog-changes-s23-merged' into invitation-modal
yatharth-b Feb 28, 2024
be9c4b6
Merge branch 'bog-changes-s23-merged' into invitation-modal
yatharth-b Feb 28, 2024
81154c3
nit
yatharth-b Feb 28, 2024
107286e
disable send button when no email input
joannacheng21 Mar 10, 2024
7efdaae
design fixes
joannacheng21 Mar 10, 2024
14c5db9
nit
joannacheng21 Mar 10, 2024
4cd960d
change share link button
joannacheng21 Mar 10, 2024
e1385b2
Merge branch 'bog-changes-s23-merged' into invitation-modal
yatharth-b Mar 14, 2024
d330505
merge base
yatharth-b Mar 23, 2024
8f2a9da
refactor delete
yatharth-b Mar 23, 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
Prev Previous commit
Next Next commit
nit
yatharth-b committed Feb 28, 2024
commit 81154c33e4c56bf6d649de2592f5520da0ba50cd
7 changes: 4 additions & 3 deletions src/components/InvitationModal/index.tsx
Original file line number Diff line number Diff line change
@@ -131,12 +131,13 @@ export function InvitationModalContent({
string,
FriendShareData
>;
console.log(versionFriends)

// if friend accepted, don't increment numNotAccepted
return Object.keys(versionFriends).some((f) => {
return (
versionFriends[f]?.email === input.current?.value &&
(versionFriends[f]?.status === 'Accepted' || versionFriends[f]?.status === "Pending")
(versionFriends[f]?.status === 'Accepted' ||
versionFriends[f]?.status === 'Pending')
);
})
? acc
@@ -251,7 +252,7 @@ export function InvitationModalContent({
term,
getInvitationLink,
checkedSchedules,
selectedExpiration
selectedExpiration,
]);

const handleKeyDown = useCallback(
2 changes: 1 addition & 1 deletion src/constants.ts
Original file line number Diff line number Diff line change
@@ -76,7 +76,7 @@ const CAMPUSES: Record<string, string> = {

const BACKEND_BASE_URL = 'https://gt-scheduler.azurewebsites.net';
const FIREBASE_PROJECT_ID = firebaseConfig.projectId || `gt-scheduler-web-dev`;
const CLOUD_FUNCTION_BASE_URL = `http://127.0.0.1:5001/gt-scheduler-web-dev/us-central1`;
const CLOUD_FUNCTION_BASE_URL = `https://us-central1-${FIREBASE_PROJECT_ID}.cloudfunctions.net`;
// const CLOUD_FUNCTION_BASE_URL = `http://127.0.0.1:5001/${FIREBASE_PROJECT_ID}/us-central1`;

const LARGE_DESKTOP_BREAKPOINT = 1200;