diff --git a/package-lock.json b/package-lock.json index 815631c..641d05b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -118,7 +118,6 @@ "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/code-frame": "^7.29.7", "@babel/generator": "^7.29.7", @@ -4522,13 +4521,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@rushstack/eslint-patch": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.16.1.tgz", - "integrity": "sha512-TvZbIpeKqGQQ7X0zSCvPH9riMSFQFSggnfBjFZ1mEoILW+UuXCKwOoPcgjMwiUtRqFZ8jWhPJc4um14vC6I4ag==", - "dev": true, - "license": "MIT" - }, "node_modules/@stablelib/base64": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@stablelib/base64/-/base64-1.0.1.tgz", @@ -5103,7 +5095,6 @@ "integrity": "sha512-fcqpj/MyK4sxDPcbe7STNPbpQL4RLZOPWuaTmwZYuc+hJKzRf58yRxfhqGpc6PIq9ZyfSBpfHgmUHmHs0KwHwg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.60.0", "@typescript-eslint/types": "8.60.0", @@ -5615,7 +5606,6 @@ "resolved": "https://registry.npmjs.org/@upstash/redis/-/redis-1.38.0.tgz", "integrity": "sha512-wu+dZBptlLy0+MCUEoHmzrY/TnmgDey3+c7EbIGwrLqAvkP8yi5MWZHYGIFtAygmL4Bkz2TdFu+eU0vFPncIcg==", "license": "MIT", - "peer": true, "dependencies": { "uncrypto": "^0.1.3" } @@ -14629,7 +14619,6 @@ "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -15105,7 +15094,6 @@ "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz", "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==", "license": "MIT", - "peer": true, "funding": { "url": "https://github.com/sponsors/colinhacks" } diff --git a/src/app/(app)/dashboard/page.tsx b/src/app/(app)/dashboard/page.tsx index 85645bf..65aed1e 100644 --- a/src/app/(app)/dashboard/page.tsx +++ b/src/app/(app)/dashboard/page.tsx @@ -6,20 +6,39 @@ import LevelUpBanner from './level-up-banner'; import { redirect } from 'next/navigation'; import Link from 'next/link'; -// Component imports +// Existing dashboard components import StatsRow, { StatsSkeleton } from './stats-row'; import ActiveIssuesSection, { RecsSkeleton } from './active-issues'; import GitHubPRsWrapper, { PrsSkeleton } from './github-prs-wrapper'; import LeaderboardSnapshot, { LeaderboardSkeleton } from './leaderboard-snapshot'; import MenteesSection, { MenteesSkeleton } from './mentees-section'; +// New contributor-dashboard components +import { + ProfileSidebar, + ProfileSidebarSkeleton, +} from '@/components/contributor-dashboard/profile-sidebar'; +import JourneyProgress, { + JourneyProgressSkeleton, +} from '@/components/contributor-dashboard/journey-progress'; +import RecentActivity, { + RecentActivitySkeleton, +} from '@/components/contributor-dashboard/recent-activity'; +import HeatmapWrapper, { + HeatmapSkeleton, +} from '@/components/contributor-dashboard/heatmap-wrapper'; +import { DailyChallenge } from '@/components/contributor-dashboard/daily-challenge'; +import { CourseProgress } from '@/components/contributor-dashboard/course-progress'; +import { + RightSidebar, + RightSidebarSkeleton, +} from '@/components/contributor-dashboard/right-sidebar'; + export const dynamic = 'force-dynamic'; export default async function DashboardPage() { const sb = await getServerSupabase(); - if (!sb) { - return ; - } + if (!sb) return ; const { data: { user }, @@ -29,30 +48,32 @@ export default async function DashboardPage() { const service = getServiceSupabase(); if (!service) return ; - // Fetch only the profile info we need for the page shell header and subcomponents const { data: profile } = await service .from('profiles') .select('github_handle, xp, level, github_total_merges, github_streak, github_stats_synced_at') .eq('id', user.id) .maybeSingle(); + const xp = profile?.xp ?? 0; + const level = profile?.level ?? 0; + const githubHandle = profile?.github_handle ?? 'Contributor'; + return ( -
-
+
+
+ {/* Header */} -
+
-
+
01 / DASHBOARD
-

- Welcome back, {profile?.github_handle ?? 'Contributor'}. +

+ Welcome back, {githubHandle}.

-
- -
+
{/* Stats Row */} @@ -60,26 +81,61 @@ export default async function DashboardPage() { - {/* Main Columns */} -
- {/* Left Column */} -
+ {/* Three-column layout */} +
+ {/* ── Left Sidebar ── */} + }> + + + + {/* ── Center Feed ── */} +
+ {/* Journey progress */} + }> + + + + {/* Recent XP activity */} + }> + + + + {/* Active issues */} }> + {/* GitHub PRs */} + }> + + + + {/* Contribution heatmap */} + }> + + + + {/* Daily challenge */} + + + {/* Course progression */} + + + {/* Mentees */} }> -
+ - {/* Right Column */} -
- }> - + {/* ── Right Sidebar ── */} +
+ }> + + + {/* Leaderboard */} }> - +
@@ -106,7 +162,7 @@ export default async function DashboardPage() { function NotConfigured() { return ( -
+

Dashboard not configured

Auth isn't wired on this deployment yet.

diff --git a/src/app/[handle]/page.tsx b/src/app/[handle]/page.tsx index 55863f1..e933da5 100644 --- a/src/app/[handle]/page.tsx +++ b/src/app/[handle]/page.tsx @@ -129,10 +129,6 @@ async function loadProfileData(handle: string): Promise { if (!profile) return null; - const oneYearAgo = new Date(); - oneYearAgo.setDate(oneYearAgo.getDate() - 365); - oneYearAgo.setHours(0, 0, 0, 0); - // Fetch all data in parallel const [ prsResult, @@ -193,7 +189,6 @@ async function loadProfileData(handle: string): Promise { .from('xp_events') .select('created_at') .eq('user_id', profile.id) - .gte('created_at', oneYearAgo.toISOString()) .in('source', ['recommended_merge', 'unrecommended_merge', 'help_review']), ]); diff --git a/src/components/contributor-dashboard/course-progress.tsx b/src/components/contributor-dashboard/course-progress.tsx new file mode 100644 index 0000000..b18c761 --- /dev/null +++ b/src/components/contributor-dashboard/course-progress.tsx @@ -0,0 +1,65 @@ +import Link from 'next/link'; +import { CheckCircle2, Circle, ArrowRight } from 'lucide-react'; + +// Static curriculum — replace with DB query when a `course_progress` table exists +const STEPS = [ + { id: 1, title: 'Fork & clone a repository', done: true }, + { id: 2, title: 'Make your first commit', done: true }, + { id: 3, title: 'Open a pull request', done: false }, + { id: 4, title: 'Respond to review feedback', done: false }, + { id: 5, title: 'Get your PR merged', done: false }, +]; + +export function CourseProgress() { + const completedCount = STEPS.filter((s) => s.done).length; + const nextStep = STEPS.find((s) => !s.done); + + return ( +
+
+

+ CONTRIBUTOR CURRICULUM +

+ + {completedCount}/{STEPS.length} + +
+ +
+ {STEPS.map((step) => ( +
+ {step.done ? ( + + ) : ( + + )} + + {step.title} + + {!step.done && step.id === nextStep?.id && ( + + NEXT + + )} +
+ ))} +
+ + {nextStep && ( + + CONTINUE COURSE + + )} +
+ ); +} diff --git a/src/components/contributor-dashboard/daily-challenge.tsx b/src/components/contributor-dashboard/daily-challenge.tsx new file mode 100644 index 0000000..288749c --- /dev/null +++ b/src/components/contributor-dashboard/daily-challenge.tsx @@ -0,0 +1,78 @@ +'use client'; + +import { useEffect, useState } from 'react'; + +// Static challenge data — replace with a DB query when a `daily_challenges` table exists +const CHALLENGE = { + title: 'Comment on 2 open issues today', + description: 'Leave a helpful comment on any 2 open issues in the org.', + goal: 2, + current: 0, // TODO: wire to real progress when table exists + xpReward: 50, +}; + +function getSecondsUntilMidnightUTC(): number { + const now = new Date(); + const midnight = new Date( + Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() + 1), + ); + return Math.floor((midnight.getTime() - now.getTime()) / 1000); +} + +function formatCountdown(secs: number): string { + const h = Math.floor(secs / 3600) + .toString() + .padStart(2, '0'); + const m = Math.floor((secs % 3600) / 60) + .toString() + .padStart(2, '0'); + const s = (secs % 60).toString().padStart(2, '0'); + return `${h}:${m}:${s}`; +} + +export function DailyChallenge() { + const [secs, setSecs] = useState(getSecondsUntilMidnightUTC()); + + useEffect(() => { + const id = setInterval(() => { + setSecs((prev) => (prev <= 1 ? getSecondsUntilMidnightUTC() : prev - 1)); + }, 1000); + return () => clearInterval(id); + }, []); + + const pct = Math.min(100, Math.round((CHALLENGE.current / CHALLENGE.goal) * 100)); + const done = CHALLENGE.current >= CHALLENGE.goal; + + return ( +
+
+

DAILY CHALLENGE

+ + {done ? 'COMPLETE ✓' : formatCountdown(secs)} + +
+ +
+
{CHALLENGE.title}
+
{CHALLENGE.description}
+ + {/* Progress bar */} +
+
+
+ +
+ + {CHALLENGE.current} / {CHALLENGE.goal} DONE + + +{CHALLENGE.xpReward} XP +
+
+
+ ); +} diff --git a/src/components/contributor-dashboard/heatmap-wrapper.tsx b/src/components/contributor-dashboard/heatmap-wrapper.tsx new file mode 100644 index 0000000..05b6e84 --- /dev/null +++ b/src/components/contributor-dashboard/heatmap-wrapper.tsx @@ -0,0 +1,52 @@ +import { getServiceSupabase } from '@/lib/supabase/service'; +import { ActivityHeatmap } from '@/components/activity-heatmap'; + +export default async function HeatmapWrapper({ userId }: { userId: string }) { + const service = getServiceSupabase(); + if (!service) return null; + + // Only query xp_events for git-related activity (no double-counting) + const { data: xpEvents } = await service + .from('xp_events') + .select('created_at') + .eq('user_id', userId) + .in('source', ['recommended_merge', 'unrecommended_merge', 'help_review']); + + // Count activity per day — all time, no date filter + const countMap = new Map(); + for (const event of xpEvents ?? []) { + if (!event.created_at) continue; + const date = event.created_at.slice(0, 10); + countMap.set(date, (countMap.get(date) ?? 0) + 1); + } + + const activityHistory = Array.from(countMap.entries()).map(([date, count]) => ({ + date, + count, + })); + + const totalAllTime = activityHistory.reduce((sum, d) => sum + d.count, 0); + + return ( +
+
+ ALL-TIME CONTRIBUTIONS: {totalAllTime.toLocaleString()} +
+ +
+ ); +} + +export function HeatmapSkeleton() { + return ( +
+
+
+
+
+
+
+
+
+ ); +} diff --git a/src/components/contributor-dashboard/journey-progress.tsx b/src/components/contributor-dashboard/journey-progress.tsx new file mode 100644 index 0000000..c7a64dc --- /dev/null +++ b/src/components/contributor-dashboard/journey-progress.tsx @@ -0,0 +1,58 @@ +import { getServiceSupabase } from '@/lib/supabase/service'; +import { xpToNextLevel, xpForLevel } from '@/lib/xp/curve'; + +function levelProgressPct(xp: number, level: number): number { + const floor = xpForLevel(level); + const ceiling = xpForLevel(level + 1); + if (ceiling <= floor) return 100; + const pct = ((xp - floor) / (ceiling - floor)) * 100; + return Math.max(0, Math.min(100, pct)); +} + +export default async function JourneyProgress({ xp, level }: { xp: number; level: number }) { + const { needed, next } = xpToNextLevel(xp); + const nextLevel = next ?? level + 1; + const pct = Math.round(levelProgressPct(xp, level)); + + return ( +
+
+

+ L{level} → L{nextLevel} JOURNEY +

+ {pct}% +
+ + {/* Progress bar */} +
+
+
+ +
+ {xp.toLocaleString()} XP + + {needed.toLocaleString()} XP TO L{nextLevel} + +
+
+ ); +} + +export function JourneyProgressSkeleton() { + return ( +
+
+
+
+
+
+
+
+
+
+
+ ); +} diff --git a/src/components/contributor-dashboard/profile-sidebar.tsx b/src/components/contributor-dashboard/profile-sidebar.tsx new file mode 100644 index 0000000..443b40f --- /dev/null +++ b/src/components/contributor-dashboard/profile-sidebar.tsx @@ -0,0 +1,120 @@ +'use client'; + +import Link from 'next/link'; +import { Github, ExternalLink } from 'lucide-react'; + +type Props = { + githubHandle: string; + xp: number; + level: number; + trustScore?: number; +}; + +const LEVEL_TITLES: Record = { + 0: 'NEWCOMER', + 1: 'CONTRIBUTOR', + 2: 'CONTRIBUTOR', + 3: 'SENIOR CONTRIBUTOR', + 4: 'MAINTAINER', + 5: 'CORE MAINTAINER', +}; + +function getLevelTitle(level: number): string { + return LEVEL_TITLES[level] ?? 'CONTRIBUTOR'; +} + +export function ProfileSidebar({ githubHandle, xp, level, trustScore = 0 }: Props) { + const initials = githubHandle.slice(0, 2).toUpperCase(); + const title = getLevelTitle(level); + + return ( + + ); +} + +export function ProfileSidebarSkeleton() { + return ( + + ); +} diff --git a/src/components/contributor-dashboard/recent-activity.tsx b/src/components/contributor-dashboard/recent-activity.tsx new file mode 100644 index 0000000..26b3529 --- /dev/null +++ b/src/components/contributor-dashboard/recent-activity.tsx @@ -0,0 +1,111 @@ +import { getServiceSupabase } from '@/lib/supabase/service'; +import { TrendingUp } from 'lucide-react'; + +type XpEvent = { + id: string; + xp_delta: number; + source: string; + created_at: string; + metadata: Record | null; +}; + +function sourceLabel(source: string, metadata: Record | null): string { + switch (source) { + case 'pr_merged': + return metadata?.repo ? `PR merged in ${metadata.repo}` : 'Pull request merged'; + case 'issue_completed': + return 'Issue completed'; + case 'review': + return 'Code review submitted'; + case 'help_review': + return 'Helped a contributor'; + case 'course_completion': + return 'Course step completed'; + default: + return source.replace(/_/g, ' '); + } +} + +function timeAgo(iso: string): string { + const diffMs = Date.now() - new Date(iso).getTime(); + const mins = Math.floor(diffMs / 60_000); + if (mins < 1) return 'just now'; + if (mins < 60) return `${mins}m ago`; + const hrs = Math.floor(mins / 60); + if (hrs < 24) return `${hrs}h ago`; + return `${Math.floor(hrs / 24)}d ago`; +} + +export default async function RecentActivity({ userId }: { userId: string }) { + const service = getServiceSupabase(); + if (!service) return null; + + const { data: events } = await service + .from('xp_events') + .select('id, xp_delta, source, created_at, metadata') + .eq('user_id', userId) + .order('created_at', { ascending: false }) + .limit(6); + + const items = (events ?? []) as XpEvent[]; + + return ( +
+
+

RECENT ACTIVITY

+ +
+ + {items.length === 0 ? ( +
+ No activity yet — claim an issue to get started. +
+ ) : ( +
+ {items.map((event) => ( +
+
+
+ {sourceLabel(event.source, event.metadata)} +
+
+ {timeAgo(event.created_at)} +
+
+ = 0 ? 'text-[#10b981]' : 'text-red-400'}`} + > + {event.xp_delta >= 0 ? '+' : ''} + {event.xp_delta} XP + +
+ ))} +
+ )} +
+ ); +} + +export function RecentActivitySkeleton() { + return ( +
+
+
+
+
+ {[1, 2, 3, 4].map((i) => ( +
+
+
+
+
+
+
+ ))} +
+
+ ); +} diff --git a/src/components/contributor-dashboard/right-sidebar.tsx b/src/components/contributor-dashboard/right-sidebar.tsx new file mode 100644 index 0000000..c9618c6 --- /dev/null +++ b/src/components/contributor-dashboard/right-sidebar.tsx @@ -0,0 +1,113 @@ +import Link from 'next/link'; +import { ArrowRight, Calendar, Megaphone } from 'lucide-react'; + +// Static data — replace with DB queries when `mentor_sessions` and `announcements` tables exist +const NEXT_SESSION = { + mentor: 'priya.codes', + date: 'TBD', + time: '—', + note: 'No session scheduled yet.', +}; + +const ANNOUNCEMENTS = [ + { + id: 1, + title: "GSSoC '26 has started!", + body: 'Welcome to the program. Check your assigned issues and start contributing.', + date: 'Jun 2026', + }, + { + id: 2, + title: 'New repos added to MergeShip', + body: 'Three new repositories are now available for contributions.', + date: 'Jun 2026', + }, +]; + +export function RightSidebar() { + return ( + + ); +} + +export function RightSidebarSkeleton() { + return ( + + ); +} diff --git a/supabase/migrations/0012_flagged_accounts.sql b/supabase/migrations/0014_flagged_accounts.sql similarity index 100% rename from supabase/migrations/0012_flagged_accounts.sql rename to supabase/migrations/0014_flagged_accounts.sql diff --git a/supabase/migrations/0012_issues_fts.sql b/supabase/migrations/0015_issues_fts.sql similarity index 100% rename from supabase/migrations/0012_issues_fts.sql rename to supabase/migrations/0015_issues_fts.sql diff --git a/supabase/migrations/0012_maintainer_analytics_trends.sql b/supabase/migrations/0016_maintainer_analytics_trends.sql similarity index 100% rename from supabase/migrations/0012_maintainer_analytics_trends.sql rename to supabase/migrations/0016_maintainer_analytics_trends.sql diff --git a/supabase/migrations/0012_recommendation_feedback.sql b/supabase/migrations/0017_recommendation_feedback.sql similarity index 100% rename from supabase/migrations/0012_recommendation_feedback.sql rename to supabase/migrations/0017_recommendation_feedback.sql diff --git a/tsconfig.json b/tsconfig.json index a5be647..0b01aea 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,13 +15,23 @@ "moduleResolution": "bundler", "resolveJsonModule": true, "isolatedModules": true, - "jsx": "preserve", + "jsx": "react-jsx", "incremental": true, - "plugins": [{ "name": "next" }], + "plugins": [ + { + "name": "next" + } + ], "paths": { "@/*": ["./src/*"] } }, - "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], + "include": [ + "next-env.d.ts", + "**/*.ts", + "**/*.tsx", + ".next/types/**/*.ts", + ".next/dev/types/**/*.ts" + ], "exclude": ["node_modules", "dist", ".next", "supabase/migrations/**/*.sql"] }