BreizhHardware/Site-comptage-heure
1
0
Fork 0
mirror of https://github.com/BreizhHardware/Site-comptage-heure.git synced 2026-01-18 16:17:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Félix MARQUET
2025-12-08 10:00:41 +00:00
parent 94cef3f9e8 f64cb08ee3
commit f77cba122c
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -1,4 +1,4 @@
FROM node:25-alpine
FROM node:24-alpine
WORKDIR /app
COPY package*.json ./
COPY pnpm-lock.yaml ./

10
app/admin/import-users/page.tsx
View File

@@ -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 {

2
app/admin/page.tsx
View File

@@ -106,7 +106,7 @@ export default function AdminPage() {
const [selectedUserIds, setSelectedUserIds] = useState<string[]>([]);
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(() => {

4
app/api/change-password/route.ts
View File

@@ -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) {

4
app/api/import-users/route.ts
View File

@@ -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';

8
app/change-password/page.tsx
View File

@@ -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() {

4
components/mode-toggle.tsx
View File

@@ -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()

2
components/ui/checkbox.tsx
View File

@@ -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,

2
components/ui/select.tsx
View File

@@ -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