- {/* Sender */}
-
-
- {userName}
+
+ {/* # */}
+ |
+ {String(index).padStart(2, '0')}
+ |
+
+ {/* Sarlavha */}
+
+
+ {item.title || '—'}
|
- {/* File Name */}
-
-
-
-
- {tUnknown('file')}
-
-
+
+ {tUnknown('file')}
+
+ ) : (
+ —
+ )}
|
- {/* Date */}
-
-
- {formatDate(item.created_at)}
-
+ {/* Sana */}
+ |
+ {formatDate(item.created_at)}
|
- {/* State */}
-
+ {/* Holat */}
+ |
{
- if (item.state === 'unpaid') {
- setIsPaymentOpen(true);
- }
+ if (item.state === 'unpaid') setIsPaymentOpen(true);
}}
- className="text-sm font-medium text-slate-700 whitespace-nowrap tabular-nums"
+ className={item.state === 'unpaid' ? 'cursor-pointer' : ''}
>
-
+
|
- {/* View Button */}
-
+ {/* Amal */}
+ |
|
@@ -160,11 +139,12 @@ export const HistoryTableRow: React.FC = ({ item }) => {
setIsPaymentOpen(false)}
- hasCertificate={false}
- onConfirmPayment={() => {
- handleSubmit({ document_id: Number(item.order_id) });
- }}
+ price={price}
+ onConfirmPayment={() =>
+ payment.mutate({ order_id: Number(item.order_id) })
+ }
isLoading={payment.isPending}
+ hasSertificate={item.certificate}
/>
);
diff --git a/src/widgets/home/index.tsx b/src/widgets/home/index.tsx
index dc2bc1a..441e3c8 100644
--- a/src/widgets/home/index.tsx
+++ b/src/widgets/home/index.tsx
@@ -1,10 +1,20 @@
'use client';
+import { useEffect } from 'react';
import Hero from './components/Hero';
import InfoSection from './components/InfoSection';
import StepsSection from './components/StepsSection';
import Ticker from './components/Ticker';
+import { useRouter } from '@/shared/config/i18n/navigation';
const PlagiarismLanding = () => {
+ const route = useRouter();
+ useEffect(() => {
+ const data = localStorage.getItem('user');
+
+ if (data) {
+ route.push('/plagiat');
+ }
+ }, []);
return (
<>
diff --git a/src/widgets/navbar/lib/data.ts b/src/widgets/navbar/lib/data.ts
index fb29a8e..3ec6d7e 100644
--- a/src/widgets/navbar/lib/data.ts
+++ b/src/widgets/navbar/lib/data.ts
@@ -1,26 +1,5 @@
-import { MenuItem } from './model';
import { LanguageRoutes } from '@/shared/config/i18n/types';
-const getMenu = (t: (key: string) => string): MenuItem[] => [
- { title: t('aboutSite'), url: '/about' },
- // {
- // title: 'Products',
- // url: '#',
- // items: [
- // {
- // title: 'Blog',
- // description: 'The latest industry news, updates, and info',
- // icon: Book,
- // url: '#',
- // },
- // ],
- // },
- {
- title: t('contact'),
- url: '/contact',
- },
-];
-
const languages: { name: string; key: LanguageRoutes }[] = [
{
name: "O'zbekcha",
@@ -36,4 +15,4 @@ const languages: { name: string; key: LanguageRoutes }[] = [
},
];
-export { getMenu, languages };
+export { languages };
diff --git a/src/widgets/navbar/lib/model.ts b/src/widgets/navbar/lib/model.ts
index fa3c803..514a679 100644
--- a/src/widgets/navbar/lib/model.ts
+++ b/src/widgets/navbar/lib/model.ts
@@ -4,4 +4,5 @@ export interface MenuItem {
description?: string;
icon?: React.ComponentType<{ className?: string }>;
items?: MenuItem[];
+ key: string;
}
diff --git a/src/widgets/navbar/ui/SubMenuLink.tsx b/src/widgets/navbar/ui/SubMenuLink.tsx
index dbff994..102efb7 100644
--- a/src/widgets/navbar/ui/SubMenuLink.tsx
+++ b/src/widgets/navbar/ui/SubMenuLink.tsx
@@ -1,3 +1,5 @@
+'use client';
+import { usePathname } from 'next/navigation';
import { MenuItem } from '../lib/model';
const SubMenuLink = ({
@@ -7,11 +9,17 @@ const SubMenuLink = ({
item: MenuItem;
logOut?: () => void;
}) => {
+ const pathname = usePathname();
+ const isCabinet = pathname.includes('/cabinet');
+
return (
{
+ href={isCabinet && item.url === '/cabinet' ? undefined : item.url}
+ onClick={(e) => {
+ if (isCabinet && item.url === '/cabinet') {
+ e.preventDefault();
+ }
if (logOut) {
logOut();
}
diff --git a/src/widgets/navbar/ui/authButtons.tsx b/src/widgets/navbar/ui/authButtons.tsx
index c70a636..9ba7cf0 100644
--- a/src/widgets/navbar/ui/authButtons.tsx
+++ b/src/widgets/navbar/ui/authButtons.tsx
@@ -2,34 +2,71 @@
import { Link } from '@/shared/config/i18n/navigation';
import { Button } from '@/shared/ui/button';
import {
- NavigationMenu,
- NavigationMenuContent,
- NavigationMenuItem,
- NavigationMenuLink,
- NavigationMenuTrigger,
-} from '@/shared/ui/navigation-menu';
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from '@/shared/ui/dropdown-menu';
import SubMenuLink from './SubMenuLink';
import { ChangeLang } from './ChangeLang';
import { useLoginModal, useRegisterModal } from '@/shared/zustand/auth';
import { useTranslations } from 'next-intl';
import { useUserPlagiatStore } from '@/shared/zustand/user';
-import { LogOut } from 'lucide-react';
+import {
+ ChevronDown,
+ LogOut,
+ User,
+ LayoutDashboard,
+ FileSearch,
+ BrainCircuit,
+ CreditCard,
+} from 'lucide-react';
import { useEffect, useState } from 'react';
+import { useCabinetNav } from '@/shared/zustand/cabinetNav';
function AuthButtons() {
const t = useTranslations('Navbar');
+ const t_cab = useTranslations('Cabinet');
+ const setNavItem = useCabinetNav((state) => state.setNavItem);
const [localUser, setLocalUser] = useState<{
id: number;
name: string;
surname: string;
} | null>(null);
-
+ const [open, setOpen] = useState(false);
const auth = {
login: { title: t('login'), url: '#' },
signup: { title: t('signup'), url: '#' },
};
- const userItem = [{ title: t('logout'), url: '/', icon: LogOut }];
+ const userItem = [
+ { title: t('profile'), url: '/cabinet', icon: User, key: 'profile' },
+ {
+ url: '/cabinet',
+ title: t_cab('dashboard'),
+ icon: LayoutDashboard,
+ key: 'dashboard',
+ },
+ {
+ url: '/cabinet',
+ title: t_cab('plagiat'),
+ icon: FileSearch,
+ key: 'plagiat',
+ },
+ {
+ url: '/cabinet',
+ title: t_cab('siNav'),
+ icon: BrainCircuit,
+ key: 'si',
+ },
+ {
+ url: '/cabinet',
+ title: t_cab('payments'),
+ icon: CreditCard,
+ key: 'payments',
+ },
+ { title: t('logout'), url: '/', icon: LogOut, key: 'logout' },
+ ];
const toggleLoginModal = useLoginModal((state) => state.toggleLoginModal);
const toggleRegisterModal = useRegisterModal(
@@ -47,7 +84,6 @@ function AuthButtons() {
useEffect(() => {
const data = localStorage.getItem('user');
-
if (data) {
setLocalUser(JSON.parse(data));
} else {
@@ -61,24 +97,31 @@ function AuthButtons() {
-
-
-
- {localUser.name} {localUser.surname}
-
-
- {userItem.map((subItem) => (
-
-
-
- ))}
-
-
-
+
+
+ {localUser.name}
+
+
+
+ {userItem.map((subItem) => (
+
+ {
+ setOpen(false);
+ if (subItem.url !== '/cabinet') {
+ clearTokens();
+ } else {
+ setNavItem(
+ subItem.key as import('@/widgets/cabinet/lib/types').CabinetSection,
+ );
+ }
+ }}
+ item={subItem}
+ />
+
+ ))}
+
+
);
}
diff --git a/src/widgets/navbar/ui/index.tsx b/src/widgets/navbar/ui/index.tsx
index d4b9b68..a24da44 100644
--- a/src/widgets/navbar/ui/index.tsx
+++ b/src/widgets/navbar/ui/index.tsx
@@ -1,4 +1,3 @@
-import { Accordion } from '@/shared/ui/accordion';
import { Button } from '@/shared/ui/button';
import {
Sheet,
@@ -8,8 +7,6 @@ import {
SheetTrigger,
} from '@/shared/ui/sheet';
import { Menu } from 'lucide-react';
-import { getMenu } from '../lib/data';
-import RenderMobileMenuItem from './RenderMobileMenuItem';
import { ChangeLang } from './ChangeLang';
import Link from 'next/link';
import { AuthButtons } from './authButtons';
@@ -19,10 +16,9 @@ import Image from 'next/image';
const Navbar = () => {
const t = useTranslations('Navbar');
- const menu = getMenu(t);
return (
-
+
{/* Desktop Menu */}
|