Added part of Request Page

master
YasamanKahdooei 2024-04-25 16:41:43 +03:30
parent 79ad4f8406
commit c2d40ce4dd
14 changed files with 213 additions and 31 deletions

View File

@ -11,7 +11,7 @@ export default function RequestLayout({
{/* Include shared UI here e.g. a header or sidebar */} {/* Include shared UI here e.g. a header or sidebar */}
<SideMenu /> <SideMenu />
<UserHeader /> <UserHeader />
<div className=" w-[calc(100%-208px)] bg-rose-100 flex flex-1 p-10 flex-col overflow-hidden overflow-y-auto fixed top-[60px] left-0 transition-all ">{children}</div> <div className=" w-[calc(100%-208px)] flex flex-1 p-10 flex-col overflow-hidden overflow-y-auto fixed top-[60px] left-0 transition-all ">{children}</div>
</section> </section>
); );
} }

View File

@ -91,7 +91,7 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
direction: rtl; direction: rtl;
background-color: var(--main-bg); /* background-color: var(--main-bg); */
} }
a { a {
text-decoration: none; text-decoration: none;

View File

@ -19,7 +19,7 @@ export default function RootLayout({
}>) { }>) {
return ( return (
<html lang="en"> <html lang="en">
<body className={inter.className}> <body className="bg-bgmain font-[iranyekan]">
<Provider> <Provider>
<ProgressBarProviders>{children}</ProgressBarProviders> <ProgressBarProviders>{children}</ProgressBarProviders>

View File

@ -1,9 +1,12 @@
import React from 'react' import React from "react";
import RequestList from "./RequestList";
const AllRequests = () => { const AllRequests = () => {
return ( return (
<div>AllRequests</div> <div>
) <RequestList />
} </div>
);
};
export default AllRequests export default AllRequests;

View File

@ -2,30 +2,32 @@ import React from "react";
import OnMapRequests from "./OnMapRequests"; import OnMapRequests from "./OnMapRequests";
import AllRequests from "./AllRequests"; import AllRequests from "./AllRequests";
import NearestRequests from "./NearestRequests"; import NearestRequests from "./NearestRequests";
import { TabRequests } from "./TabRequests";
// import UserContainer from "../User/UserContainer"; // import UserContainer from "../User/UserContainer";
function RecentRequests() { function RecentRequests() {
return ( return (
<section className="w-full flex flex-1 flex-row overflow-hidden bg-white p-[10px]"> <section className="w-full flex flex-1 flex-row gap-8 overflow-hidden bg-white p-[10px]">
{/* Right */}
{/* Left */} <div className="w-full rounded-md bg-rose-100">
<div className="">
<div id="map" aria-label="نقشه"> <div id="map" aria-label="نقشه">
<OnMapRequests /> <OnMapRequests />
</div> </div>
</div> </div>
{/* Right */} {/* Left */}
<div className=""> <div className="w-full rounded-md ">
<div id="all" aria-label="همه"> {/* <div id="all" aria-label="همه">
<AllRequests /> <AllRequests />
</div> </div>
<div id="nearest" aria-label="نزدیکترین‌ها"> <div id="nearest" aria-label="نزدیکترین‌ها">
<NearestRequests /> <NearestRequests />
</div> </div> */}
</div>
<TabRequests />
</div>
</section> </section>
); );
} }

View File

@ -1,9 +1,12 @@
import React from 'react' import React from "react";
import RequestCard from "../Requests/RequestCard";
const RequestList = () => { const RequestList = () => {
return ( return (
<div>RequestList</div> <div>
) <RequestCard />
} </div>
);
};
export default RequestList export default RequestList;

View File

@ -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 (
<Tabs defaultValue="nearest" className="">
<TabsList className="grid w-full grid-cols-2">
<TabsTrigger value="nearest">نزدیک ترین ها </TabsTrigger>
<TabsTrigger value="all">همه</TabsTrigger>
</TabsList>
<TabsContent value="nearest">
<RequestList />
</TabsContent>
<TabsContent value="all">
<p>همه همه </p>
</TabsContent>
</Tabs>
);
}

View File

@ -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 (
<article
className="w-full bg-white flex items-stretch mb-3 cursor-pointer min-h-[170px] md:p-3 md:rounded-md md:border-0 md:shadow-[0_2px_5px_rgba(0,0,0,0.05)]"
style={{ direction: "rtl" }}
>
<div className="w-full max-w-[100px] flex items-center justify-center">
<Image
src={img1}
alt="11"
className="w-full h-full rounded-md object-contain"
/>
</div>
<div className="flex-1 pr-2">
{/* 1 requestCardInfoRow */}
<div className="w-full flex items-center justify-between mb-2">
<p className="text-xs font-bold text-ellipsis">عنوان دسته بندی</p>
<RequestStatus />
</div>
{/* 2 */}
<div className="w-full flex items-center justify-between mb-2">222</div>
{/* 3 */}
<div className="w-full flex items-center justify-between mb-2">333</div>
{/* 4 */}
<div className="w-full flex items-center justify-between mb-2">444</div>
</div>
</article>
);
};
export default RequestCard;

View File

@ -0,0 +1,13 @@
import React from "react";
const RequestStatus = () => {
return (
<>
<span className="rounded-3xl bg-white text-ellipsis text-center py-[2px] px-1 text-xs font-bold min-h-6 flex items-center justify-center max-w-[80px] w-full text-black">
آخرین وضعیت
</span>
</>
);
};
export default RequestStatus;

View File

@ -11,6 +11,9 @@ const UserHeader = () => {
const pathname = usePathname(); const pathname = usePathname();
const [isMenupage, setIsMenuPage] = useState(); const [isMenupage, setIsMenuPage] = useState();
const currentMenuItem = menuItems.find((item) => item.href === pathname);
const titleToShow = currentMenuItem ? currentMenuItem.title : "";
// {menuItems.map((menuItem) => ( // {menuItems.map((menuItem) => (
// pathname === menuItem.href // pathname === menuItem.href
@ -19,10 +22,10 @@ const UserHeader = () => {
// ))} // ))}
return ( return (
<div className="flex flex-row justify-between items-center fixed top-0 left-0 z-[200] transition-all p-[10px] w-[calc(100%-208px)]"> <div className="flex flex-row justify-between items-center fixed top-0 left-0 z-[200] transition-all py-4 px-10 w-[calc(100%-208px)]">
<div className="flex items-center"> <div className="flex items-center">
<p className="cursor-pointer text-sm font-bold shadow-[0_0_3px_rgba(0,0,0,0.1)] m-0 flex items-center"> <p className="cursor-pointer text-[15px] font-bold drop-shadow-md m-0 flex items-center">
{pathname} {titleToShow}
</p> </p>
</div> </div>
@ -35,13 +38,13 @@ const UserHeader = () => {
{/* Card 2 */} {/* Card 2 */}
<div className="h-10 mx-1 cursor-pointer bg-gray-200 rounded-3xl px-3 pt-0 flex items-center justify-center relative"> <div className="h-10 mx-1 cursor-pointer bg-gray-200 rounded-3xl px-3 pt-0 flex items-center justify-center relative">
<span className="flex items-center justify-center"> <span className="flex items-center justify-center">
<div className="flex items-center justify-center relative bg-gray-100 rounded-full w-6 h-6"> <div className="flex items-center justify-center relative bg-gray-100 rounded-full w-6 h-6">
<FaRegUser className="text-gray-200 w-1/2 h-1/2 " /> <FaRegUser className="text-gray-200 w-1/2 h-1/2 " />
</div> </div>
<span className="text-xs font-bold opacity-100 transition-all mr-[5px]">Yasaman</span> <span className="text-xs font-bold opacity-100 transition-all mr-[5px]">
Yasaman
</span>
</span> </span>
</div> </div>
</div> </div>

View File

@ -14,7 +14,7 @@ const TabsList = React.forwardRef<
<TabsPrimitive.List <TabsPrimitive.List
ref={ref} ref={ref}
className={cn( className={cn(
"inline-flex h-14 items-center justify-start rounded-md bg-[#E9E9E9] p-2 text-muted-foreground", "inline-flex h-10 items-center justify-center rounded-3xl bg-white text-foreground border-yellow border-[1px]",
className className
)} )}
{...props} {...props}
@ -29,7 +29,7 @@ const TabsTrigger = React.forwardRef<
<TabsPrimitive.Trigger <TabsPrimitive.Trigger
ref={ref} ref={ref}
className={cn( className={cn(
"inline-flex items-center justify-center h-full whitespace-nowrap rounded-sm px-1 sm:px-3 py-1.5 text-xs sm:text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-blue data-[state=active]:text-white data-[state=active]:shadow-sm", "h-full inline-flex items-center justify-center whitespace-nowrap rounded-3xl px-3 py-1.5 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-yellow data-[state=active]:text-foreground data-[state=active]:shadow-sm",
className className
)} )}
{...props} {...props}

97
package-lock.json generated
View File

@ -11,6 +11,7 @@
"@hookform/resolvers": "^3.3.4", "@hookform/resolvers": "^3.3.4",
"@radix-ui/react-label": "^2.0.2", "@radix-ui/react-label": "^2.0.2",
"@radix-ui/react-slot": "^1.0.2", "@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-tabs": "^1.0.4",
"@radix-ui/react-toast": "^1.1.5", "@radix-ui/react-toast": "^1.1.5",
"@tanstack/react-query": "^5.29.0", "@tanstack/react-query": "^5.29.0",
"@tanstack/react-query-devtools": "^5.29.0", "@tanstack/react-query-devtools": "^5.29.0",
@ -537,6 +538,23 @@
} }
} }
}, },
"node_modules/@radix-ui/react-direction": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.0.1.tgz",
"integrity": "sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==",
"dependencies": {
"@babel/runtime": "^7.13.10"
},
"peerDependencies": {
"@types/react": "*",
"react": "^16.8 || ^17.0 || ^18.0"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
}
}
},
"node_modules/@radix-ui/react-dismissable-layer": { "node_modules/@radix-ui/react-dismissable-layer": {
"version": "1.0.5", "version": "1.0.5",
"resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.5.tgz", "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.0.5.tgz",
@ -564,6 +582,24 @@
} }
} }
}, },
"node_modules/@radix-ui/react-id": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.0.1.tgz",
"integrity": "sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==",
"dependencies": {
"@babel/runtime": "^7.13.10",
"@radix-ui/react-use-layout-effect": "1.0.1"
},
"peerDependencies": {
"@types/react": "*",
"react": "^16.8 || ^17.0 || ^18.0"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
}
}
},
"node_modules/@radix-ui/react-label": { "node_modules/@radix-ui/react-label": {
"version": "2.0.2", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.0.2.tgz", "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.0.2.tgz",
@ -657,6 +693,37 @@
} }
} }
}, },
"node_modules/@radix-ui/react-roving-focus": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.0.4.tgz",
"integrity": "sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==",
"dependencies": {
"@babel/runtime": "^7.13.10",
"@radix-ui/primitive": "1.0.1",
"@radix-ui/react-collection": "1.0.3",
"@radix-ui/react-compose-refs": "1.0.1",
"@radix-ui/react-context": "1.0.1",
"@radix-ui/react-direction": "1.0.1",
"@radix-ui/react-id": "1.0.1",
"@radix-ui/react-primitive": "1.0.3",
"@radix-ui/react-use-callback-ref": "1.0.1",
"@radix-ui/react-use-controllable-state": "1.0.1"
},
"peerDependencies": {
"@types/react": "*",
"@types/react-dom": "*",
"react": "^16.8 || ^17.0 || ^18.0",
"react-dom": "^16.8 || ^17.0 || ^18.0"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
},
"@types/react-dom": {
"optional": true
}
}
},
"node_modules/@radix-ui/react-slot": { "node_modules/@radix-ui/react-slot": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
@ -675,6 +742,36 @@
} }
} }
}, },
"node_modules/@radix-ui/react-tabs": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.0.4.tgz",
"integrity": "sha512-egZfYY/+wRNCflXNHx+dePvnz9FbmssDTJBtgRfDY7e8SE5oIo3Py2eCB1ckAbh1Q7cQ/6yJZThJ++sgbxibog==",
"dependencies": {
"@babel/runtime": "^7.13.10",
"@radix-ui/primitive": "1.0.1",
"@radix-ui/react-context": "1.0.1",
"@radix-ui/react-direction": "1.0.1",
"@radix-ui/react-id": "1.0.1",
"@radix-ui/react-presence": "1.0.1",
"@radix-ui/react-primitive": "1.0.3",
"@radix-ui/react-roving-focus": "1.0.4",
"@radix-ui/react-use-controllable-state": "1.0.1"
},
"peerDependencies": {
"@types/react": "*",
"@types/react-dom": "*",
"react": "^16.8 || ^17.0 || ^18.0",
"react-dom": "^16.8 || ^17.0 || ^18.0"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
},
"@types/react-dom": {
"optional": true
}
}
},
"node_modules/@radix-ui/react-toast": { "node_modules/@radix-ui/react-toast": {
"version": "1.1.5", "version": "1.1.5",
"resolved": "https://registry.npmjs.org/@radix-ui/react-toast/-/react-toast-1.1.5.tgz", "resolved": "https://registry.npmjs.org/@radix-ui/react-toast/-/react-toast-1.1.5.tgz",

View File

@ -12,6 +12,7 @@
"@hookform/resolvers": "^3.3.4", "@hookform/resolvers": "^3.3.4",
"@radix-ui/react-label": "^2.0.2", "@radix-ui/react-label": "^2.0.2",
"@radix-ui/react-slot": "^1.0.2", "@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-tabs": "^1.0.4",
"@radix-ui/react-toast": "^1.1.5", "@radix-ui/react-toast": "^1.1.5",
"@tanstack/react-query": "^5.29.0", "@tanstack/react-query": "^5.29.0",
"@tanstack/react-query-devtools": "^5.29.0", "@tanstack/react-query-devtools": "^5.29.0",

View File

@ -33,6 +33,7 @@ const config = {
green: "#006400", green: "#006400",
lightGreen: "#06d6a0", lightGreen: "#06d6a0",
blue: "#003aa3", blue: "#003aa3",
bgmain: "#f5f7fa",
border: "hsl(var(--border))", border: "hsl(var(--border))",
input: "hsl(var(--input))", input: "hsl(var(--input))",
ring: "hsl(var(--ring))", ring: "hsl(var(--ring))",