From 5c26efd928d1c9f7632506a8d82538cf20e1b160 Mon Sep 17 00:00:00 2001 From: YasamanKahdooei Date: Thu, 18 Apr 2024 15:07:35 +0330 Subject: [PATCH] Add part of SideMenu --- app/layout.tsx | 10 +++-- components/Menu/SideMenu.tsx | 33 ++++++++++++---- components/ProgressBar/ProgressBar.tsx | 19 +++++++++ components/Verify/VerifyInput.tsx | 53 ++++++++++++++------------ constants/index.tsx | 12 +++--- package-lock.json | 14 +++++++ package.json | 1 + 7 files changed, 100 insertions(+), 42 deletions(-) create mode 100644 components/ProgressBar/ProgressBar.tsx 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"} `} >
-
    +
      {menuItems.map((menuItem) => ( - {menuItem.icon} - {menuItem.title} - +
      + + {menuItem.icon} + +
      + + {menuItem.title} + ))}
    diff --git a/components/ProgressBar/ProgressBar.tsx b/components/ProgressBar/ProgressBar.tsx new file mode 100644 index 0000000..052fc58 --- /dev/null +++ b/components/ProgressBar/ProgressBar.tsx @@ -0,0 +1,19 @@ +"use client"; + +import { AppProgressBar as ProgressBar } from "next-nprogress-bar"; + +const ProgressBarProviders = ({ children }: { children: React.ReactNode }) => { + return ( + <> + {children} + + + ); +}; + +export default ProgressBarProviders; diff --git a/components/Verify/VerifyInput.tsx b/components/Verify/VerifyInput.tsx index e00b538..76b56c1 100644 --- a/components/Verify/VerifyInput.tsx +++ b/components/Verify/VerifyInput.tsx @@ -26,29 +26,35 @@ export const VerifyInput = () => { const CitizenVerifyMutation = useMutation({ mutationFn: verifyCitizen, onSuccess: (res) => { - saveToken(true); - const decodedToken = jwtDecode(res.jwtToken); - setCookie("Shahrbin_Token", res.jwtToken); - setCookie("Shahrbin_Refresh_Token", res.refreshToken); - const userRole = - decodedToken[ - "http://schemas.microsoft.com/ws/2008/06/identity/claims/role" - ]; - localStorage.setItem("Shahrbin_Role", userRole); - const justLogin = localStorage.getItem("Shahrbin_Login_State"); - if (justLogin) { - // router.push("/Account/Complaints"); - router.push("/RecentRequest"); - localStorage.removeItem("Shahrbin_Login_State"); - console.log("justLogin"); - } else { - console.log("Dont justLogin"); - // router.push("/RequestStep1"); - } + router.push("/RecentRequest"); + console.log("justLogin"); + + // saveToken(true); + // const decodedToken = jwtDecode(res.jwtToken); + // setCookie("Shahrbin_Token", res.jwtToken); + // setCookie("Shahrbin_Refresh_Token", res.refreshToken); + // const userRole = + // decodedToken[ + // "http://schemas.microsoft.com/ws/2008/06/identity/claims/role" + // ]; + // localStorage.setItem("Shahrbin_Role", userRole); + // const justLogin = localStorage.getItem("Shahrbin_Login_State"); + + // if (justLogin) { + // // router.push("/Account/Complaints"); + // router.push("/RecentRequest"); + // localStorage.removeItem("Shahrbin_Login_State"); + // console.log("justLogin"); + // } else { + // console.log("Dont justLogin"); + // // router.push("/RequestStep1"); + // } }, onError: (err: any | string) => { + console.log("Dont Login"); + toast(<>{err.response.data.detail}, { - className: "!bg-red-500 !text-white", + className: "!bg-rose-800 !text-white flex justify-end ", }); }, }); @@ -101,7 +107,7 @@ export const VerifyInput = () => { if (localStorage.getItem("CountDownCompleted")) { const otpTokenString = localStorage.getItem( appConstants.SH_CT_OTP_TOKEN - ) + ); // if (otpTokenString !== null) { // resendOtpMutation.mutate({ // otpToken: JSON.parse(otpTokenString), @@ -115,11 +121,10 @@ export const VerifyInput = () => { otpToken: otpToken, }); } catch (error) { - console.error('Error parsing otpTokenString:', error); + console.error("Error parsing otpTokenString:", error); // Handle the error accordingly, e.g., notify the user or handle it gracefully. } } - } else { console.log(2); // makeRequest(); @@ -209,7 +214,7 @@ export const VerifyInput = () => { />
- {/* */} + {/* */}
{" "} }, - { 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",