diff --git a/app/User/MyRequest/page.tsx b/app/User/MyRequest/page.tsx
new file mode 100644
index 0000000..4d1061a
--- /dev/null
+++ b/app/User/MyRequest/page.tsx
@@ -0,0 +1,13 @@
+import RequestList from "@/components/RecentRequest/RequestList";
+import React from "react";
+
+export default function page() {
+ return (
+
+ );
+}
diff --git a/app/User/NewRequest/page.tsx b/app/User/NewRequest/page.tsx
new file mode 100644
index 0000000..cb2be10
--- /dev/null
+++ b/app/User/NewRequest/page.tsx
@@ -0,0 +1,7 @@
+import React from 'react'
+
+export default function page() {
+ return (
+
+
{/*
diff --git a/components/RecentRequest/RequestList.tsx b/components/RecentRequest/RequestList.tsx
index 6220c57..b56bd11 100644
--- a/components/RecentRequest/RequestList.tsx
+++ b/components/RecentRequest/RequestList.tsx
@@ -3,9 +3,9 @@ import RequestCard from "../Requests/RequestCard";
const RequestList = () => {
return (
-
+
+
);
};
diff --git a/components/RecentRequest/TabRequests.tsx b/components/RecentRequest/TabRequests.tsx
index 8ff6f98..48f717f 100644
--- a/components/RecentRequest/TabRequests.tsx
+++ b/components/RecentRequest/TabRequests.tsx
@@ -1,19 +1,20 @@
import React from "react";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import RequestList from "./RequestList";
+import NearestRequests from "./NearestRequests";
export function TabRequests() {
return (
-
+
نزدیک ترین ها
همه
-
+
- همه همه
+
);
diff --git a/components/Requests/RequestCard.tsx b/components/Requests/RequestCard.tsx
index ccab216..6dbf95f 100644
--- a/components/Requests/RequestCard.tsx
+++ b/components/Requests/RequestCard.tsx
@@ -2,10 +2,16 @@ import Image from "next/image";
import React from "react";
import img1 from "@/assets/images/no-image.jpeg";
import RequestStatus from "./RequestStatus";
+import { MdLocationOn } from "react-icons/md";
+import RequestProcessIcon from "./RequestProcessIcon";
+import RequestViolation from "./RequestViolation";
+import RequestLike from "./RequestLike";
+import RequestComments from "./RequestComments";
+
const RequestCard = () => {
return (
@@ -24,13 +30,33 @@ const RequestCard = () => {
{/* 2 */}
- 222
+
{/* 3 */}
- 333
+
+
+ کد رهگیری:
+ 21221212121
+
+
+ jul 28 2024 11:20
+
+
{/* 4 */}
- 444
+
);
diff --git a/components/Requests/RequestComments.tsx b/components/Requests/RequestComments.tsx
new file mode 100644
index 0000000..7e5ff72
--- /dev/null
+++ b/components/Requests/RequestComments.tsx
@@ -0,0 +1,15 @@
+import React from "react";
+import { FaRegComment } from "react-icons/fa";
+
+const RequestComments = () => {
+ return (
+ <>
+
+
+
+
0
+ >
+ );
+};
+
+export default RequestComments;
diff --git a/components/Requests/RequestLike.tsx b/components/Requests/RequestLike.tsx
new file mode 100644
index 0000000..58d64c3
--- /dev/null
+++ b/components/Requests/RequestLike.tsx
@@ -0,0 +1,16 @@
+import React from "react";
+import { FiHeart } from "react-icons/fi";
+import { IoMdHeart } from "react-icons/io";
+
+const RequestLike = () => {
+ return (
+ <>
+
+
+
+
0
+ >
+ );
+};
+
+export default RequestLike;
diff --git a/components/Requests/RequestProcessIcon.tsx b/components/Requests/RequestProcessIcon.tsx
new file mode 100644
index 0000000..ef9e660
--- /dev/null
+++ b/components/Requests/RequestProcessIcon.tsx
@@ -0,0 +1,13 @@
+import React from "react";
+import { CgMenuRightAlt } from "react-icons/cg";
+
+const RequestProcessIcon = () => {
+ return (
+
+
+ مشاهده روند بررسی
+
+ );
+};
+
+export default RequestProcessIcon;
diff --git a/components/Requests/RequestViolation.tsx b/components/Requests/RequestViolation.tsx
new file mode 100644
index 0000000..6b17bf8
--- /dev/null
+++ b/components/Requests/RequestViolation.tsx
@@ -0,0 +1,8 @@
+import React from "react";
+import { FaRegFlag } from "react-icons/fa6";
+
+const RequestViolation = () => {
+ return
;
+};
+
+export default RequestViolation;
diff --git a/constants/index.tsx b/constants/index.tsx
index b699816..13f94df 100644
--- a/constants/index.tsx
+++ b/constants/index.tsx
@@ -6,11 +6,11 @@ import { TbWorld } from "react-icons/tb";
import { FaCogs } from "react-icons/fa";
export const menuItems = [
- { id: 1, title: "صفحه اصلی", href: "/RecentRequest", 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:
},
+ { id: 1, title: "صفحه اصلی", href: "/User/RecentRequest", icon:
},
+ { id: 2, title: "ثبت درخواست", href: "/User/NewRequest", icon:
},
+ { id: 3, title: "درخواست های من", href: "/User/MyRequest", icon:
},
+ { id: 4, title: "نظرسنجی ها ", href: "/User/Polls", icon:
},
+ { id: 5, title: "اخبار", href: "/User/News" , icon:
},
+ { id: 6, title: "تنظیمات", href: "/User/Settings", icon:
},
];
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index be7fedd..0152804 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,6 +34,7 @@
"react-otp-input": "^3.1.1",
"sonner": "^1.4.41",
"tailwind-merge": "^2.2.2",
+ "tailwind-scrollbar": "^3.1.0",
"tailwindcss-animate": "^1.0.7",
"zod": "^3.22.4",
"zustand": "^4.5.2"
@@ -5264,6 +5265,17 @@
"url": "https://github.com/sponsors/dcastil"
}
},
+ "node_modules/tailwind-scrollbar": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/tailwind-scrollbar/-/tailwind-scrollbar-3.1.0.tgz",
+ "integrity": "sha512-pmrtDIZeHyu2idTejfV59SbaJyvp1VRjYxAjZBH0jnyrPRo6HL1kD5Glz8VPagasqr6oAx6M05+Tuw429Z8jxg==",
+ "engines": {
+ "node": ">=12.13.0"
+ },
+ "peerDependencies": {
+ "tailwindcss": "3.x"
+ }
+ },
"node_modules/tailwindcss": {
"version": "3.4.3",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.3.tgz",
diff --git a/package.json b/package.json
index b52e5bf..b06cd0b 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
"react-otp-input": "^3.1.1",
"sonner": "^1.4.41",
"tailwind-merge": "^2.2.2",
+ "tailwind-scrollbar": "^3.1.0",
"tailwindcss-animate": "^1.0.7",
"zod": "^3.22.4",
"zustand": "^4.5.2"
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 8c39226..037f70f 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -33,6 +33,8 @@ const config = {
green: "#006400",
lightGreen: "#06d6a0",
blue: "#003aa3",
+ blue2: "#3b82f6",
+ blue3: "#0ea5e9",
bgmain: "#f5f7fa",
border: "hsl(var(--border))",
input: "hsl(var(--input))",
@@ -89,7 +91,7 @@ const config = {
},
},
},
- plugins: [require("tailwindcss-animate")],
+ plugins: [require("tailwindcss-animate"), require('tailwind-scrollbar')],
} satisfies Config;
export default config;
diff --git a/utils/CitizenReport.ts b/utils/CitizenReport.ts
new file mode 100644
index 0000000..ae62f31
--- /dev/null
+++ b/utils/CitizenReport.ts
@@ -0,0 +1,20 @@
+import axios from "axios";
+import { CookieValueTypes } from "cookies-next";
+
+axios.defaults.baseURL = process.env.NEXT_PUBLIC_BASE_URL_APP;
+// axios.defaults.baseURL = "https://shahrbinapi.shetabdahi.ir/";
+
+// Get Captcha
+export async function getLocation() {
+ const data = await axios.get(`/api/CitizenReport/Locations`, {
+ });
+ return data.data;
+}
+
+export async function resendOtp(payload: { otpToken: string | any}) {
+ const data = await axios.post(
+ `/api/Authenticate/ResendOtp`,
+ payload
+ );
+ return data.data;
+}