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.

Sign up for GitHub

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

A few quick fixes #89

Merged
merged 1 commit into from
Oct 30, 2024
Merged

A few quick fixes #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 4 additions & 25 deletions client/src/app/(authorized)/hacker/(main)/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,7 @@ export default function HackerHome() {
<div className="dh-box p-2 text-center grow basis-0 ml-4 flex flex-col">
<h2 className="font-semibold mb-2">Guild</h2>
<div className="flex flex-col md:flex-row items-center justify-evenly md:justify-center md:gap-x-4 grow">
<object
data={`/${team?.guild_name}/icon.svg`}
type="image/svg+xml"
className="w-12"
>
<img
src={`/${team?.guild_name}/icon.png`}
alt={`${team?.guild_name} Logo`}
/>
</object>
<img className="w-12 h-12" src={`/${team?.guild_name}/icon.png`} alt={`${team?.guild_name} Logo`} />
<p className="font-heading text-lg">{team?.guild_name}</p>
</div>
</div>
Expand Down Expand Up @@ -130,33 +121,21 @@ export default function HackerHome() {
<ExclamationTriangleIcon className="w-6 h-6 mr-2" />
No Guild Assigned
</p>
<p>
Please speak to a volunteer to ensure your team&apos;s points
are recorded!
</p>
<p>Please speak to a volunteer to ensure your team&apos;s points are recorded!</p>
</div>
)}
</div>
) : (
<TeamSetup />
)}
<button
onClick={() => setScanning(true)}
className="fixed bottom-14 right-6 bg-accent p-3 rounded-full"
>
<button onClick={() => setScanning(true)} className="fixed bottom-14 right-6 bg-accent p-3 rounded-full">
<QrCodeIcon className="w-10 h-10" />
</button>
<ButtonModal
show={scanning}
onClose={(bool) => setScanning(bool)}
itemsClass="items-center"
content={
<Scanner
scanning={scanning}
scanSuccess={scanSuccess}
className="h-96"
/>
}
content={<Scanner scanning={scanning} scanSuccess={scanSuccess} className="h-96" />}
buttons={
<button
type="button"
Expand Down
1 change: 1 addition & 0 deletions client/src/lib/is-role.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export function isVolunteer(profile: User) {
return profile.roles?.some((role) => {
if (role === "/admins") return true
if (role === "/volunteers") return true
if (role === "/organisers") return true
if (role === "/sponsors") return true
return false
})
Expand Down
4 changes: 2 additions & 2 deletions server/config/development.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ export default {
csrf: {
options: {
cookieOptions: {
domain: "megateams.durhack-dev.com",
domain: "guilds.durhack-dev.com",
},
},
},
session: {
cookie: {
domain: "megateams.durhack-dev.com",
domain: "guilds.durhack-dev.com",
},
},
} satisfies DeepPartial<ConfigIn>
Expand Down
Loading