test
This commit is contained in:
parent
fe5364c716
commit
49bbf77c04
@ -48,18 +48,18 @@ function App() {
|
|||||||
|
|
||||||
<NavBar />
|
<NavBar />
|
||||||
|
|
||||||
<SidebarInset className="flex min-h-svh flex-col overflow-hidden">
|
<SidebarInset className="flex h-svh flex-col overflow-hidden">
|
||||||
|
|
||||||
<MobileSidebarTrigger />
|
<MobileSidebarTrigger />
|
||||||
|
|
||||||
{/* Zone restante entre header et footer */}
|
{/* Zone restante entre header et footer */}
|
||||||
<main className="min-h-0 flex-1">
|
<main className="min-h-0 flex-1 overflow-hidden">
|
||||||
|
|
||||||
{/* Marges autour de la page */}
|
{/* Marges autour de la page */}
|
||||||
<div className="h-full w-full">
|
<div className="h-full w-full">
|
||||||
|
|
||||||
{/* SEULE zone scrollable */}
|
{/* SEULE zone scrollable */}
|
||||||
<div className="page-route h-full w-full overflow-y-auto overscroll-contain">
|
<div className="page-route h-full w-full overflow-hidden">
|
||||||
<Routes>
|
<Routes>
|
||||||
|
|
||||||
<Route
|
<Route
|
||||||
|
|||||||
@ -172,12 +172,12 @@ const AdminUsersPage = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card className="page-container page-layout admin-page flex h-full w-full">
|
<Card className="page-container page-layout admin-page h-full w-full">
|
||||||
<CardHeader className="border-b">
|
<CardHeader className="border-b">
|
||||||
<CardTitle>Gestion des comptes</CardTitle>
|
<CardTitle>Gestion des comptes</CardTitle>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
|
|
||||||
<CardContent>
|
<CardContent className="overflow-y-auto">
|
||||||
{error && (
|
{error && (
|
||||||
<Alert variant="destructive" className="mb-4">
|
<Alert variant="destructive" className="mb-4">
|
||||||
<AlertDescription>{error}</AlertDescription>
|
<AlertDescription>{error}</AlertDescription>
|
||||||
|
|||||||
@ -14,7 +14,7 @@ const HomePage = () => {
|
|||||||
<CardTitle>Profil Utilisateur</CardTitle>
|
<CardTitle>Profil Utilisateur</CardTitle>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
|
|
||||||
<CardContent>
|
<CardContent overflow-y-auto>
|
||||||
{user && (
|
{user && (
|
||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between">
|
||||||
|
|||||||
@ -31,7 +31,7 @@ const LoginPage = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="auth-page page-layout flex h-full w-full">
|
<div className="auth-page page-layout flex h-full w-full">
|
||||||
<Card className="flex h-full w-full">
|
<Card className="flex h-full min-h-0 w-full overflow-y-auto">
|
||||||
<CardHeader className="border-b">
|
<CardHeader className="border-b">
|
||||||
<CardTitle>Connexion</CardTitle>
|
<CardTitle>Connexion</CardTitle>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
|
|||||||
@ -78,7 +78,7 @@ const RegisterPage = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="auth-page page-layout">
|
<div className="auth-page page-layout">
|
||||||
<Card className="w-full max-w-md mx-auto">
|
<Card className="mx-auto w-full max-w-md overflow-y-auto">
|
||||||
<CardHeader className="border-b">
|
<CardHeader className="border-b">
|
||||||
<CardTitle>Créer un compte</CardTitle>
|
<CardTitle>Créer un compte</CardTitle>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
|
|||||||
@ -1587,7 +1587,7 @@ const TimeClockPage = () => {
|
|||||||
========================================================= */
|
========================================================= */
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card className="flex h-full w-full flex-col">
|
<Card className="flex h-full min-h-0 w-full flex-col">
|
||||||
|
|
||||||
<CardHeader className="border-b">
|
<CardHeader className="border-b">
|
||||||
<CardTitle>
|
<CardTitle>
|
||||||
@ -2145,7 +2145,7 @@ const TimeClockPage = () => {
|
|||||||
|
|
||||||
<div className="flex min-w-0 flex-col lg:h-full">
|
<div className="flex min-w-0 flex-col lg:h-full">
|
||||||
|
|
||||||
<Card className="flex h-full flex-col">
|
<Card className="flex h-full flex-col overflow-y-auto">
|
||||||
|
|
||||||
<CardHeader className="border-b">
|
<CardHeader className="border-b">
|
||||||
<CardTitle>
|
<CardTitle>
|
||||||
@ -2158,7 +2158,7 @@ const TimeClockPage = () => {
|
|||||||
</CardHeader>
|
</CardHeader>
|
||||||
|
|
||||||
|
|
||||||
<CardContent className="flex-1">
|
<CardContent className="flex-1 overflow-y-auto">
|
||||||
|
|
||||||
{loading ? (
|
{loading ? (
|
||||||
<p>
|
<p>
|
||||||
|
|||||||
@ -1137,7 +1137,7 @@ const WeeklySummaryPage = ({ userId }) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Card
|
<Card
|
||||||
className={`flex h-full w-full weekly-schedule page-layout${
|
className={`flex h-full min-h-0 w-full weekly-schedule page-layout${
|
||||||
isAdmin
|
isAdmin
|
||||||
? ' multi-user-schedule'
|
? ' multi-user-schedule'
|
||||||
: ''
|
: ''
|
||||||
@ -1267,9 +1267,7 @@ const WeeklySummaryPage = ({ userId }) => {
|
|||||||
<CardContent>
|
<CardContent>
|
||||||
{/* Sélection utilisateur */}
|
{/* Sélection utilisateur */}
|
||||||
{isAdmin && (
|
{isAdmin && (
|
||||||
<Card className="mb-4">
|
<div className="flex flex-col gap-3 pb-4 md:flex-row md:items-center">
|
||||||
<CardContent className="space-y-4 pt-0">
|
|
||||||
<div className="flex flex-col gap-3 md:flex-row md:items-center">
|
|
||||||
<div className="flex min-w-0 flex-1 items-center gap-2">
|
<div className="flex min-w-0 flex-1 items-center gap-2">
|
||||||
<label
|
<label
|
||||||
htmlFor="weekly-selected-user"
|
htmlFor="weekly-selected-user"
|
||||||
@ -1337,8 +1335,6 @@ const WeeklySummaryPage = ({ userId }) => {
|
|||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Légende */}
|
{/* Légende */}
|
||||||
@ -1385,7 +1381,7 @@ const WeeklySummaryPage = ({ userId }) => {
|
|||||||
|
|
||||||
<div
|
<div
|
||||||
ref={scheduleTableRef}
|
ref={scheduleTableRef}
|
||||||
className="relative overflow-x-auto overflow-y-hidden rounded-lg border"
|
className="relative overflow-x-auto overflow-y-auto rounded-lg border"
|
||||||
style={{
|
style={{
|
||||||
height: `${totalPlanningHeight}px`,
|
height: `${totalPlanningHeight}px`,
|
||||||
}}
|
}}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user