Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions apps/api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,19 @@ COPY apps/api/src ./apps/api/src
RUN pnpm --filter=api build

# ── runner stage: minimal production image ──
# WORKDIR at /app (repo root) so pnpm's store symlinks resolve correctly
FROM base AS runner
WORKDIR /app/apps/api
WORKDIR /app

# Copy compiled output
COPY --from=deps /app/apps/api/dist ./dist
# Copy Prisma schema + migrations for runtime migrations
COPY --from=deps /app/apps/api/prisma ./prisma
# Copy compiled API output
COPY --from=deps /app/apps/api/dist ./apps/api/dist
# Copy Prisma schema + migrations for runtime
COPY --from=deps /app/apps/api/prisma ./apps/api/prisma
# Copy package.json for process metadata
COPY --from=deps /app/apps/api/package.json ./

# Copy node_modules from the monorepo (pnpm maintains symlinks correctly)
COPY --from=deps /app/node_modules ../node_modules
COPY --from=deps /app/apps/api/node_modules ./node_modules
COPY --from=deps /app/apps/api/package.json ./apps/api/package.json
# Copy the full pnpm virtual store + root node_modules (needed for symlink resolution)
COPY --from=deps /app/node_modules ./node_modules
COPY --from=deps /app/apps/api/node_modules ./apps/api/node_modules

EXPOSE 3001
CMD ["node", "dist/index.js"]
CMD ["node", "apps/api/dist/index.js"]
13 changes: 6 additions & 7 deletions apps/web/src/app/app/dashboard/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import Link from "next/link";
import { useRouter } from "next/navigation";
import { useEffect } from "react";
import { ArrowRight, Clock, Target, Trophy } from "lucide-react";
import { TRPCClientError } from "@trpc/client";
import { PageHeader } from "@/components/app/page-header";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
Expand All @@ -22,15 +21,15 @@ export default function DashboardPage() {
const leaderboardQuery = trpc.warRoom.getLeaderboard.useQuery();
const statsQuery = trpc.profile.getStats.useQuery();

const { data: profile, isLoading: profileLoading } = profileQuery;
const { data: tracks, isLoading: tracksLoading } = tracksQuery;
const { data: leaderboard, isLoading: leaderboardLoading } = leaderboardQuery;
const { data: stats, isLoading: statsLoading } = statsQuery;
const { data: profile } = profileQuery;
const { data: tracks } = tracksQuery;
const { data: leaderboard } = leaderboardQuery;
const { data: stats } = statsQuery;

const queries = [profileQuery, tracksQuery, leaderboardQuery, statsQuery];
const isLoading = queries.some((q) => q.isLoading);
const hasUnauthorized = queries.some(
(q) => q.error && (q.error as TRPCClientError<any>).data?.code === "UNAUTHORIZED",
(q) => q.error && (q.error as { data?: { code?: string } }).data?.code === "UNAUTHORIZED",
);

useEffect(() => {
Expand All @@ -45,7 +44,7 @@ export default function DashboardPage() {

if (isError) {
const nonAuthErrors = queries.some(
(q) => q.error && (q.error as TRPCClientError<any>).data?.code !== "UNAUTHORIZED",
(q) => q.error && (q.error as { data?: { code?: string } }).data?.code !== "UNAUTHORIZED",
);
if (nonAuthErrors) {
return (
Expand Down
5 changes: 4 additions & 1 deletion turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
"tasks": {
"build": {
"dependsOn": ["^build"],
"outputs": [".next/**", "dist/**"]
"outputs": [".next/**", "dist/**"],
"env": [
"NEXT_PUBLIC_API_URL"
]
},
"lint": {
"dependsOn": ["^lint"]
Expand Down