Skip to content

Redesign main app interface #10

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
macaddy2 merged 1 commit into from
Jul 28, 2026
Merged

Redesign main app interface #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 deletions src/components/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { useAuth } from '@/contexts/AuthContext'
import { usePoints } from '@/contexts/PointsContext'
import NotificationDropdown from '@/components/NotificationDropdown'
import { cn, getInitials, formatNumber } from '@/lib/utils'
import { isSupabaseConfigured } from '@/lib/supabase'
import fixarsMark from '@/assets/fixars-mark.png'

export default function Header() {
Expand Down Expand Up @@ -60,19 +61,19 @@ export default function Header() {

{/* Desktop Navigation */}
<nav className="hidden md:flex items-center gap-1">
{navLinks.map(({ path, label, icon: Icon }) => (
{navLinks.map((item) => (
<Link
key={path}
to={path}
key={item.path}
to={item.path}
className={cn(
"flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium transition-all duration-200",
location.pathname === path
location.pathname === item.path
? "bg-primary/10 text-primary"
: "text-muted hover:text-foreground hover:bg-muted/10"
)}
>
<Icon className="w-4 h-4" />
{label}
<item.icon className="w-4 h-4" />
{item.label}
</Link>
))}
</nav>
Expand Down Expand Up @@ -218,20 +219,20 @@ export default function Header() {
{/* Mobile Navigation */}
{mobileMenuOpen && (
<nav className="md:hidden py-4 border-t animate-fade-in">
{navLinks.map(({ path, label, icon: Icon }) => (
{navLinks.map((item) => (
<Link
key={path}
to={path}
key={item.path}
to={item.path}
onClick={() => setMobileMenuOpen(false)}
className={cn(
"flex items-center gap-3 px-4 py-3 rounded-lg text-sm font-medium transition-colors",
location.pathname === path
location.pathname === item.path
? "bg-primary/10 text-primary"
: "text-muted hover:text-foreground hover:bg-muted/10"
)}
>
<Icon className="w-5 h-5" />
{label}
<item.icon className="w-5 h-5" />
{item.label}
</Link>
))}
</nav>
Expand Down
19 changes: 10 additions & 9 deletions src/components/ui/button.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@ import { cva } from "class-variance-authority"
import { cn } from "@/lib/utils"

const buttonVariants = cva(
"inline-flex items-center justify-center whitespace-nowrap rounded-lg text-sm font-medium transition-all duration-200 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 cursor-pointer",
"inline-flex items-center justify-center whitespace-nowrap rounded-xl text-sm font-bold transition-all duration-200 focus-visible:outline-none focus-visible:ring-4 focus-visible:ring-ring/20 disabled:pointer-events-none disabled:opacity-50 cursor-pointer",
{
variants: {
variant: {
default: "bg-primary text-primary-foreground shadow-md hover:bg-primary/90 hover:shadow-lg hover:-translate-y-0.5",
default: "bg-primary text-primary-foreground shadow-[0_18px_42px_rgba(36,87,230,.18)] hover:bg-primary/95 hover:shadow-[0_24px_58px_rgba(36,87,230,.24)] hover:-translate-y-0.5",
destructive: "bg-destructive text-white shadow-md hover:bg-destructive/90",
outline: "border-2 border-primary bg-transparent text-primary hover:bg-primary/10",
secondary: "bg-muted/20 text-foreground hover:bg-muted/40",
ghost: "hover:bg-muted/20 hover:text-foreground",
outline: "border border-border bg-white/80 text-primary hover:bg-blue-50",
secondary: "bg-blue-50 text-foreground hover:bg-blue-100",
ghost: "hover:bg-blue-50 hover:text-primary",
link: "text-primary underline-offset-4 hover:underline",
vestden: "bg-vestden text-white shadow-md hover:bg-vestden/90",
conceptnexus: "bg-conceptnexus text-white shadow-md hover:bg-conceptnexus/90",
collaboard: "bg-collaboard text-white shadow-md hover:bg-collaboard/90",
skillscanvas: "bg-skillscanvas text-white shadow-md hover:bg-skillscanvas/90",
},
size: {
default: "h-10 px-5 py-2",
sm: "h-8 rounded-md px-3 text-xs",
lg: "h-12 rounded-xl px-8 text-base",
icon: "h-10 w-10 rounded-full",
default: "h-11 px-5 py-2",
sm: "h-9 rounded-lg px-3 text-xs",
lg: "h-12 rounded-2xl px-8 text-base",
icon: "h-10 w-10 rounded-xl",
},
},
defaultVariants: {
Expand All @@ -47,4 +47,5 @@ const Button = React.forwardRef(
)
Button.displayName = "Button"

// eslint-disable-next-line react-refresh/only-export-components
export { Button, buttonVariants }
2 changes: 1 addition & 1 deletion src/components/ui/card.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const Card = React.forwardRef(({ className, ...props }, ref) => (
<div
ref={ref}
className={cn(
"rounded-xl border bg-card text-card-foreground shadow-sm transition-all duration-300 hover:shadow-md",
"rounded-2xl border border-border/90 bg-white/90 text-card-foreground shadow-[0_10px_28px_rgba(21,50,120,.05)] transition-all duration-300 hover:shadow-[0_18px_46px_rgba(21,50,120,.08)]",
className
)}
{...props}
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/input.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const Input = React.forwardRef(({ className, type, ...props }, ref) => {
<input
type={type}
className={cn(
"flex h-11 w-full rounded-lg border border-input bg-card px-4 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 transition-all duration-200",
"flex h-12 w-full rounded-xl border border-input bg-white/90 px-4 py-2 text-sm font-medium ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted focus-visible:outline-none focus-visible:border-primary focus-visible:ring-4 focus-visible:ring-primary/15 disabled:cursor-not-allowed disabled:opacity-50 transition-all duration-200",
className
)}
ref={ref}
Expand Down
12 changes: 6 additions & 6 deletions src/components/ui/modal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,27 @@ export default function Modal({ open, onClose, title, subtitle, gradient = 'grad
role="dialog" aria-modal="true" aria-label={title}
>
<div
className="absolute inset-0 bg-black/50 backdrop-blur-sm animate-fade-in"
className="absolute inset-0 bg-[#0c1938]/60 backdrop-blur-sm animate-fade-in"
onClick={onClose}
/>
{/* Bottom-sheet on mobile, centered card on sm+ (v2 modal chrome) */}
<div className={`relative w-full ${maxWidth} sm:mx-4 animate-slide-in-up`}>
<Card className="shadow-2xl overflow-hidden rounded-b-none rounded-t-2xl sm:rounded-xl max-h-[90vh] sm:max-h-[85vh] flex flex-col">
<Card className="shadow-[0_38px_90px_rgba(10,22,40,.24)] overflow-hidden rounded-b-none rounded-t-3xl sm:rounded-3xl max-h-[90vh] sm:max-h-[85vh] flex flex-col">
<div className={`h-[3px] flex-shrink-0 ${gradient}`} />
<div className="flex items-start justify-between gap-4 px-6 pt-5 pb-2 flex-shrink-0">
<div className="flex items-start justify-between gap-4 px-6 pt-6 pb-3 flex-shrink-0 bg-white">
<div>
<h2 className="text-lg font-bold text-foreground">{title}</h2>
<h2 className="text-xl font-extrabold text-foreground tracking-[-0.02em]">{title}</h2>
{subtitle && <p className="text-sm text-muted mt-1">{subtitle}</p>}
</div>
<button
onClick={onClose}
aria-label="Close"
className="p-1 hover:bg-muted/10 rounded-md"
className="p-2 bg-blue-50 hover:bg-blue-100 rounded-full transition-colors"
>
<X className="w-5 h-5 text-muted" />
</button>
</div>
<CardContent className="pt-2 pb-6 overflow-y-auto">
<CardContent className="pt-2 pb-6 overflow-y-auto bg-[#f8faff]">
{children}
</CardContent>
</Card>
Expand Down
40 changes: 21 additions & 19 deletions src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
@import url("https://fonts.googleapis.com/css2?family=DM+Sans:wght@400;500;600;700;800&family=Manrope:wght@500;600;700;800&display=swap");
@import "tailwindcss";

@theme {
--font-sans: 'Inter', system-ui, -apple-system, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
--font-display: 'Space Grotesk', var(--font-sans);
--font-sans: 'DM Sans', system-ui, -apple-system, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
--font-display: 'Manrope', var(--font-sans);
--font-mono: 'JetBrains Mono', ui-monospace, monospace;

/* ===== Fixars Design System — Brand Core ===== */
Expand All @@ -12,13 +13,13 @@
--color-navy-600: #2A3C56;
--color-navy-500: #3E5271;

--color-primary: #2F45E0;
--color-primary: #2457E6;
--color-primary-foreground: #ffffff;
--color-blue-600: #2F45E0;
--color-blue-500: #4C63E6;
--color-blue-400: #7C8FF2;
--color-blue-100: #DCE1FA;
--color-blue-50: #EEF1FD;
--color-blue-600: #2457E6;
--color-blue-500: #376BF1;
--color-blue-400: #7EA0FF;
--color-blue-100: #DCE6FF;
--color-blue-50: #EEF4FF;

/* ===== Neutrals (ink) ===== */
--color-ink-900: #0A1628;
Expand All @@ -30,13 +31,13 @@
--color-ink-100: #EBEFF5;
--color-ink-50: #F5F7FB;

--color-background: #F9FAFC;
--color-background: #F7F9FF;
--color-foreground: #0A1628;
--color-paper: #FFFFFF;
--color-canvas: #F9FAFC;
--color-canvas: #F7F9FF;
--color-muted: #5A6B85;
--color-muted-foreground: #8695AE;
--color-border: #EBEFF5;
--color-border: #DDE6F7;
--color-input: #D7DDE8;
--color-ring: #2F45E0;

Expand Down Expand Up @@ -92,16 +93,17 @@
/* ===== Radius ===== */
--radius-xs: 4px;
--radius-sm: 6px;
--radius-md: 10px;
--radius-lg: 14px;
--radius-xl: 20px;
--radius-2xl: 28px;
--radius-md: 12px;
--radius-lg: 18px;
--radius-xl: 24px;
--radius-2xl: 32px;
--radius-full: 999px;

/* ===== Shadows & Elevation ===== */
--shadow-sm: 0 1px 3px rgba(10, 22, 40, 0.04), 0 1px 2px rgba(10, 22, 40, 0.02);
--shadow-md: 0 4px 14px rgba(10, 22, 40, 0.07), 0 1px 3px rgba(10, 22, 40, 0.04);
--shadow-lg: 0 14px 36px rgba(10, 22, 40, 0.12), 0 2px 8px rgba(10, 22, 40, 0.04);
--shadow-sm: 0 10px 28px rgba(21, 50, 120, 0.05), 0 1px 3px rgba(10, 22, 40, 0.03);
--shadow-md: 0 18px 46px rgba(21, 50, 120, 0.08), 0 3px 10px rgba(10, 22, 40, 0.04);
--shadow-lg: 0 28px 70px rgba(21, 50, 120, 0.14), 0 8px 24px rgba(10, 22, 40, 0.05);
--shadow-blue: 0 22px 55px rgba(36, 87, 230, 0.16);
}

/* Dark mode */
Expand Down Expand Up @@ -925,4 +927,4 @@ body {
.splash-stats .v{font-size:26px}
.float-card.fc1,.float-card.fc3{right:-12px}
.float-card.fc2{left:-12px}
}
}
Loading
Loading