Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0ff8fae
chore(deps): bump next from 16.1.6 to 16.1.7 in /frontend
dependabot[bot] Mar 17, 2026
d299d15
chore(deps): bump ajv from 6.12.6 to 6.14.0 in /frontend
dependabot[bot] Mar 17, 2026
0dfe400
chore(deps): bump yaml from 2.8.2 to 2.8.3 in /frontend
dependabot[bot] Mar 26, 2026
854bb9d
chore(deps): bump brace-expansion from 1.1.12 to 1.1.13 in /api
dependabot[bot] Mar 29, 2026
2eda2a7
chore(deps): bump brace-expansion in /github-service
dependabot[bot] Mar 29, 2026
f0dc5d3
chore(deps): bump brace-expansion from 1.1.12 to 1.1.13 in /frontend
dependabot[bot] Mar 29, 2026
e57e329
chore(deps): bump flatted from 3.3.3 to 3.4.2 in /frontend
dependabot[bot] Apr 5, 2026
52e4e43
chore(deps): bump picomatch from 2.3.1 to 2.3.2 in /frontend
dependabot[bot] Apr 5, 2026
ff8058f
chore(deps): bump the all-actions group across 1 directory with 3 upd…
dependabot[bot] Apr 6, 2026
dc1629f
Add src path alias to API tsconfig
PaulicStudios Apr 6, 2026
eeb8bbb
chore(deps): bump @nestjs/core in /github-service
dependabot[bot] Apr 6, 2026
85e4cc6
chore(deps): bump @nestjs/core from 11.1.17 to 11.1.18 in /api
dependabot[bot] Apr 6, 2026
e2097c9
Merge pull request #624 from 42core-team/dependabot/npm_and_yarn/api/…
PaulicStudios Apr 7, 2026
9a0613b
Merge pull request #623 from 42core-team/dependabot/npm_and_yarn/gith…
PaulicStudios Apr 7, 2026
90800a5
Merge pull request #603 from 42core-team/dependabot/github_actions/al…
PaulicStudios Apr 7, 2026
63e998e
Merge pull request #602 from 42core-team/dependabot/npm_and_yarn/fron…
PaulicStudios Apr 7, 2026
a4cc304
Merge pull request #601 from 42core-team/dependabot/npm_and_yarn/gith…
PaulicStudios Apr 7, 2026
2e36bd4
Merge pull request #600 from 42core-team/dependabot/npm_and_yarn/api/…
PaulicStudios Apr 7, 2026
97dbbcd
Merge pull request #598 from 42core-team/dependabot/npm_and_yarn/fron…
PaulicStudios Apr 7, 2026
20fa417
Merge pull request #589 from 42core-team/dependabot/npm_and_yarn/fron…
PaulicStudios Apr 7, 2026
9326c86
Merge pull request #588 from 42core-team/dependabot/npm_and_yarn/fron…
PaulicStudios Apr 7, 2026
5b9ede5
Merge pull request #596 from 42core-team/dependabot/npm_and_yarn/fron…
PaulicStudios Apr 7, 2026
f20cb88
Merge pull request #590 from 42core-team/dependabot/npm_and_yarn/fron…
PaulicStudios Apr 7, 2026
eccbdde
Use my team query to gate queue link
PaulicStudios Apr 7, 2026
a576dde
chore: security frontend updates
PaulicStudios Apr 16, 2026
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 .github/workflows/api-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
uses: actions/checkout@v6

- name: Setup pnpm
uses: pnpm/action-setup@v4
uses: pnpm/action-setup@v5
with:
version: 10

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/api-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ jobs:
});

- name: Setup Helm
uses: azure/setup-helm@v4
uses: azure/setup-helm@v5
with:
version: "v3.13.3"

- name: Setup kubectl
uses: azure/setup-kubectl@v4
uses: azure/setup-kubectl@v5
with:
version: "v1.28.4"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
uses: actions/checkout@v6

- name: Setup pnpm
uses: pnpm/action-setup@v4
uses: pnpm/action-setup@v5
with:
version: 10

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/frontend-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ jobs:
});

- name: Setup Helm
uses: azure/setup-helm@v4
uses: azure/setup-helm@v5
with:
version: "v3.13.3"

- name: Setup kubectl
uses: azure/setup-kubectl@v4
uses: azure/setup-kubectl@v5
with:
version: "v1.28.4"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/github-service-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
uses: actions/checkout@v6

- name: Setup pnpm
uses: pnpm/action-setup@v4
uses: pnpm/action-setup@v5
with:
version: 10

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/github-service-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ jobs:
});

- name: Setup Helm
uses: azure/setup-helm@v4
uses: azure/setup-helm@v5
with:
version: "v3.13.3"

- name: Setup kubectl
uses: azure/setup-kubectl@v4
uses: azure/setup-kubectl@v5
with:
version: "v1.28.4"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/k8s-service-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ jobs:
});

- name: Setup Helm
uses: azure/setup-helm@v4
uses: azure/setup-helm@v5
with:
version: "v3.13.3"

- name: Setup kubectl
uses: azure/setup-kubectl@v4
uses: azure/setup-kubectl@v5
with:
version: "v1.28.4"

Expand Down
2 changes: 1 addition & 1 deletion api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"dependencies": {
"@nestjs/common": "^11.1.17",
"@nestjs/config": "^4.0.3",
"@nestjs/core": "^11.1.17",
"@nestjs/core": "^11.1.18",
"@nestjs/jwt": "^11.0.2",
"@nestjs/microservices": "^11.1.17",
"@nestjs/passport": "^11.0.5",
Expand Down
84 changes: 34 additions & 50 deletions api/pnpm-lock.yaml

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion api/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
"target": "ES2023",
"sourceMap": true,
"outDir": "./dist",
"baseUrl": "./",
"paths": {
"src/*": ["./src/*"]
},
"incremental": true,
"skipLibCheck": true,
"strictNullChecks": true,
Expand Down
15 changes: 13 additions & 2 deletions frontend/components/event-navbar.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
"use client";
import type { Event } from "@/app/actions/event";
import { useQuery } from "@tanstack/react-query";
import { Menu } from "lucide-react";
import Link from "next/link";
import { usePathname } from "next/navigation";
import { useMemo } from "react";
import {
myTeamQueryFn,
myTeamQueryKey,
} from "@/app/events/[id]/my-team/queries";
import { Button } from "@/components/ui/button";
import {
DropdownMenu,
Expand Down Expand Up @@ -37,6 +42,12 @@ export default function EventNavbar({
}: Readonly<EventNavbarProps>) {
const pathname = usePathname();
const hasStarted = Date.now() >= new Date(event.startDate).getTime();
const { data: myTeam } = useQuery({
queryKey: myTeamQueryKey(eventId),
queryFn: () => myTeamQueryFn(eventId),
enabled: isUserRegistered,
});
const effectiveHasTeam = myTeam === undefined ? hasTeam : Boolean(myTeam);

const navItems = useMemo(() => {
const items = [
Expand All @@ -47,7 +58,7 @@ export default function EventNavbar({
if (isUserRegistered) {
items.push({ name: "My Team", path: `/events/${eventId}/my-team` });

if (hasStarted && hasTeam) {
if (hasStarted && effectiveHasTeam) {
items.push({ name: "Queue", path: `/events/${eventId}/queue` });
}
}
Expand All @@ -65,7 +76,7 @@ export default function EventNavbar({
}

return items;
}, [eventId, isUserRegistered, hasTeam, isEventAdmin, hasStarted]);
}, [eventId, isUserRegistered, effectiveHasTeam, isEventAdmin, hasStarted]);

return (
<div className="flex items-center justify-start py-4 pl-12 md:justify-center md:pl-0">
Expand Down
4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
"@tanstack/react-form": "^1.28.3",
"@tanstack/react-query": "^5.90.21",
"@tanstack/react-table": "^8.21.3",
"axios": "^1.13.5",
"axios": "^1.15.0",
"chart.js": "^4.5.1",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"date-fns": "^4.1.0",
"framer-motion": "^12.34.1",
"gray-matter": "^4.0.3",
"lucide-react": "^0.574.0",
"next": "^16.1.6",
"next": "^16.2.4",
"next-auth": "^4.24.13",
"next-plausible": "^3.12.5",
"next-themes": "^0.4.6",
Expand Down
Loading
Loading