From 9993d1f94f3ff75c0cd36225470afc670441c909 Mon Sep 17 00:00:00 2001
From: Reza_ashrafi <ashrafimiireza98@gmail.com>
Date: Sat, 9 Jul 2022 16:59:21 +0430
Subject: [PATCH] update src/views/Address/index.js, Main.js and Pagination.js

---
 src/views/Address/index.js                    | 50 ++++++++++---------
 src/views/Products/layouts/Desktop/Main.js    |  6 ++-
 .../Products/layouts/Desktop/Pagination.js    |  4 +-
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/views/Address/index.js b/src/views/Address/index.js
index 5fcc06b..c6ed856 100644
--- a/src/views/Address/index.js
+++ b/src/views/Address/index.js
@@ -301,7 +301,7 @@ export const Address = ({
   return (
     <div
       className={`flex flex-col lg:flex-row-reverse px-4 flex-1 lg:pt-0 pb-20 gap-5 lg:divide-x lg:divide-solid lg:divide-gray-200 ${
-        location?.state?.panel === isMobile ? "mt-2" : "mt-32 px-10"
+        location?.state?.panel === isMobile ? "mt-2" : "lg:mt-32 lg:px-10"
       } `}
       // style={{ minHeight: "calc(100vh - 500px)" }}
     >
@@ -410,7 +410,7 @@ export const Address = ({
               )}
             />
 
-            <div className="flex flex-col lg:items-center lg:gap-5 w-full mb-4">
+            <div className="flex flex-col lg:items-center lg:flex-row lg:gap-5 w-full mb-4">
               <Input
                 width={isMobile ? "100%" : "50%"}
                 label={window.t("نام")}
@@ -457,7 +457,7 @@ export const Address = ({
               )}
             />
 
-            <div className="flex flex-col lg:items-center lg:gap-5 w-full  mb-4">
+            <div className="flex flex-col lg:flex-row lg:items-center lg:gap-5 w-full  mb-4">
               <Input
                 width={isMobile ? "100%" : "50%"}
                 label={window.t("شماره موبایل")}
@@ -526,7 +526,7 @@ export const Address = ({
           )}
         />
 
-        <div className="flex flex-col lg:items-center gap-3 lg:gap-5 w-full">
+        <div className="flex flex-col lg:mb-2 lg:flex-row lg:items-center gap-3 lg:gap-5 w-full">
           <Select
             selectProvince={"استان"}
             options={provinces.map((e) => ({ value: e.id, name: e.name }))}
@@ -585,25 +585,29 @@ export const Address = ({
             </div>
           )}
         </div>
-        <Input
-          width={isMobile ? "100%" : "50%"}
-          label={window.t("کد پستی")}
-          regex={(val) => onInput.numberOnly(val)}
-          name="postalCode"
-          value={
-            profilePage
-              ? profileFields.postalCode || user.postalCode
-              : addressFields?.postalCode
-          }
-          onChange={(name, value) =>
-            profilePage
-              ? setProfileFields({ ...profileFields, postalCode: value })
-              : onChange(name, value)
-          }
-          align="text-right"
-          direction="ltr"
-          maxLength={10}
-        />
+        <div className="flex flex-col lg:mb-1 lg:flex-row lg:items-center gap-3 lg:gap-5 w-full">
+          <Input
+            width={isMobile ? "100%" : "50%"}
+            label={window.t("کد پستی")}
+            regex={(val) => onInput.numberOnly(val)}
+            name="postalCode"
+            value={
+              profilePage
+                ? profileFields.postalCode || user.postalCode
+                : addressFields?.postalCode
+            }
+            onChange={(name, value) =>
+              profilePage
+                ? setProfileFields({ ...profileFields, postalCode: value })
+                : onChange(name, value)
+            }
+            align="text-right"
+            direction="ltr"
+            maxLength={10}
+          />
+          <div className="lg:w-1/2"></div>
+        </div>
+
         <div
           className={`flex ${
             profilePage ? "mt-10" : "lg:hidden"
diff --git a/src/views/Products/layouts/Desktop/Main.js b/src/views/Products/layouts/Desktop/Main.js
index 9e62659..9faa438 100644
--- a/src/views/Products/layouts/Desktop/Main.js
+++ b/src/views/Products/layouts/Desktop/Main.js
@@ -266,8 +266,10 @@ export const Main = ({
           <div className="w-full flex justify-center gap-x-2">
             {pages.map((e) => (
               <div
-                className={`w-8 p-2 text-sm text-center rounded-md text-green7B cursor-pointer transform translate ${
-                  page === true ? "bg-red-400" : "bg-blue-600"
+                className={`w-8 p-2 text-sm text-center rounded-md cursor-pointer transform translate ${
+                  page === e
+                    ? "bg-green-600 text-white"
+                    : "border border-solid border-green-600 text-green-600"
                 }`}
                 onClick={() => setPage(e)}
               >
diff --git a/src/views/Products/layouts/Desktop/Pagination.js b/src/views/Products/layouts/Desktop/Pagination.js
index 9d7495c..873bdc0 100644
--- a/src/views/Products/layouts/Desktop/Pagination.js
+++ b/src/views/Products/layouts/Desktop/Pagination.js
@@ -13,9 +13,9 @@ const Pagination = ({ postsPerPage, totalPosts, paginate }) => {
         {pageNumbers.map((number) => (
           <li
             key={number}
-            className="border border-blue-400 bg-blue-200 rounded-sm px-2 py-1"
+            className="border border-blue-400 bg-blue-200 rounded-sm px-2 py-1 text-white"
           >
-            <p onClick={() => paginate(number)} className="">
+            <p onClick={() => paginate(number)} className="text-white">
               {number}
             </p>
           </li>