diff --git a/bun.lock b/bun.lock index 11f2ae1..8ed0a34 100644 --- a/bun.lock +++ b/bun.lock @@ -12,7 +12,7 @@ "lucide-react": "^0.525.0", "react": "^19.1.0", "react-dom": "^19.1.0", - "react-router-dom": "^7.6.3", + "react-router": "^7.6.3", "sidebar": "^1.0.2", "tailwind-merge": "^3.3.1", "tailwindcss": "^4.1.11", @@ -23,7 +23,7 @@ "@types/node": "^24.0.7", "@types/react": "^19.1.8", "@types/react-dom": "^19.1.6", - "@types/react-router-dom": "^5.3.3", + "@types/react-router": "^5.1.20", "@vitejs/plugin-react": "^4.5.2", "eslint": "^9.29.0", "eslint-plugin-react-hooks": "^5.2.0", @@ -274,8 +274,6 @@ "@types/react-router": ["@types/react-router@5.1.20", "", { "dependencies": { "@types/history": "^4.7.11", "@types/react": "*" } }, "sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q=="], - "@types/react-router-dom": ["@types/react-router-dom@5.3.3", "", { "dependencies": { "@types/history": "^4.7.11", "@types/react": "*", "@types/react-router": "*" } }, "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw=="], - "@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.35.0", "", { "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "8.35.0", "@typescript-eslint/type-utils": "8.35.0", "@typescript-eslint/utils": "8.35.0", "@typescript-eslint/visitor-keys": "8.35.0", "graphemer": "^1.4.0", "ignore": "^7.0.0", "natural-compare": "^1.4.0", "ts-api-utils": "^2.1.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.35.0", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-ijItUYaiWuce0N1SoSMrEd0b6b6lYkYt99pqCPfybd+HKVXtEvYhICfLdwp42MhiI5mp0oq7PKEL+g1cNiz/Eg=="], "@typescript-eslint/parser": ["@typescript-eslint/parser@8.35.0", "", { "dependencies": { "@typescript-eslint/scope-manager": "8.35.0", "@typescript-eslint/types": "8.35.0", "@typescript-eslint/typescript-estree": "8.35.0", "@typescript-eslint/visitor-keys": "8.35.0", "debug": "^4.3.4" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } }, "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA=="], @@ -540,8 +538,6 @@ "react-router": ["react-router@7.6.3", "", { "dependencies": { "cookie": "^1.0.1", "set-cookie-parser": "^2.6.0" }, "peerDependencies": { "react": ">=18", "react-dom": ">=18" }, "optionalPeers": ["react-dom"] }, "sha512-zf45LZp5skDC6I3jDLXQUu0u26jtuP4lEGbc7BbdyxenBN1vJSTA18czM2D+h5qyMBuMrD+9uB+mU37HIoKGRA=="], - "react-router-dom": ["react-router-dom@7.6.3", "", { "dependencies": { "react-router": "7.6.3" }, "peerDependencies": { "react": ">=18", "react-dom": ">=18" } }, "sha512-DiWJm9qdUAmiJrVWaeJdu4TKu13+iB/8IEi0EW/XgaHCjW/vWGrwzup0GVvaMteuZjKnh5bEvJP/K0MDnzawHw=="], - "resolve-from": ["resolve-from@4.0.0", "", {}, "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="], "reusify": ["reusify@1.1.0", "", {}, "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw=="], diff --git a/package.json b/package.json index fd8a086..36bc292 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "lucide-react": "^0.525.0", "react": "^19.1.0", "react-dom": "^19.1.0", - "react-router-dom": "^7.6.3", + "react-router": "^7.6.3", "sidebar": "^1.0.2", "tailwind-merge": "^3.3.1", "tailwindcss": "^4.1.11" @@ -29,7 +29,7 @@ "@types/node": "^24.0.7", "@types/react": "^19.1.8", "@types/react-dom": "^19.1.6", - "@types/react-router-dom": "^5.3.3", + "@types/react-router": "^5.1.20", "@vitejs/plugin-react": "^4.5.2", "eslint": "^9.29.0", "eslint-plugin-react-hooks": "^5.2.0", diff --git a/src/App.tsx b/src/App.tsx index 6c4de99..cc6cb39 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,4 +1,4 @@ -import { BrowserRouter as Router, Routes, Route, Navigate } from 'react-router-dom' +import { BrowserRouter as Router, Routes, Route, Navigate } from 'react-router' import { AuthProvider } from '@/contexts/AuthContext' import { LoginPage } from '@/pages/LoginPage' import { RegisterPage } from '@/pages/RegisterPage' diff --git a/src/components/ProtectedRoute.tsx b/src/components/ProtectedRoute.tsx index 63212d6..74f8144 100644 --- a/src/components/ProtectedRoute.tsx +++ b/src/components/ProtectedRoute.tsx @@ -1,5 +1,5 @@ import { type ReactNode } from 'react' -import { Navigate } from 'react-router-dom' +import { Navigate } from 'react-router' import { useAuth } from '@/contexts/AuthContext' interface ProtectedRouteProps { diff --git a/src/pages/DashboardPage.tsx b/src/pages/DashboardPage.tsx index 53838e3..73df8f2 100644 --- a/src/pages/DashboardPage.tsx +++ b/src/pages/DashboardPage.tsx @@ -1,7 +1,7 @@ import { Button } from '@/components/ui/button' import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card' import { useAuth } from '@/contexts/AuthContext' -import { useNavigate } from 'react-router-dom' +import { useNavigate } from 'react-router' export function DashboardPage() { const { user, logout } = useAuth() diff --git a/src/pages/LoginPage.tsx b/src/pages/LoginPage.tsx index d1d23b1..687546d 100644 --- a/src/pages/LoginPage.tsx +++ b/src/pages/LoginPage.tsx @@ -1,5 +1,5 @@ import { useState, useEffect } from 'react' -import { Link, useNavigate, useSearchParams } from 'react-router-dom' +import { Link, useNavigate, useSearchParams } from 'react-router' import { Button } from '@/components/ui/button' import { Input } from '@/components/ui/input' import { Label } from '@/components/ui/label' diff --git a/src/pages/RegisterPage.tsx b/src/pages/RegisterPage.tsx index 7be6cd4..64f8486 100644 --- a/src/pages/RegisterPage.tsx +++ b/src/pages/RegisterPage.tsx @@ -1,5 +1,5 @@ import { useState, useEffect } from 'react' -import { Link, useNavigate } from 'react-router-dom' +import { Link, useNavigate } from 'react-router' import { Button } from '@/components/ui/button' import { Input } from '@/components/ui/input' import { Label } from '@/components/ui/label'