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/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/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(() => { 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() { 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