diff --git a/app/layout.tsx b/app/layout.tsx index 7f4216c..8b875a3 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,8 +1,9 @@ import type { Metadata } from "next"; import { Inter } from "next/font/google"; import "./globals.css"; -import { Toaster } from '@/components/ui/sonner' -import Provider from "../utils/ReactQuery/Provider"; +import { Toaster } from "@/components/ui/sonner"; +import Provider from "../utils/ReactQuery/Provider"; +import ProgressBarProviders from "@/components/ProgressBar/ProgressBar"; const inter = Inter({ subsets: ["latin"] }); @@ -20,8 +21,9 @@ export default function RootLayout({ - {children} - + {children} + + diff --git a/components/Menu/SideMenu.tsx b/components/Menu/SideMenu.tsx index 714a6de..7f33bb0 100644 --- a/components/Menu/SideMenu.tsx +++ b/components/Menu/SideMenu.tsx @@ -3,6 +3,7 @@ import React, { useState } from "react"; import { GoArrowLeft } from "react-icons/go"; import { menuItems } from "@/constants"; import Link from "next/link"; +import { cn } from "@/lib/utils"; const SideMenu = () => { const [open, setOpen] = useState(false); @@ -10,27 +11,43 @@ const SideMenu = () => { return (
- SideMenu
setOpen(!open)} - className={`flex items-center aspect-square bg-white rounded-full shadow-sm text-yellow cursor-pointer h-7 justify-center -left-3 absolute top-5 transition-all duration-700 ease-in-out w-7 z-[400] + className={`flex items-center aspect-square bg-white rounded-full shadow-[0_0_4px_1px_rgba(0,0,0,0.1)] text-yellow cursor-pointer h-8 w-8 justify-center -left-3 absolute top-5 transition-all duration-700 ease-in-out z-[400] ${open === true ? "rotate-180" : "rotate-0"} `} >
-
- {/* */} + {/* */}
{" "} }, - { id: 2, title: "ثبت درخواست", href: "/", icon: }, - { id: 3, title: "درخواست های من", href: "/", icon: }, - { id: 4, title: "نظرسنجی ها ", href: "/", icon: }, - { id: 5, title: "اخبار", href: "/" , icon: }, - { id: 6, title: "تنظیمات", href: "/", icon: }, + { id: 1, title: "صفحه اصلی", href: "/", icon: }, + { id: 2, title: "ثبت درخواست", href: "/", icon: }, + { id: 3, title: "درخواست های من", href: "/", icon: }, + { id: 4, title: "نظرسنجی ها ", href: "/", icon: }, + { id: 5, title: "اخبار", href: "/" , icon: }, + { id: 6, title: "تنظیمات", href: "/", icon: }, ]; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 2523302..d854c3d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,6 +21,7 @@ "jwt-decode": "^4.0.0", "lucide-react": "^0.365.0", "next": "14.1.4", + "next-nprogress-bar": "^2.3.11", "next-themes": "^0.3.0", "react": "^18", "react-countdown": "^2.3.5", @@ -3809,6 +3810,14 @@ } } }, + "node_modules/next-nprogress-bar": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/next-nprogress-bar/-/next-nprogress-bar-2.3.11.tgz", + "integrity": "sha512-OjSvsQwgSWa2qBMYO478QreGG9Jt82tr4wTQptmiyzNqqjzHCyKZNkhANnzPrjuFAoelIvmruJuakODofSnvTQ==", + "dependencies": { + "nprogress": "^0.2.0" + } + }, "node_modules/next-themes": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/next-themes/-/next-themes-0.3.0.tgz", @@ -3868,6 +3877,11 @@ "node": ">=0.10.0" } }, + "node_modules/nprogress": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz", + "integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==" + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", diff --git a/package.json b/package.json index e3f0416..0b77058 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "jwt-decode": "^4.0.0", "lucide-react": "^0.365.0", "next": "14.1.4", + "next-nprogress-bar": "^2.3.11", "next-themes": "^0.3.0", "react": "^18", "react-countdown": "^2.3.5",