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

Fixed issue regarding not displaying user's registered name #48

Open
wants to merge 58 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
957bc40
chore/video: Replace placeholder video with hype video (#18)
abdullah50053 Nov 4, 2021
2087cfa
fix(video): Fix mobile video display (#19)
abdullah50053 Nov 4, 2021
b719d6a
Bug/video: Fix video on mobile (#21)
abdullah50053 Nov 4, 2021
785af5c
feat: Transfer dashboard and other from HackPortal
nam-t24 Nov 6, 2021
9272194
feat: Add speaker cards and fix alignment
nam-t24 Nov 7, 2021
d8ce964
feat: Transfer admin from hackportal
nam-t24 Nov 7, 2021
eeaecd8
fix: Fix sign in and admin transfer
nam-t24 Nov 7, 2021
4e214c2
feat: Add theme for hackerpack
nam-t24 Nov 8, 2021
d3882c9
feat: Add hacker pack info
nam-t24 Nov 8, 2021
ed5180b
fix(qrcode): Update deps for reading QR code
abdullah50053 Nov 8, 2021
072fcf7
feat: Add full page speaker cards
nam-t24 Nov 8, 2021
d32ef05
feat: Finish speaker cards
nam-t24 Nov 8, 2021
bce0869
fix(speaker): Fix speaker image not showing
abdullah50053 Nov 8, 2021
46b3b7d
fix(speaker): Fix speaker image not showing round 2
abdullah50053 Nov 8, 2021
68a3066
fix(speaker): Fix speaker image not showing round 3
abdullah50053 Nov 8, 2021
2dca34c
fix(speaker): Fix speaker image not showing round 4
abdullah50053 Nov 8, 2021
f1665b5
fix(speaker): Fix speaker image not showing round 5
abdullah50053 Nov 9, 2021
b3c626b
fix(speaker): Fix speaker image not showing round 6
abdullah50053 Nov 9, 2021
c15f1cc
fix: Fix speaker image path
nam-t24 Nov 9, 2021
2359a8e
fix: Adjust image path
nam-t24 Nov 9, 2021
10806d0
fix(stats): Remove background stat box
abdullah50053 Nov 9, 2021
ebd5583
fix(dashboard): Remove dashboard link on mobile
abdullah50053 Nov 9, 2021
73d8b26
fix(video): Fix video scaling on mobile
abdullah50053 Nov 9, 2021
f130608
feat: Prepare website for pre-HackUTD production deployment
WillieCubed Nov 9, 2021
7cfcc9e
Chore/second speaker (#28)
abdullah50053 Nov 9, 2021
bfc80b5
Merge branch 'main' into develop
abdullah50053 Nov 9, 2021
4bd9cb0
feat: Add calendar to schedule page
Jariel97 Nov 9, 2021
7806a4e
feat: Implement rudimentary calendar
trexrush Nov 10, 2021
4308ea2
feat: Custom time range in schedule
trexrush Nov 10, 2021
4f11bd7
chore: Update CSS to match Theme
Jariel97 Nov 10, 2021
9f81320
Merge branch 'feat/schedule' of github.com:acmutd/hackportal-hackutd …
Jariel97 Nov 10, 2021
3230922
fix: Range of hourse on schedule
trexrush Nov 10, 2021
7319f9f
Merge branch 'feat/schedule' of https://github.com/acmutd/hackportal-…
trexrush Nov 10, 2021
6530ee0
Revert: Calendar reset to initial calendar
Jariel97 Nov 10, 2021
78fd00f
fix: Styling issues in production
Jariel97 Nov 10, 2021
b07cbff
fix: Topleft whitespace in Calendar during production
Jariel97 Nov 10, 2021
20c8654
chore: Add all events on schedule page
Jariel97 Nov 10, 2021
384ddc3
style: Run linter
WillieCubed Nov 11, 2021
aaf6cd8
fix: Schedule locations for HackUTD VIII
WillieCubed Nov 11, 2021
0174e5a
feat: Implement schedule
WillieCubed Nov 11, 2021
17ac038
Merge branch 'main' into develop
WillieCubed Nov 11, 2021
40addce
fix: Remove duplicate Suresh Thumma Card
WillieCubed Nov 11, 2021
4174e9a
fix: Resolve schedule inconsistencies with master spreadsheet
WillieCubed Nov 11, 2021
2bcb182
chore: Remove snacks from day 1
WillieCubed Nov 11, 2021
315e353
fix: Update schedule times
WillieCubed Nov 11, 2021
6cc483c
Merge branch 'main' into develop
WillieCubed Nov 11, 2021
c8a2ae8
Feat/schedule (#37)
Jariel97 Nov 11, 2021
76e15b5
Merge stuff from HackPortal to HackUTD (#38)
DedsecKnight Nov 12, 2021
2ce7549
Merge branch 'main' into develop
abdullah50053 Nov 12, 2021
0c0bd8d
Chore/merge (#40)
abdullah50053 Nov 12, 2021
93e4980
chore: Add updated hackerpack info from notion (#43)
nam-t24 Nov 12, 2021
b838dd2
Merge branch 'main' into develop
abdullah50053 Nov 12, 2021
1b4c947
Update firebase-messaging-sw.js
abdullah50053 Nov 12, 2021
17cb058
Update firebase-messaging-sw.js
abdullah50053 Nov 12, 2021
28a5b30
Merge branch 'main' into develop
abdullah50053 Nov 12, 2021
e7655d4
fix(profile): Fixed issue regarding not displaying registered name
DedsecKnight Nov 13, 2021
9db1eb8
Merge remote-tracking branch 'origin/main' into fix/name
DedsecKnight Nov 13, 2021
4de2f4c
Merge branch 'main' into fix/name
nam-t24 Nov 14, 2021
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
4 changes: 2 additions & 2 deletions lib/user/AuthContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ function AuthProvider({ children }: React.PropsWithChildren<Record<string, any>>
setUser({
id: uid,
token,
firstName: displayName,
lastName: '',
firstName: userData.user.firstName,
lastName: userData.user.lastName,
preferredEmail: email,
photoUrl: photoURL,
permissions, // probably not the best way to do this, but it works for hackutd and that's what matters
Expand Down
1 change: 0 additions & 1 deletion pages/api/tokens/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ async function postTokenToDB(req: NextApiRequest, res: NextApiResponse) {
console.error(error);
return res.status(500).send({
msg: 'Server Error',
error,
});
}
}
Expand Down
2 changes: 1 addition & 1 deletion pages/dashboard/Components/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function Sidebar() {
id="Sidebar"
className="hidden md:flex flex-col content-center justify-center items-center h-screen fixed top-16 border-r-2 border-t-2 border-gray-600 lg:w-1/8 md:w-1/7 w-1/6 text-xs lg:text-sm text-center"
>
<div>Welcome, {!user || !isSignedIn ? 'hacker' : user.firstName}</div>
<div>Welcome, {!user || !isSignedIn ? 'hacker' : user.firstName + ' ' + user.lastName}</div>
<div className="text-indigo-500">{role}</div>
</section>
</>
Expand Down
4 changes: 3 additions & 1 deletion pages/dashboard/hackerpack.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ export default function HackerPack() {
</ul>
</section>
<div className="dashboardTag fixed bottom-0 border-t-2 border-r-2 border-aqua w-1/4 md:w-1/6 2xl:w-1/8 text-center py-3 bg-black">
<div>Welcome, {!user || !isSignedIn ? 'hacker' : user.firstName}</div>
<div>
Welcome, {!user || !isSignedIn ? 'hacker' : user.firstName + ' ' + user.lastName}
</div>
<div className="text-indigo-500">{role}</div>
</div>
</section>
Expand Down
2 changes: 1 addition & 1 deletion pages/profile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default function ProfilePage() {
setUserData({
id: user.uid,
preferredEmail: user.email,
name: user.displayName,
name: `${data.user.firstName} ${data.user.lastName}`,
permissions: data.user.permissions,
photoUrl: user.photoURL,
university: data.university,
Expand Down