From 5fcedfa28b5db891681ad5bae30552607dca924a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MARQUET?= Date: Thu, 20 Nov 2025 18:40:57 +0100 Subject: [PATCH 1/5] fix: Corriger les chemins d'importation pour les composants et ajuster la configuration TypeScript --- app/admin/import-users/page.tsx | 10 +++++----- components/mode-toggle.tsx | 4 ++-- components/ui/checkbox.tsx | 2 +- components/ui/select.tsx | 2 +- tsconfig.json | 17 +++++++++++++---- 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/app/admin/import-users/page.tsx b/app/admin/import-users/page.tsx index 99d72cb..9f2415c 100644 --- a/app/admin/import-users/page.tsx +++ b/app/admin/import-users/page.tsx @@ -1,11 +1,11 @@ 'use client'; import { useState } from 'react'; -import { Button } from '@/components/ui/button'; -import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'; -import { Input } from '@/components/ui/input'; -import { Label } from '@/components/ui/label'; -import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from '@/components/ui/dialog'; +import { Button } from '../../../components/ui/button'; +import { Card, CardContent, CardHeader, CardTitle } from '../../../components/ui/card'; +import { Input } from '../../../components/ui/input'; +import { Label } from '../../../components/ui/label'; +import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from '../../../components/ui/dialog'; import { toast } from 'sonner'; interface ParsedUser { diff --git a/components/mode-toggle.tsx b/components/mode-toggle.tsx index ba9be82..563e230 100644 --- a/components/mode-toggle.tsx +++ b/components/mode-toggle.tsx @@ -4,12 +4,12 @@ import * as React from "react" import { Moon, Sun, Laptop } from "lucide-react" import { useTheme } from "next-themes" -import { Button } from "@/components/ui/button" +import { Button } from "./ui/button" import { Popover, PopoverContent, PopoverTrigger, -} from "@/components/ui/popover" +} from "./ui/popover" export function ModeToggle() { const { setTheme, theme } = useTheme() diff --git a/components/ui/checkbox.tsx b/components/ui/checkbox.tsx index cb0b07b..69e9115 100644 --- a/components/ui/checkbox.tsx +++ b/components/ui/checkbox.tsx @@ -4,7 +4,7 @@ import * as React from "react" import * as CheckboxPrimitive from "@radix-ui/react-checkbox" import { CheckIcon } from "lucide-react" -import { cn } from "@/lib/utils" +import { cn } from "../../lib/utils" function Checkbox({ className, diff --git a/components/ui/select.tsx b/components/ui/select.tsx index 25e5439..85a1b0d 100644 --- a/components/ui/select.tsx +++ b/components/ui/select.tsx @@ -4,7 +4,7 @@ import * as React from "react" import * as SelectPrimitive from "@radix-ui/react-select" import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react" -import { cn } from "@/lib/utils" +import { cn } from "../../lib/utils" function Select({ ...props diff --git a/tsconfig.json b/tsconfig.json index 019b353..64bd90f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,11 @@ { "compilerOptions": { "target": "ES2017", - "lib": ["dom", "dom.iterable", "esnext"], + "lib": [ + "dom", + "dom.iterable", + "esnext" + ], "allowJs": true, "skipLibCheck": true, "strict": true, @@ -19,7 +23,9 @@ } ], "paths": { - "@/*": ["./*"] + "@/*": [ + "./*" + ] } }, "include": [ @@ -28,7 +34,10 @@ "**/*.tsx", ".next/types/**/*.ts", ".next\\dev/types/**/*.ts", - ".next\\dev/types/**/*.ts" + ".next\\dev/types/**/*.ts", + ".next/dev/types/**/*.ts" ], - "exclude": ["node_modules"] + "exclude": [ + "node_modules" + ] } From fffb48c53d7eb6a48612129cb1826733cc40bb6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Nov 2025 17:43:24 +0000 Subject: [PATCH 2/5] build(deps): bump next-auth from 4.24.11 to 4.24.12 Bumps [next-auth](https://github.com/nextauthjs/next-auth) from 4.24.11 to 4.24.12. - [Release notes](https://github.com/nextauthjs/next-auth/releases) - [Commits](https://github.com/nextauthjs/next-auth/compare/next-auth@4.24.11...next-auth@4.24.12) --- updated-dependencies: - dependency-name: next-auth dependency-version: 4.24.12 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package.json | 2 +- pnpm-lock.yaml | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index c2d21fb..45e1210 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "lucide-react": "^0.546.0", "mime-types": "^3.0.1", "next": "16.0.0", - "next-auth": "^4.24.11", + "next-auth": "^4.24.12", "next-themes": "^0.4.6", "prisma": "6.17.1", "react": "19.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1bc8202..ffd6795 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -70,8 +70,8 @@ importers: specifier: 16.0.0 version: 16.0.0(react-dom@19.2.0(react@19.2.0))(react@19.2.0) next-auth: - specifier: ^4.24.11 - version: 4.24.11(next@16.0.0(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(react-dom@19.2.0(react@19.2.0))(react@19.2.0) + specifier: ^4.24.12 + version: 4.24.12(next@16.0.0(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(react-dom@19.2.0(react@19.2.0))(react@19.2.0) next-themes: specifier: ^0.4.6 version: 0.4.6(react-dom@19.2.0(react@19.2.0))(react@19.2.0) @@ -1673,12 +1673,12 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - next-auth@4.24.11: - resolution: {integrity: sha512-pCFXzIDQX7xmHFs4KVH4luCjaCbuPRtZ9oBUjUhOk84mZ9WVPf94n87TxYI4rSRf9HmfHEF8Yep3JrYDVOo3Cw==} + next-auth@4.24.12: + resolution: {integrity: sha512-wooJAL5Md9Fn2UwUI2qN9TY/+k8HJGRyi3TdSt/xHfDTtdpPxDqmo4v8hUrKGb+d66FB/rYy9RutA/9EeJrK0Q==} peerDependencies: '@auth/core': 0.34.2 - next: ^12.2.5 || ^13 || ^14 || ^15 - nodemailer: ^6.6.5 + next: ^12.2.5 || ^13 || ^14 || ^15 || ^16 + nodemailer: ^7.0.7 react: ^17.0.2 || ^18 || ^19 react-dom: ^17.0.2 || ^18 || ^19 peerDependenciesMeta: @@ -1752,8 +1752,8 @@ packages: ohash@2.0.11: resolution: {integrity: sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==} - oidc-token-hash@5.1.1: - resolution: {integrity: sha512-D7EmwxJV6DsEB6vOFLrBM2OzsVgQzgPWyHlV2OOAVj772n+WTXpudC9e9u5BVKQnYwaD30Ivhi9b+4UeBcGu9g==} + oidc-token-hash@5.2.0: + resolution: {integrity: sha512-6gj2m8cJZ+iSW8bm0FXdGF0YhIQbKrfP4yWTNzxc31U6MOjfEmB1rHvlYvxI1B7t7BCi1F2vYTT6YhtQRG4hxw==} engines: {node: ^10.13.0 || >=12.0.0} once@1.4.0: @@ -3714,7 +3714,7 @@ snapshots: nanoid@3.3.11: {} - next-auth@4.24.11(next@16.0.0(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(react-dom@19.2.0(react@19.2.0))(react@19.2.0): + next-auth@4.24.12(next@16.0.0(react-dom@19.2.0(react@19.2.0))(react@19.2.0))(react-dom@19.2.0(react@19.2.0))(react@19.2.0): dependencies: '@babel/runtime': 7.28.4 '@panva/hkdf': 1.2.1 @@ -3785,7 +3785,7 @@ snapshots: ohash@2.0.11: {} - oidc-token-hash@5.1.1: {} + oidc-token-hash@5.2.0: {} once@1.4.0: dependencies: @@ -3800,7 +3800,7 @@ snapshots: jose: 4.15.9 lru-cache: 6.0.0 object-hash: 2.2.0 - oidc-token-hash: 5.1.1 + oidc-token-hash: 5.2.0 ospath@1.2.2: {} From c1fdcf36807f85af2962b2b8e80a223372c6b96a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MARQUET?= Date: Thu, 20 Nov 2025 18:48:58 +0100 Subject: [PATCH 3/5] fix: Corriger les chemins d'importation pour les modules dans les fichiers Dockerfile et route.ts --- Dockerfile | 2 +- app/api/change-password/route.ts | 4 ++-- app/api/import-users/route.ts | 4 ++-- app/change-password/page.tsx | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 934e80a..ac76000 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:25-alpine +FROM node:24-alpine WORKDIR /app COPY package*.json ./ COPY pnpm-lock.yaml ./ diff --git a/app/api/change-password/route.ts b/app/api/change-password/route.ts index 5af5bf8..bb6ae68 100644 --- a/app/api/change-password/route.ts +++ b/app/api/change-password/route.ts @@ -1,7 +1,7 @@ import { NextRequest, NextResponse } from 'next/server'; import { getServerSession } from 'next-auth'; -import { authOptions } from '@/lib/auth'; -import { prisma } from '@/lib/prisma'; +import { authOptions } from '../../../lib/auth'; +import { prisma } from '../../../lib/prisma'; import bcrypt from 'bcryptjs'; export async function POST(request: NextRequest) { diff --git a/app/api/import-users/route.ts b/app/api/import-users/route.ts index 2b0bda3..9ce0eb5 100644 --- a/app/api/import-users/route.ts +++ b/app/api/import-users/route.ts @@ -1,7 +1,7 @@ import { NextRequest, NextResponse } from 'next/server'; -import { prisma } from '@/lib/prisma'; +import { prisma } from '../../../lib/prisma'; import { getServerSession } from 'next-auth'; -import { authOptions } from '@/lib/auth'; +import { authOptions } from '../../../lib/auth'; import bcrypt from 'bcryptjs'; import ExcelJS from 'exceljs'; import { v4 as uuidv4 } from 'uuid'; diff --git a/app/change-password/page.tsx b/app/change-password/page.tsx index df4f6c9..00a1250 100644 --- a/app/change-password/page.tsx +++ b/app/change-password/page.tsx @@ -3,10 +3,10 @@ import { useEffect, useState } from 'react'; import { useSession, signOut } from 'next-auth/react'; import { useRouter } from 'next/navigation'; -import { Button } from '@/components/ui/button'; -import { Input } from '@/components/ui/input'; -import { Label } from '@/components/ui/label'; -import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'; +import { Button } from '../../components/ui/button'; +import { Input } from '../../components/ui/input'; +import { Label } from '../../components/ui/label'; +import { Card, CardContent, CardHeader, CardTitle } from '../../components/ui/card'; import { toast } from 'sonner'; export default function ChangePasswordPage() { From 81fdbd6505e617c5bf445f2b307ebb9e2c84f69e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MARQUET?= <72651575+BreizhHardware@users.noreply.github.com> Date: Fri, 21 Nov 2025 08:13:56 +0000 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20Activer=20l'affichage=20des=20=C3=A9?= =?UTF-8?q?l=C3=A9ments=20en=20attente=20par=20d=C3=A9faut=20dans=20la=20p?= =?UTF-8?q?age=20d'administration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devcontainer/devcontainer.json | 10 ++++++++++ app/admin/page.tsx | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..a295659 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,10 @@ +{ + "name": "Node.js 24", + "image": "mcr.microsoft.com/devcontainers/javascript-node:24", + "customizations": { + "vscode": { + "settings": {} + } + }, + "postCreateCommand": "npm install -g pnpm && pnpm install" +} \ No newline at end of file diff --git a/app/admin/page.tsx b/app/admin/page.tsx index 19f2578..78cd501 100644 --- a/app/admin/page.tsx +++ b/app/admin/page.tsx @@ -106,7 +106,7 @@ export default function AdminPage() { const [selectedUserIds, setSelectedUserIds] = useState([]); const [sortBy, setSortBy] = useState<'date' | 'createdAt'>('date'); const [sortOrder, setSortOrder] = useState<'asc' | 'desc'>('desc'); - const [showPendingFirst, setShowPendingFirst] = useState(false); + const [showPendingFirst, setShowPendingFirst] = useState(true); const { refetchSettings } = useSettings(); useEffect(() => { From 6218e2bf4e7e7657c8df7c00382acdb3567e2d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20MARQUET?= <72651575+BreizhHardware@users.noreply.github.com> Date: Fri, 21 Nov 2025 08:17:03 +0000 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20Ajouter=20la=20prise=20en=20charge?= =?UTF-8?q?=20de=20Git=20LFS=20dans=20la=20configuration=20du=20conteneur?= =?UTF-8?q?=20de=20d=C3=A9veloppement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devcontainer/devcontainer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a295659..c3649d6 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,9 @@ { "name": "Node.js 24", "image": "mcr.microsoft.com/devcontainers/javascript-node:24", + "features": { + "ghcr.io/devcontainers/features/git-lfs:1": {} + }, "customizations": { "vscode": { "settings": {}