From a7b1da36fd629e36142b43614d4c776da5023e5a Mon Sep 17 00:00:00 2001 From: mahdi Date: Tue, 21 Jun 2022 12:13:54 +0430 Subject: [PATCH] worked | 150 --- src/views/Address/index.js | 20 ++++++---- .../Dashboard/layouts/Main/Addresses/index.js | 39 +++++++------------ .../layouts/Mobile/ProfileAddress/index.js | 5 ++- src/views/DeliveryForm/Address/index.js | 3 +- 4 files changed, 32 insertions(+), 35 deletions(-) diff --git a/src/views/Address/index.js b/src/views/Address/index.js index 1d8b4ce..c23d643 100644 --- a/src/views/Address/index.js +++ b/src/views/Address/index.js @@ -58,7 +58,11 @@ export const Address = ({ if (editPage || profilePage) { setHeaderOptions(headerOptions); } else { - setHeaderOptions({ shown: true, back: true, title: "آدرس جدید" }); + setHeaderOptions({ + shown: true, + back: true, + title: "آدرس", + }); } } if (editPage) { @@ -293,7 +297,7 @@ export const Address = ({
{!profilePage && ( @@ -365,24 +369,24 @@ export const Address = ({ className={`flex flex-row items-center mb-7 cursor-pointer `} onClick={() => { - setActiveCheckbox(false); + setActiveCheckbox(true); }} >
-

برای خودم

+

برای خودم

{/* someone else */}
{ - setActiveCheckbox(true); + setActiveCheckbox(false); }} // onClick={() => { // setActiveCheckbox(!activeCheckbox); @@ -391,9 +395,9 @@ export const Address = ({
{" "} + >

گیرنده فرد دیگری است

diff --git a/src/views/Dashboard/layouts/Main/Addresses/index.js b/src/views/Dashboard/layouts/Main/Addresses/index.js index d31189d..d49487c 100644 --- a/src/views/Dashboard/layouts/Main/Addresses/index.js +++ b/src/views/Dashboard/layouts/Main/Addresses/index.js @@ -32,6 +32,20 @@ const ProfileAddress = ({ return (
+
+ +
{addresses.map((address, index) => ( ))}
- {/* navigation("/createAddress", { state: { panel: true } })} - // action={() => {}} - position={{ right: isMobile ? "" : 350, bottom: 50 }} - /> */}
); }; -{ - /*
- -
*/ -} - const Location = ({ address, active, userId, isDark, update }) => { return ( <> - {/* */}
{ active ? {} : update({ userAddressId: address.id, userId }) } > -
+
{active && (
diff --git a/src/views/Dashboard/layouts/Mobile/ProfileAddress/index.js b/src/views/Dashboard/layouts/Mobile/ProfileAddress/index.js index ebeb9c3..59b1eab 100644 --- a/src/views/Dashboard/layouts/Mobile/ProfileAddress/index.js +++ b/src/views/Dashboard/layouts/Mobile/ProfileAddress/index.js @@ -1,5 +1,6 @@ import React from "react"; import { connect } from "react-redux"; + import { userAddress, userFactor, @@ -7,6 +8,7 @@ import { menu, dialog, } from "../../../../../redux/actions"; + import { Link, useNavigate } from "react-router-dom"; //components @@ -73,7 +75,6 @@ const ProfileAddress = ({ /> */} navigation("/createAddress", { state: { panel: true } })} - // action={() => {}} position={{ bottom: 100, left: 16 }} />
@@ -176,7 +177,7 @@ const Location = ({
)}
-
+
{"آدرس:" + " " + address.address} diff --git a/src/views/DeliveryForm/Address/index.js b/src/views/DeliveryForm/Address/index.js index 3eea76d..1a97c34 100644 --- a/src/views/DeliveryForm/Address/index.js +++ b/src/views/DeliveryForm/Address/index.js @@ -11,13 +11,13 @@ import trash from "../../../assets/icons/trash.svg"; function Address({ addresses, - isDark, isMobile, setPhase, update, userId, userAddressId, loading, + isDark, }) { const Location = ({ address, active }) => { return isMobile ? ( @@ -125,6 +125,7 @@ function Address({ ); }; + return isMobile ? (