chore(ui): migrate to Tailwind v4 utilities and apply formatting
This commit is contained in:
@@ -1,4 +1,10 @@
|
||||
import { createContext, useContext, useEffect, useState, type ReactNode } from "react";
|
||||
import {
|
||||
createContext,
|
||||
useContext,
|
||||
useEffect,
|
||||
useState,
|
||||
type ReactNode,
|
||||
} from "react";
|
||||
import { NavLink, Outlet } from "react-router-dom";
|
||||
import { cn } from "../ui/index.js";
|
||||
import { useSession } from "../lib/session.js";
|
||||
@@ -41,7 +47,11 @@ const ADMIN_NAV: NavItem[] = [
|
||||
{ to: "/admin/audit", label: "Journal", icon: ActivityIcon },
|
||||
];
|
||||
|
||||
const ACCOUNT_NAV: NavItem = { to: "/profile", label: "Mon compte", icon: SettingsIcon };
|
||||
const ACCOUNT_NAV: NavItem = {
|
||||
to: "/profile",
|
||||
label: "Mon compte",
|
||||
icon: SettingsIcon,
|
||||
};
|
||||
|
||||
const navClass = ({ isActive }: { isActive: boolean }) =>
|
||||
cn(
|
||||
@@ -78,7 +88,11 @@ export const AppShell = () => {
|
||||
const allNav = [...NAV, ...(isAdmin ? ADMIN_NAV : []), ACCOUNT_NAV];
|
||||
|
||||
const brand = (
|
||||
<NavLink to="/files" className="flex items-center gap-2" onClick={() => setMenuOpen(false)}>
|
||||
<NavLink
|
||||
to="/files"
|
||||
className="flex items-center gap-2"
|
||||
onClick={() => setMenuOpen(false)}
|
||||
>
|
||||
<img
|
||||
src="/icon.png"
|
||||
alt=""
|
||||
@@ -99,7 +113,12 @@ export const AppShell = () => {
|
||||
const renderLink = (item: NavItem) => {
|
||||
const Icon = item.icon;
|
||||
return (
|
||||
<NavLink key={item.to} to={item.to} className={navClass} onClick={() => setMenuOpen(false)}>
|
||||
<NavLink
|
||||
key={item.to}
|
||||
to={item.to}
|
||||
className={navClass}
|
||||
onClick={() => setMenuOpen(false)}
|
||||
>
|
||||
<Icon className="h-4 w-4" />
|
||||
{t(item.label)}
|
||||
</NavLink>
|
||||
@@ -107,7 +126,9 @@ export const AppShell = () => {
|
||||
};
|
||||
|
||||
return (
|
||||
<PageHeaderContext.Provider value={{ header: pageHeader, setHeader: setPageHeader }}>
|
||||
<PageHeaderContext.Provider
|
||||
value={{ header: pageHeader, setHeader: setPageHeader }}
|
||||
>
|
||||
<div className="relative grid h-dvh grid-cols-[auto_1fr] grid-rows-[auto_1fr] overflow-hidden bg-background">
|
||||
<ColorBendsBackdrop variant="shell" />
|
||||
|
||||
@@ -117,11 +138,17 @@ export const AppShell = () => {
|
||||
<button
|
||||
type="button"
|
||||
className="text-muted-foreground lg:hidden"
|
||||
aria-label={menuOpen ? t("Fermer le menu") : t("Ouvrir le menu")}
|
||||
aria-label={
|
||||
menuOpen ? t("Fermer le menu") : t("Ouvrir le menu")
|
||||
}
|
||||
aria-expanded={menuOpen}
|
||||
onClick={() => setMenuOpen((value) => !value)}
|
||||
>
|
||||
{menuOpen ? <CloseIcon className="h-5 w-5" /> : <MenuIcon className="h-5 w-5" />}
|
||||
{menuOpen ? (
|
||||
<CloseIcon className="h-5 w-5" />
|
||||
) : (
|
||||
<MenuIcon className="h-5 w-5" />
|
||||
)}
|
||||
</button>
|
||||
{brand}
|
||||
</div>
|
||||
@@ -149,7 +176,6 @@ export const AppShell = () => {
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</header>
|
||||
|
||||
<aside className="relative z-40 col-start-1 row-start-2 hidden w-60 flex-col gap-1 overflow-y-auto border-r border-border/50 bg-surface/70 p-3 backdrop-blur-md lg:flex">
|
||||
@@ -167,7 +193,11 @@ export const AppShell = () => {
|
||||
|
||||
{menuOpen ? (
|
||||
<div className="lg:hidden">
|
||||
<div className="fixed inset-0 z-40 bg-black/50 backdrop-blur-sm" onClick={() => setMenuOpen(false)} aria-hidden="true" />
|
||||
<div
|
||||
className="fixed inset-0 z-40 bg-black/50 backdrop-blur-sm"
|
||||
onClick={() => setMenuOpen(false)}
|
||||
aria-hidden="true"
|
||||
/>
|
||||
<nav className="fixed inset-0 z-50 flex flex-col bg-background/95 backdrop-blur-lg transition-transform duration-300 sm:absolute sm:inset-y-0 sm:left-0 sm:w-72 sm:inset-x-auto">
|
||||
<div className="flex items-center justify-between border-b border-border/50 px-4 py-3">
|
||||
{brand}
|
||||
@@ -190,8 +220,10 @@ export const AppShell = () => {
|
||||
<div className="relative z-10 col-start-2 row-start-2 min-h-0 overflow-hidden">
|
||||
<div className="h-full w-full bg-surface/30 backdrop-blur-lg">
|
||||
<div className="flex h-full flex-col">
|
||||
{pageHeader ? <div className="relative z-30 shrink-0">{pageHeader}</div> : null}
|
||||
<main className="min-h-0 flex-1 overflow-y-auto overflow-x-hidden px-4 pb-6 pt-4 [scrollbar-gutter:stable]">
|
||||
{pageHeader ? (
|
||||
<div className="relative z-30 shrink-0">{pageHeader}</div>
|
||||
) : null}
|
||||
<main className="min-h-0 flex-1 overflow-y-auto overflow-x-hidden px-4 pb-6 pt-4 scrollbar-gutter-stable">
|
||||
<Outlet />
|
||||
</main>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user