From c2d40ce4dd5c184914e95f7ff1235912428f411c Mon Sep 17 00:00:00 2001 From: YasamanKahdooei Date: Thu, 25 Apr 2024 16:41:43 +0330 Subject: [PATCH] Added part of Request Page --- app/RecentRequest/layout.tsx | 2 +- app/globals.css | 2 +- app/layout.tsx | 2 +- components/RecentRequest/AllRequests.tsx | 13 +-- components/RecentRequest/RecentRequests.tsx | 22 ++--- components/RecentRequest/RequestList.tsx | 13 +-- components/RecentRequest/TabRequests.tsx | 20 +++++ components/Requests/RequestCard.tsx | 39 +++++++++ components/Requests/RequestStatus.tsx | 13 +++ components/User/UserHeader.tsx | 15 ++-- components/ui/tabs.tsx | 4 +- package-lock.json | 97 +++++++++++++++++++++ package.json | 1 + tailwind.config.ts | 1 + 14 files changed, 213 insertions(+), 31 deletions(-) create mode 100644 components/RecentRequest/TabRequests.tsx create mode 100644 components/Requests/RequestCard.tsx create mode 100644 components/Requests/RequestStatus.tsx diff --git a/app/RecentRequest/layout.tsx b/app/RecentRequest/layout.tsx index d473072..631b828 100644 --- a/app/RecentRequest/layout.tsx +++ b/app/RecentRequest/layout.tsx @@ -11,7 +11,7 @@ export default function RequestLayout({ {/* Include shared UI here e.g. a header or sidebar */} -
{children}
+
{children}
); } diff --git a/app/globals.css b/app/globals.css index 93a02db..df8bcd4 100644 --- a/app/globals.css +++ b/app/globals.css @@ -91,7 +91,7 @@ margin: 0; padding: 0; direction: rtl; - background-color: var(--main-bg); + /* background-color: var(--main-bg); */ } a { text-decoration: none; diff --git a/app/layout.tsx b/app/layout.tsx index 8b875a3..5f1878e 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -19,7 +19,7 @@ export default function RootLayout({ }>) { return ( - + {children} diff --git a/components/RecentRequest/AllRequests.tsx b/components/RecentRequest/AllRequests.tsx index 870a2f9..365e065 100644 --- a/components/RecentRequest/AllRequests.tsx +++ b/components/RecentRequest/AllRequests.tsx @@ -1,9 +1,12 @@ -import React from 'react' +import React from "react"; +import RequestList from "./RequestList"; const AllRequests = () => { return ( -
AllRequests
- ) -} +
+ +
+ ); +}; -export default AllRequests \ No newline at end of file +export default AllRequests; diff --git a/components/RecentRequest/RecentRequests.tsx b/components/RecentRequest/RecentRequests.tsx index b5e64a1..2ac9daf 100644 --- a/components/RecentRequest/RecentRequests.tsx +++ b/components/RecentRequest/RecentRequests.tsx @@ -2,30 +2,32 @@ import React from "react"; import OnMapRequests from "./OnMapRequests"; import AllRequests from "./AllRequests"; import NearestRequests from "./NearestRequests"; +import { TabRequests } from "./TabRequests"; // import UserContainer from "../User/UserContainer"; function RecentRequests() { return ( -
- - - {/* Left */} -
+
+ + {/* Right */} +
- {/* Right */} -
-
+ {/* Left */} +
+ {/*
-
-
+
*/} + + +
); } diff --git a/components/RecentRequest/RequestList.tsx b/components/RecentRequest/RequestList.tsx index 7897dbc..6220c57 100644 --- a/components/RecentRequest/RequestList.tsx +++ b/components/RecentRequest/RequestList.tsx @@ -1,9 +1,12 @@ -import React from 'react' +import React from "react"; +import RequestCard from "../Requests/RequestCard"; const RequestList = () => { return ( -
RequestList
- ) -} +
+ +
+ ); +}; -export default RequestList \ No newline at end of file +export default RequestList; diff --git a/components/RecentRequest/TabRequests.tsx b/components/RecentRequest/TabRequests.tsx new file mode 100644 index 0000000..8ff6f98 --- /dev/null +++ b/components/RecentRequest/TabRequests.tsx @@ -0,0 +1,20 @@ +import React from "react"; +import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; +import RequestList from "./RequestList"; + +export function TabRequests() { + return ( + + + نزدیک ترین ها + همه + + + + + +

همه همه

+
+
+ ); +} diff --git a/components/Requests/RequestCard.tsx b/components/Requests/RequestCard.tsx new file mode 100644 index 0000000..ccab216 --- /dev/null +++ b/components/Requests/RequestCard.tsx @@ -0,0 +1,39 @@ +import Image from "next/image"; +import React from "react"; +import img1 from "@/assets/images/no-image.jpeg"; +import RequestStatus from "./RequestStatus"; +const RequestCard = () => { + return ( +
+
+ 11 +
+ +
+ {/* 1 requestCardInfoRow */} +
+

عنوان دسته بندی

+ +
+ + {/* 2 */} +
222
+ + {/* 3 */} +
333
+ + {/* 4 */} +
444
+
+
+ ); +}; + +export default RequestCard; diff --git a/components/Requests/RequestStatus.tsx b/components/Requests/RequestStatus.tsx new file mode 100644 index 0000000..e937f75 --- /dev/null +++ b/components/Requests/RequestStatus.tsx @@ -0,0 +1,13 @@ +import React from "react"; + +const RequestStatus = () => { + return ( + <> + + آخرین وضعیت + + + ); +}; + +export default RequestStatus; diff --git a/components/User/UserHeader.tsx b/components/User/UserHeader.tsx index f039a37..034122e 100644 --- a/components/User/UserHeader.tsx +++ b/components/User/UserHeader.tsx @@ -11,6 +11,9 @@ const UserHeader = () => { const pathname = usePathname(); const [isMenupage, setIsMenuPage] = useState(); + const currentMenuItem = menuItems.find((item) => item.href === pathname); + const titleToShow = currentMenuItem ? currentMenuItem.title : ""; + // {menuItems.map((menuItem) => ( // pathname === menuItem.href @@ -19,10 +22,10 @@ const UserHeader = () => { // ))} return ( -
+
-

- {pathname} +

+ {titleToShow}

@@ -35,13 +38,13 @@ const UserHeader = () => { {/* Card 2 */}
-
- Yasaman - + + Yasaman +
diff --git a/components/ui/tabs.tsx b/components/ui/tabs.tsx index 850853a..ae3d552 100644 --- a/components/ui/tabs.tsx +++ b/components/ui/tabs.tsx @@ -14,7 +14,7 @@ const TabsList = React.forwardRef<