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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,6 @@ yarn-error.log*
*.tsbuildinfo
next-env.d.ts

docs/
docs/
.agents
skills-lock.json
4 changes: 2 additions & 2 deletions src/app/connect-accounts/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Link from "next/link";
import { IntegrationAccountsPanel } from "../../components/accounts/integration-accounts-panel";
import { AppLogo } from "@/components/ui/app-logo";
import { IntegrationAccountsPanel } from "@/features/integrations/components/integration-accounts-panel";
import { AppLogo } from "@/shared/components/app-logo";

export default function ConnectAccountsPage() {
return (
Expand Down
105 changes: 18 additions & 87 deletions src/app/dashboard/page.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
"use client";

import { useCallback, useEffect, useState } from "react";
import {
FiAlertCircle,
FiCheckCircle,
FiClock,
FiRefreshCw,
} from "react-icons/fi";
import { IntegrationAccountsPanel } from "../../components/accounts/integration-accounts-panel";
import { AuthenticatedLayout } from "../../components/app-shell/authenticated-layout";
import { ActivityList } from "../../components/dashboard-overview/activity-list";
import { ContributionChart } from "../../components/dashboard-overview/contribution-chart";
import { MetricCard } from "../../components/dashboard-overview/metric-card";
import { RepositoryTable } from "../../components/dashboard-overview/repository-table";
import { readApiJson } from "../../lib/api/response";
import { notify } from "../../lib/notifications/toast";
import { createSupabaseBrowserClient, isSupabaseConfigured } from "../../lib/supabase/client";
import { FiRefreshCw } from "react-icons/fi";
import { IntegrationAccountsPanel } from "@/features/integrations/components/integration-accounts-panel";
import { AuthenticatedLayout } from "@/shared/app-shell/authenticated-layout";
import { ActivityList } from "@/features/dashboard/components/activity-list";
import { ContributionChart } from "@/features/dashboard/components/contribution-chart";
import { MetricCard } from "@/features/dashboard/components/metric-card";
import { RepositoryTable } from "@/features/dashboard/components/repository-table";
import { readApiJson } from "@/lib/api/response";
import { notify } from "@/lib/notifications/toast";
import { createSupabaseBrowserClient, isSupabaseConfigured } from "@/lib/supabase/client";
import {
DashboardOverview,
DashboardSyncStatus,
} from "../../types/dashboard";
import { KeepGoingCard } from "../../components/dashboard-overview/keep-going-card";
} from "@/types/dashboard";
import { KeepGoingCard } from "@/features/dashboard/components/keep-going-card";

export default function DashboardPage() {
const [overview, setOverview] = useState<DashboardOverview | null>(null);
Expand Down Expand Up @@ -120,18 +115,21 @@ export default function DashboardPage() {
<AuthenticatedLayout
title={"Good to see you again, " + viewerName}
description="Here is your connected GitHub and GitLab activity overview."
actions={
syncStatus={syncStatus}
syncProviders={overview?.connectedProviders ?? []}
syncActions={
<button
type="button"
onClick={() => loadOverview({ refresh: true })}
disabled={isRefreshing}
className="hidden sm:inline-flex h-10 items-center gap-2 rounded-md border border-gray-200 px-3 text-sm font-bold text-muted-foreground transition hover:border-primary hover:text-primary disabled:cursor-not-allowed disabled:opacity-60 dark:border-gray-800"
className="inline-flex min-h-[52px] items-center justify-center gap-2 px-3 text-sm font-bold text-muted-foreground transition hover:bg-gray-50 hover:text-primary disabled:cursor-not-allowed cursor-pointer disabled:opacity-60 dark:hover:bg-gray-900/70 min-[420px]:px-4"
aria-label="Refresh dashboard data"
>
<FiRefreshCw
className={"size-4 " + (isRefreshing ? "animate-spin" : "")}
aria-hidden
/>
Refresh
<span className="hidden min-[420px]:inline">Refresh</span>
</button>
}
>
Expand All @@ -141,8 +139,6 @@ export default function DashboardPage() {

{!isLoading && overview?.hasConnections && (
<>
<SyncStatusPanel sync={syncStatus} />

<div className="mt-6 space-y-5">
<KeepGoingCard
activeDays={activeDays}
Expand Down Expand Up @@ -192,71 +188,6 @@ function getCurrentStreak(days: DashboardOverview["dailyContributions"]) {
return firstInactiveIndex === -1 ? activeDays.length : firstInactiveIndex;
}

function SyncStatusPanel({ sync }: { sync: DashboardSyncStatus | null }) {
if (!sync || sync.status === "idle") {
return null;
}

const isSyncing = sync.status === "syncing";
const isSynced = sync.status === "synced";
const Icon = isSyncing
? FiClock
: isSynced
? FiCheckCircle
: FiAlertCircle;

const title = isSyncing
? "Syncing provider data"
: isSynced
? "100% synced"
: "Last sync failed";

const detail = isSyncing
? sync.startedAt
? "Started " + formatSyncDate(sync.startedAt)
: "Sync in progress"
: isSynced
? sync.finishedAt
? "Finished " + formatSyncDate(sync.finishedAt)
: "Completed"
: sync.errorMessage || "Unable to finish the last sync.";

return (
<section className="rounded-lg border border-gray-200 bg-card px-4 py-3 shadow-sm dark:border-gray-800">
<div className="flex min-w-0 items-center justify-between gap-4">
<div className="flex min-w-0 items-center gap-3">
<span className="inline-flex size-9 shrink-0 items-center justify-center rounded-md bg-primary/10 text-primary">
<Icon
className={"size-4 " + (isSyncing ? "animate-pulse" : "")}
aria-hidden
/>
</span>
<div className="min-w-0">
<p className="truncate text-sm font-extrabold text-foreground">
{title}
</p>
<p className="truncate text-xs font-medium text-muted-foreground">
{detail}
</p>
</div>
</div>
{sync.progressPercent === 100 && (
<span className="shrink-0 rounded-md border border-primary/20 px-2 py-1 text-xs font-extrabold text-primary">
100%
</span>
)}
</div>
</section>
);
}

function formatSyncDate(value: string) {
return new Intl.DateTimeFormat(undefined, {
dateStyle: "medium",
timeStyle: "short",
}).format(new Date(value));
}

function DashboardLoading() {
return (
<div className="grid gap-4 sm:grid-cols-2 xl:grid-cols-4">
Expand Down
4 changes: 2 additions & 2 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Analytics } from "@vercel/analytics/react";
import type { Metadata } from "next";
import { ThemeProvider } from "next-themes";
import { ToastProvider } from "../components/notifications/toast-provider";
import { ToastProvider } from "@/shared/components/toast-provider";
import { Manrope, Noto_Color_Emoji } from "next/font/google";
import "./globals.css";

Expand Down Expand Up @@ -29,7 +29,7 @@ export default function RootLayout({children}: Readonly<{children: React.ReactNo
return (
<html lang="en" suppressHydrationWarning>
<body className={`${manrope.variable} ${notoColorEmoji.variable} antialiased`}>
<ThemeProvider attribute="class" defaultTheme="system" enableSystem={true}>
<ThemeProvider attribute="class" forcedTheme="dark" defaultTheme="dark" enableSystem={false}>
<ToastProvider>
{children}
<Analytics />
Expand Down
2 changes: 1 addition & 1 deletion src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LandingPage } from "../components/landing/landing-page";
import { LandingPage } from "@/features/landing/components/landing-page";

export default function Home() {
return <LandingPage />;
Expand Down
4 changes: 2 additions & 2 deletions src/app/settings/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AuthenticatedLayout } from "../../components/app-shell/authenticated-layout";
import { SettingsForm } from "../../components/settings/settings-form";
import { AuthenticatedLayout } from "@/shared/app-shell/authenticated-layout";
import { SettingsForm } from "@/features/settings/components/settings-form";

export default function SettingsPage() {
return (
Expand Down
4 changes: 2 additions & 2 deletions src/app/sign-in/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AuthForm } from "../../components/auth/auth-form";
import { AuthLayout } from "../../components/auth/auth-layout";
import { AuthForm } from "@/features/auth/components/auth-form";
import { AuthLayout } from "@/features/auth/components/auth-layout";

export default function SignInPage() {
return (
Expand Down
4 changes: 2 additions & 2 deletions src/app/sign-up/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AuthForm } from "../../components/auth/auth-form";
import { AuthLayout } from "../../components/auth/auth-layout";
import { AuthForm } from "@/features/auth/components/auth-form";
import { AuthLayout } from "@/features/auth/components/auth-layout";

export default function SignUpPage() {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import Link from "next/link";
import { useRouter } from "next/navigation";
import { ChangeEvent, FormEvent, useState } from "react";
import { createSupabaseBrowserClient, isSupabaseConfigured } from "../../lib/supabase/client";
import { uploadUserAvatar } from "../../lib/supabase/avatar";
import { createSupabaseBrowserClient, isSupabaseConfigured } from "@/lib/supabase/client";
import { uploadUserAvatar } from "@/lib/supabase/avatar";

type AuthMode = "sign-in" | "sign-up";

Expand Down Expand Up @@ -162,7 +162,7 @@ export function AuthForm({ mode }: AuthFormProps) {
<button
type="submit"
disabled={isSubmitting}
className="flex h-11 w-full items-center justify-center rounded-md bg-primary px-4 text-sm font-extrabold text-white transition hover:bg-primary-dark focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary disabled:cursor-not-allowed disabled:opacity-70"
className="flex h-11 w-full items-center justify-center cursor-pointer rounded-md bg-primary px-4 text-sm font-extrabold text-white transition hover:bg-primary-dark focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary disabled:cursor-not-allowed disabled:opacity-70"
>
{isSubmitting ? "Processing..." : isSignUp ? "Create account" : "Sign in"}
</button>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Link from "next/link";
import { ReactNode } from "react";
import { AppLogo } from "../ui/app-logo";
import { AppLogo } from "@/shared/components/app-logo";

type AuthLayoutProps = {
title: string;
Expand All @@ -14,16 +14,16 @@ export function AuthLayout({ title, description, children }: AuthLayoutProps) {
<div className="mx-auto flex min-h-[calc(100vh-3rem)] w-full max-w-6xl items-center justify-center">
<section className="grid w-full overflow-hidden rounded-lg border border-gray-200 bg-card shadow-sm dark:border-gray-800 lg:grid-cols-[0.9fr_1.1fr]">
<div className="relative hidden bg-[#060d1c] p-10 text-white lg:block">
<div className="absolute inset-0 bg-[radial-gradient(circle_at_20%_20%,rgba(139,92,246,0.28),transparent_32%),radial-gradient(circle_at_80%_70%,rgba(16,185,129,0.18),transparent_30%)]" />
<div className="absolute inset-0 bg-[radial-gradient(circle_at_20%_20%,rgba(139,92,246,0.28),transparent_32%),radial-gradient(circle_at_80%_70%,rgba(139,92,246,0.28),transparent_30%)]" />
<div className="relative flex h-full flex-col justify-between">
<Link href="/" className="flex items-center gap-3 text-lg font-extrabold">
<span className="grid size-9 place-items-center border border-emerald-400/40 text-emerald-300">
<span className="grid size-9 place-items-center">
<AppLogo className="size-5" aria-hidden/>
</span>
Git Fusion
</Link>
<div>
<p className="text-sm font-bold uppercase tracking-[0.22em] text-emerald-300">One graph. All your code.</p>
<p className="text-sm font-bold uppercase tracking-[0.22em] text-primary">One graph. All your code.</p>
<h1 className="mt-4 text-4xl font-extrabold leading-tight">Unify GitHub and GitLab activity in minutes.</h1>
<p className="mt-4 max-w-md text-sm leading-7 text-slate-300">
Create a Git Fusion account with email and password. Provider connections stay separate from app authentication.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FaGithub, FaGitlab } from "react-icons/fa";
import { ActivityItem } from "../../types/mock-app";
import { ActivityItem } from "@/types/mock-app";

export function ActivityList({ activities }: { activities: ActivityItem[] }) {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { SVGAttributes } from "react";
import CalendarHeatmap, { ReactCalendarHeatmapValue } from "react-calendar-heatmap";
import "react-calendar-heatmap/dist/styles.css";
import { Tooltip } from "react-tooltip";
import { DailyContribution } from "../../types/mock-app";
import { DailyContribution } from "@/types/mock-app";

type CalendarContribution = ReactCalendarHeatmapValue<Date> & Omit<DailyContribution, "date">;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DashboardMetric } from "../../types/mock-app";
import { DashboardMetric } from "@/types/mock-app";

export function MetricCard({ metric }: { metric: DashboardMetric }) {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FaGithub, FaGitlab } from "react-icons/fa";
import { RepositorySummary } from "../../types/mock-app";
import { RepositorySummary } from "@/types/mock-app";

export function RepositoryTable({ repositories }: { repositories: RepositorySummary[] }) {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use client";

import { FaGithub, FaGitlab } from "react-icons/fa";
import { ConnectedAccount } from "../../types/mock-app";
import { ConnectedAccount } from "@/types/mock-app";

type AccountConnectionCardProps = {
account: ConnectedAccount;
Expand Down Expand Up @@ -39,7 +39,7 @@ export function AccountConnectionCard({ account, onConnect, onDisconnect, compac
: onConnect(account.provider)
}
disabled={isConnecting}
className={`w-full rounded-md px-3 py-2 text-sm font-extrabold text-white transition disabled:cursor-not-allowed disabled:opacity-60 sm:w-auto ${
className={`w-full rounded-md px-3 py-2 text-sm font-extrabold text-white transition cursor-pointer disabled:cursor-not-allowed disabled:opacity-60 sm:w-auto ${
isConnected
? "bg-rose-500 hover:bg-rose-600"
: "bg-emerald-500 hover:bg-emerald-600"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import Link from "next/link";
import { useCallback, useEffect, useState } from "react";
import { readApiJson } from "../../lib/api/response";
import { notify } from "../../lib/notifications/toast";
import { createSupabaseBrowserClient, isSupabaseConfigured } from "../../lib/supabase/client";
import { AccountProvider, ConnectedAccount } from "../../types/mock-app";
import { readApiJson } from "@/lib/api/response";
import { notify } from "@/lib/notifications/toast";
import { createSupabaseBrowserClient, isSupabaseConfigured } from "@/lib/supabase/client";
import { AccountProvider, ConnectedAccount } from "@/types/mock-app";
import { AccountConnectionCard } from "./account-connection-card";
import { TbLayoutDashboard } from "react-icons/tb";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Image from "next/image";
import { FaGithub, FaGitlab } from "react-icons/fa6";
import { FiGitPullRequest, FiGrid, FiRefreshCw, FiSettings } from "react-icons/fi";
import { AppLogo } from "../ui/app-logo";
import { AppLogo } from "@/shared/components/app-logo";

const metrics = [
{ label: "Total contributions", value: "2,482", helper: "GitHub 1,420 · GitLab 1,062", trend: "312 active days" },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Link from "next/link";
import { FiLogOut } from "react-icons/fi";
import type { LandingSessionUser } from "./landing-page";
import { AppLogo } from "../ui/app-logo";
import { AppLogo } from "@/shared/components/app-logo";

type LandingNavbarProps = {
user: LandingSessionUser | null;
Expand Down Expand Up @@ -46,7 +46,7 @@ export function LandingNavbar({ user, isCheckingSession, onSignOut }: LandingNav
<>
<Link
href="/dashboard"
className="flex min-w-0 items-center gap-2 rounded-md bg-slate-950/35 py-1.5 text-sm font-extrabold text-white transition"
className="flex min-w-0 items-center gap-2 rounded-md py-1.5 text-sm font-extrabold text-white transition"
aria-label={`Open dashboard for ${user.name}`}
>
<span
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { HeroContent } from "./hero-content";
import { HeroHighlights } from "./hero-highlights";
import { HeroIllustration } from "./hero-illustration";
import { LandingNavbar } from "./landing-navbar";
import { createSupabaseBrowserClient, isSupabaseConfigured } from "../../lib/supabase/client";
import { createSupabaseBrowserClient, isSupabaseConfigured } from "@/lib/supabase/client";

export type LandingSessionUser = {
name: string;
Expand Down Expand Up @@ -72,9 +72,6 @@ export function LandingPage() {

return (
<main className="relative min-h-screen w-screen overflow-hidden bg-background text-white">
<div className="pointer-events-none absolute inset-0 bg-[linear-gradient(90deg,rgba(6,13,28,0.97)_0%,rgba(6,13,28,0.7)_50%,rgba(6,13,28,0.96)_100%)]" aria-hidden />
<div className="pointer-events-none absolute inset-x-0 top-0 h-px bg-gradient-to-r from-transparent via-emerald-400/50 to-transparent" aria-hidden />

<div className="relative z-10 mx-auto flex min-h-screen max-w-[90rem] flex-col">
<LandingNavbar user={user} isCheckingSession={isCheckingSession} onSignOut={handleSignOut} />

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
"use client";

import { ChangeEvent, FormEvent, useEffect, useMemo, useState } from "react";
import { IntegrationAccountsPanel } from "../accounts/integration-accounts-panel";
import { notify } from "../../lib/notifications/toast";
import { uploadUserAvatar } from "../../lib/supabase/avatar";
import { createSupabaseBrowserClient, isSupabaseConfigured } from "../../lib/supabase/client";
import { IntegrationAccountsPanel } from "@/features/integrations/components/integration-accounts-panel";
import { notify } from "@/lib/notifications/toast";
import { uploadUserAvatar } from "@/lib/supabase/avatar";
import { createSupabaseBrowserClient, isSupabaseConfigured } from "@/lib/supabase/client";

type ProfileFormState = {
name: string;
Expand Down Expand Up @@ -202,7 +202,7 @@ export function SettingsForm() {
</section>

<div className="flex flex-col gap-3 sm:flex-row sm:items-center">
<button type="submit" disabled={isSaving || isLoading} className="h-11 rounded-md bg-primary px-5 text-sm font-extrabold text-white transition hover:bg-primary-dark disabled:cursor-not-allowed disabled:opacity-60">
<button type="submit" disabled={isSaving || isLoading} className="h-11 rounded-md bg-primary px-5 text-sm font-extrabold text-white transition hover:bg-primary-dark cursor-pointer disabled:cursor-not-allowed disabled:opacity-60">
{isSaving ? "Saving..." : "Save settings"}
</button>
</div>
Expand Down
Loading
Loading