Compare commits

..

No commits in common. "master" and "Kahdooei" have entirely different histories.

12 changed files with 22 additions and 19 deletions

View File

@ -7,7 +7,7 @@ import { boxItems, newsItems } from "@/constants";
import Image from "next/image"; import Image from "next/image";
import { cn, convertDate } from "@/lib/utils"; import { cn, convertDate } from "@/lib/utils";
import Link from "next/link"; import Link from "next/link";
import bgimg2 from "../../public/img/bg-slide2.jpg"; import bgimg from "../../public/img/bg-slide.jpg";
import Footer from "@/components/Footer"; import Footer from "@/components/Footer";
// Import Swiper React components // Import Swiper React components
@ -103,7 +103,7 @@ export default function Landing() {
<SwiperSlide key={item.id}> <SwiperSlide key={item.id}>
<Image <Image
alt="bg" alt="bg"
src={bgimg2} src={bgimg}
// width={20} // width={20}
// height={20} // height={20}
quality={100} quality={100}
@ -127,7 +127,7 @@ export default function Landing() {
className="group bg-white border shadow-md rounded-lg p-10 h-64 w-1/2 flex items-end justify-center z-10 relative className="group bg-white border shadow-md rounded-lg p-10 h-64 w-1/2 flex items-end justify-center z-10 relative
hover:bg-blue transition-all duration-700 ease-in-out text-center hover:bg-blue transition-all duration-700 ease-in-out text-center
hover:flex-col-reverse hover:justify-evenly hover:items-center hover:cursor-pointer hover:flex-col-reverse hover:justify-evenly hover:items-center hover:cursor-pointer
max-lg:w-1/2 max-lg:h-52 max-md:w-1/2 max-md:h-40 max-lg:w-52 max-lg:h-52 max-md:w-40 max-md:h-40
max-lg:p-8 max-md:p-5 max-sm:p-2 hover:max-lg:p-2 max-lg:p-8 max-md:p-5 max-sm:p-2 hover:max-lg:p-2
max-md:shadow-[0px_0px_8px_0px_#00000040] max-md:shadow-[0px_0px_8px_0px_#00000040]
" "

View File

@ -14,16 +14,13 @@ import { useQuery } from "@tanstack/react-query";
export default function CallUs(props: any) { export default function CallUs(props: any) {
const { position, zoom } = props; const { position, zoom } = props;
//query
const { data, isLoading, isError, refetch } = useQuery({ const { data, isLoading, isError, refetch } = useQuery({
queryKey: ["WebContents", "CallUs"], queryKey: ["WebContents", "CallUs"],
queryFn: () => getSingleWebContents("CallUs"), queryFn: () => getSingleWebContents("CallUs"),
refetchOnWindowFocus: false, refetchOnWindowFocus: false,
}); });
console.log(data);
const fetchedContent = data?.content || ""; const fetchedContent = data?.content || "";
return ( return (
<div className="bg-white dark:bg-gray-900 pt-8 3xl:w-[60%] w-[80%] "> <div className="bg-white dark:bg-gray-900 pt-8 3xl:w-[60%] w-[80%] ">
<div className="w-full"> <div className="w-full">

View File

@ -123,6 +123,7 @@ export default function InspectorOperations({
useEffect(() => { useEffect(() => {
if (charCount != 0) { if (charCount != 0) {
setCharCount(form.watch("text")?.length); setCharCount(form.watch("text")?.length);
console.log(charCount);
} }
}, [form.watch("text")]); }, [form.watch("text")]);

View File

@ -221,6 +221,7 @@ export default function RequestStep2() {
}, [form.watch("description")]); }, [form.watch("description")]);
function onSubmit(data: z.infer<typeof FormSchema>) { function onSubmit(data: z.infer<typeof FormSchema>) {
console.log(data);
const formData = new FormData(); const formData = new FormData();
formData.append("Title", data.title); formData.append("Title", data.title);
formData.append("Text", data.description); formData.append("Text", data.description);
@ -280,7 +281,7 @@ export default function RequestStep2() {
}; };
return ( return (
<div className="w-full h-full pt-12 pb-3 sm:w-2/3 md:w-2/4 max-sm:p-8"> <div className="w-full h-full pt-12 sm:w-2/3 md:w-2/4 max-sm:p-8">
<div className="flex flex-col justify-center h-full space-y-3 md:space-y-3"> <div className="flex flex-col justify-center h-full space-y-3 md:space-y-3">
<span className="text-sm font-bold leading-tight tracking-tight md:text-base text-blue dark:text-white"> <span className="text-sm font-bold leading-tight tracking-tight md:text-base text-blue dark:text-white">
ارسال گزارش ارسال گزارش
@ -535,6 +536,9 @@ export default function RequestStep2() {
]) ])
).values() ).values()
); );
console.log(uniqueFiles);
console.log(newMergedArray);
setFile(uniqueFiles); setFile(uniqueFiles);
field.onChange(uniqueFiles); field.onChange(uniqueFiles);
} else if (!file && e.target.files) { } else if (!file && e.target.files) {

View File

@ -9,7 +9,7 @@ import { IoArrowDown } from "react-icons/io5";
export default function SubmitRequest() { export default function SubmitRequest() {
return ( return (
<div className=" mx-auto max-sm:pb-6 pb-20"> <div className=" mx-auto pb-24">
<div className=" border my-6 mx-auto py-3 px-4 rounded-lg"> <div className=" border my-6 mx-auto py-3 px-4 rounded-lg">
<p className="text-sm font-normal text-right text-black"> <p className="text-sm font-normal text-right text-black">
درباره سامانه عیون درباره سامانه عیون
@ -19,9 +19,9 @@ export default function SubmitRequest() {
<div className=" w-full flex flex-row gap-12 max-lg:flex-col-reverse items-center"> <div className=" w-full flex flex-row gap-12 max-lg:flex-col-reverse items-center">
<div className="w-1/3 flex flex-col justify-between gap-8 max-lg:w-full"> <div className="w-1/3 flex flex-col justify-between gap-8 max-lg:w-full">
<p className="font-normal text-sm leading-6 text-justify text-black line-clamp-5 tracking-wider max-sm:pr-0 "> <p className="font-normal text-sm leading-6 text-justify text-black line-clamp-5 tracking-wider max-sm:pr-0 ">
این سامانه با هدف بررسی درخواست های مردمی و شکایت های ایشان از پرسنل این سامانه با هدف بررسی گزارش های مردمی و شکایت های ایشان از پرسنل
شهرداری و رسیدگی به آن ایجاد شده است. فلوچارت روبرو نحوه ارسال شهرداری و رسیدگی به آن ایجاد شده است. فلوچارت روبرو نحوه ارسال گزارش
درخواست و پیگیری آن را مشاهده می کنید. و پیگیری آن را مشاهده می کنید.
</p> </p>
<Link <Link
href="/RequestStep2" href="/RequestStep2"

View File

@ -35,7 +35,7 @@ const PrintPage: React.FC<PrintPageProps> = ({
return ( return (
<div <div
ref={contentRef} ref={contentRef}
className="w-screen h-screen border-2 border-spacing-6 p-36 bg-slate-200 bg-[url('/img/bg-print2.jpg')] bg-no-repeat bg-bottom bg-cover font-[yekan]" className="w-screen h-screen border-2 border-spacing-6 p-36 bg-slate-200 bg-[url('/img/bg-print.jpg')] bg-no-repeat bg-bottom bg-cover font-[yekan]"
dir="rtl" dir="rtl"
> >
<div className="flex flex-col absolute top-[125px] left-[104px] text-xs gap-1"> <div className="flex flex-col absolute top-[125px] left-[104px] text-xs gap-1">

View File

@ -1,7 +1,7 @@
import { LuMapPin } from "react-icons/lu"; import { LuMapPin } from "react-icons/lu";
import { HiOutlineMail } from "react-icons/hi"; import { HiOutlineMail } from "react-icons/hi";
import { FiPhone } from "react-icons/fi"; import { FiPhone } from "react-icons/fi";
import bgimg from "../public/img/bg-slide2.jpg"; import bgimg from "../public/img/bg.png";
export const menuItems = [ export const menuItems = [
{ id: 1, name: "صفحه اصلی", href: "/" }, { id: 1, name: "صفحه اصلی", href: "/" },
@ -104,10 +104,10 @@ export const counterItems = [
]; ];
export const requestItems = [ export const requestItems = [
{ id: 1, name: "گزارش از طرف شهروند" }, { id: 1, name: "درخواست از طرف شهروند" },
{ id: 2, name: "دریافت کد رهگیری" }, { id: 2, name: "دریافت کد رهگیری" },
{ id: 3, name: "بررسی توسط بازرس شهرداری" }, { id: 3, name: "بررسی توسط بازرس شهرداری" },
{ id: 4, name: " اعلام نتیجه گزارش" }, { id: 4, name: " اعلام نتیجه درخواست" },
]; ];
export const aboutFooterItems = [ export const aboutFooterItems = [

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "sootzani", "name": "sootzani",
"version": "0.2.5", "version": "0.2.4",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "sootzani", "name": "sootzani",
"version": "0.2.5", "version": "0.2.4",
"dependencies": { "dependencies": {
"@hookform/resolvers": "^3.3.2", "@hookform/resolvers": "^3.3.2",
"@radix-ui/react-alert-dialog": "^1.0.5", "@radix-ui/react-alert-dialog": "^1.0.5",

View File

@ -1,6 +1,6 @@
{ {
"name": "sootzani", "name": "sootzani",
"version": "0.2.5", "version": "0.2.4",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 998 KiB

View File

@ -15,6 +15,7 @@ axios.interceptors.response.use(
return response; return response;
}, },
async function (error) { async function (error) {
console.log(error);
const originalRequest = error.config; const originalRequest = error.config;
if (error.response.status === 401) { if (error.response.status === 401) {