Skip to content

Main #380

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

Merged
kensac merged 4 commits into from
Oct 9, 2025
Merged

Main #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c4290c
Implemented Pre-Hackathon Events subsection under Schedule
dark-ap1015 Oct 8, 2025
413ae6c
Disable helpdesk
kensac Oct 9, 2025
3872795
Make events toggleable and match theme
kensac Oct 9, 2025
c8d8a95
Merge pull request #379 from Hack-PSU/aaren/pre-hackathon-schedule
kensac Oct 9, 2025
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
24 changes: 15 additions & 9 deletions src/app/(protected)/profile/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
useCreateAppleWalletPass,
} from "@/lib/api/wallet/hook";
import { useAllTeams } from "@/lib/api/team";
import { useFlagState } from "@/lib/api/flag/hook";
import Image from "next/image";
import QRCode from "react-qr-code";
import { Button } from "@/components/ui/button";
Expand Down Expand Up @@ -55,6 +56,9 @@ export default function Profile() {

const [showQRCode, setShowQRCode] = useState(false);

// Feature flag check for HelpDesk
const { data: helpDeskFlag } = useFlagState("HelpDesk");

const toggleQRCode = () => setShowQRCode((prev) => !prev);

useEffect(() => {
Expand Down Expand Up @@ -447,15 +451,17 @@ export default function Profile() {
Manage Extra Credit
</Button>

<Button
onClick={() => window.open("https://qstack.hackpsu.org", "_blank")}
className="w-full"
variant="default"
size="lg"
>
<HelpCircle className="mr-2 h-4 w-4" />
Get Help / Submit a Ticket
</Button>
{helpDeskFlag?.isEnabled && (
<Button
onClick={() => window.open("https://qstack.hackpsu.org", "_blank")}
className="w-full"
variant="default"
size="lg"
>
<HelpCircle className="mr-2 h-4 w-4" />
Get Help / Submit a Ticket
</Button>
)}

<Separator />

Expand Down
Loading