Compare commits

..

No commits in common. "e3c4d1ebf8a303a9e86fdf894e9d688069e0d17d" and "d39ca17f6128f590ac0ee6025279804256907558" have entirely different histories.

8 changed files with 34 additions and 13 deletions

View File

@ -1,12 +1,15 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Inter } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { Toaster } from "@/components/ui/toaster"; import { Toaster } from "@/components/ui/toaster";
import Navbar from "@/components/Navbar"; import Navbar from "@/components/Navbar";
import NavbarSm from "@/components/NavbarSm";
import Provider from "../utils/Provider"; import Provider from "../utils/Provider";
import { Toaster as SonnerToaster } from "@/components/ui/sonner"; import { Toaster as SonnerToaster } from "@/components/ui/sonner";
import ProgressBarProviders from "@/components/ProgressBar"; import ProgressBarProviders from "@/components/ProgressBar";
import { unstable_noStore as noStore } from "next/cache"; import { unstable_noStore as noStore } from "next/cache";
import { EnvScript, PublicEnvScript } from "next-runtime-env"; import { EnvScript, PublicEnvScript } from "next-runtime-env";
const inter = Inter({ subsets: ["latin"] });
export const metadata: Metadata = { export const metadata: Metadata = {
title: "عیون", title: "عیون",

View File

@ -159,18 +159,17 @@ export default function ComplainsDetails({
<AlertDialogContent dir="rtl" className=""> <AlertDialogContent dir="rtl" className="">
<AlertDialogHeader dir="rtl"> <AlertDialogHeader dir="rtl">
<AlertDialogTitle dir="rtl">رمز عبور</AlertDialogTitle> <AlertDialogTitle dir="rtl">رمز عبور</AlertDialogTitle>
<AlertDialogDescription className=" w-full mx-auto"> <AlertDialogDescription>
برای مشاهده درخواست رمز عبور خود را وارد نمایید. برای مشاهده درخواست پسورد خود را وارد نمایید.
</AlertDialogDescription> </AlertDialogDescription>
</AlertDialogHeader> </AlertDialogHeader>
<div className="grid items-center gap-1.5 w-full px-10 mx-auto"> <div className="grid items-center gap-1.5 w-full max-w-sm mx-auto">
{/* <Label htmlFor="picture">Picture</Label> */} {/* <Label htmlFor="picture">Picture</Label> */}
<Input <Input
dir="ltr" dir="rtl"
id="picture" id="picture"
autoFocus
onChange={(e) => setPassword(e.target.value)} onChange={(e) => setPassword(e.target.value)}
className="bg-white hover:bg-white focus:bg-white text-center" className="bg-white hover:bg-white focus:bg-white"
/> />
</div> </div>
<AlertDialogFooter className=" gap-y-2 max-md:w-full max-md:flex max-md:flex-col"> <AlertDialogFooter className=" gap-y-2 max-md:w-full max-md:flex max-md:flex-col">

View File

@ -11,6 +11,7 @@ import { postComplaintTracking } from "@/utils/citizenApi";
import { useMutation } from "@tanstack/react-query"; import { useMutation } from "@tanstack/react-query";
import { useReactToPrint } from "react-to-print"; import { useReactToPrint } from "react-to-print";
import "../app/print-styles.css";
import ComplainsDetails from "./ComplainsDetails"; import ComplainsDetails from "./ComplainsDetails";
import { toast } from "sonner"; import { toast } from "sonner";
import { ArrowRight } from "lucide-react"; import { ArrowRight } from "lucide-react";

View File

@ -149,7 +149,25 @@ export default function RequestStep1() {
</FormItem> </FormItem>
)} )}
/> />
<FormField
control={form.control}
name="nationalId"
render={({ field }) => (
<FormItem className="w-full sm:w-[48%]">
<FormLabel className="text-[#7C838A] text-sm font-medium mt-7">
کد ملی
</FormLabel>
<FormControl>
<Input
type="text"
placeholder="کد ملی خود را وارد نمایید "
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
</div> </div>
<div className="flex justify-center w-full gap-2 mt-8 sm:justify-end"> <div className="flex justify-center w-full gap-2 mt-8 sm:justify-end">

View File

@ -20,7 +20,7 @@ const PrintPage: React.FC<PrintPageProps> = ({
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]" 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 dangerouslySetInnerHTML={{ __html: fetchedContent }} className=" mt-16 text-justify" /> <div dangerouslySetInnerHTML={{ __html: fetchedContent }} className=" " />
<p > <p >
کد پیگیری : <span>{trackingNumber}</span> کد پیگیری : <span>{trackingNumber}</span>

View File

@ -70,7 +70,7 @@ const AlertDialogFooter = ({
}: React.HTMLAttributes<HTMLDivElement>) => ( }: React.HTMLAttributes<HTMLDivElement>) => (
<div <div
className={cn( className={cn(
"flex flex-row justify-center sm:justify-end px-10 pb-6 sm:pb-12 ", "flex flex-row justify-center sm:justify-end px-14 pb-6 sm:pb-12 ",
className className
)} )}
{...props} {...props}
@ -96,7 +96,7 @@ const AlertDialogDescription = React.forwardRef<
>(({ className, ...props }, ref) => ( >(({ className, ...props }, ref) => (
<AlertDialogPrimitive.Description <AlertDialogPrimitive.Description
ref={ref} ref={ref}
className={cn("text-sm text-muted-foreground flex flex-col items-start text-justify px-10 py-4 sm:pt-9 ", className)} className={cn("text-sm text-muted-foreground flex flex-col items-start text-justify px-10 py-4 sm:px-28 sm:pt-9 ", className)}
{...props} {...props}
/> />
)) ))

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "sootzani", "name": "sootzani",
"version": "0.1.20", "version": "0.1.16",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "sootzani", "name": "sootzani",
"version": "0.1.20", "version": "0.1.16",
"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.1.20", "version": "0.1.16",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",