From ac3fdf7be9982e65d8f83a20bc487f8dd62e3bfc Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Wed, 22 Feb 2023 23:36:47 +0700 Subject: fix --- src/lib/address/components/CreateAddress.jsx | 58 +++++++++++++++++---- src/lib/address/components/EditAddress.jsx | 58 +++++++++++++++++---- src/lib/auth/api/editPersonalProfileApi.js | 6 +-- src/lib/auth/components/Login.jsx | 27 ++++++++-- src/lib/auth/components/Register.jsx | 17 +++++-- src/lib/brand/components/BrandCard.jsx | 6 ++- src/lib/cart/components/Cart.jsx | 10 +++- src/lib/checkout/components/Checkout.jsx | 33 +++++++++--- src/lib/checkout/components/FinishCheckout.jsx | 38 +++++++------- src/lib/home/components/HeroBanner.jsx | 6 ++- src/lib/home/components/PopularProduct.jsx | 7 ++- src/lib/home/components/PreferredBrand.jsx | 6 ++- src/lib/invoice/components/Invoice.jsx | 5 +- src/lib/invoice/components/Invoices.jsx | 31 +++++++++--- src/lib/product/components/ProductFilter.jsx | 22 ++++++-- src/lib/product/components/ProductSearch.jsx | 13 ++++- src/lib/product/components/ProductSlider.jsx | 10 +++- src/lib/transaction/components/Transaction.jsx | 61 +++++++++++++++++++---- src/lib/transaction/components/Transactions.jsx | 49 ++++++++++++++---- src/lib/variant/components/VariantGroupCard.jsx | 6 ++- src/lib/wishlist/api/createOrDeleteWishlistApi.js | 12 +++-- src/lib/wishlist/components/Wishlists.jsx | 16 ++++-- src/lib/wishlist/hooks/useWishlist.js | 4 +- 23 files changed, 396 insertions(+), 105 deletions(-) (limited to 'src/lib') diff --git a/src/lib/address/components/CreateAddress.jsx b/src/lib/address/components/CreateAddress.jsx index 62bb0858..849b4c01 100644 --- a/src/lib/address/components/CreateAddress.jsx +++ b/src/lib/address/components/CreateAddress.jsx @@ -88,20 +88,34 @@ const CreateAddress = () => { } return ( -
+
} + render={(props) => ( + + )} />
{errors.type?.message}
- +
{errors.name?.message}
@@ -118,7 +132,12 @@ const CreateAddress = () => {
- +
{errors.mobile?.message}
@@ -135,7 +154,12 @@ const CreateAddress = () => {
- +
{errors.zip?.message}
@@ -144,7 +168,12 @@ const CreateAddress = () => { } + render={(props) => ( + + )} />
{errors.city?.message}
@@ -155,7 +184,11 @@ const CreateAddress = () => { name='district' control={control} render={(props) => ( - + )} /> @@ -166,12 +199,19 @@ const CreateAddress = () => { name='subDistrict' control={control} render={(props) => ( - + )} /> - diff --git a/src/lib/address/components/EditAddress.jsx b/src/lib/address/components/EditAddress.jsx index 0cfa013a..a832edbc 100644 --- a/src/lib/address/components/EditAddress.jsx +++ b/src/lib/address/components/EditAddress.jsx @@ -102,20 +102,34 @@ const EditAddress = ({ id, defaultValues }) => { } return ( -
+
} + render={(props) => ( + + )} />
{errors.type?.message}
- +
{errors.name?.message}
@@ -132,7 +146,12 @@ const EditAddress = ({ id, defaultValues }) => {
- +
{errors.mobile?.message}
@@ -149,7 +168,12 @@ const EditAddress = ({ id, defaultValues }) => {
- +
{errors.zip?.message}
@@ -158,7 +182,12 @@ const EditAddress = ({ id, defaultValues }) => { } + render={(props) => ( + + )} />
{errors.city?.message}
@@ -169,7 +198,11 @@ const EditAddress = ({ id, defaultValues }) => { name='district' control={control} render={(props) => ( - + )} /> @@ -180,12 +213,19 @@ const EditAddress = ({ id, defaultValues }) => { name='subDistrict' control={control} render={(props) => ( - + )} /> - diff --git a/src/lib/auth/api/editPersonalProfileApi.js b/src/lib/auth/api/editPersonalProfileApi.js index af2ad4b2..39cd44c1 100644 --- a/src/lib/auth/api/editPersonalProfileApi.js +++ b/src/lib/auth/api/editPersonalProfileApi.js @@ -1,5 +1,5 @@ -import odooApi from "@/core/api/odooApi" -import { getAuth } from "@/core/utils/auth" +import odooApi from '@/core/api/odooApi' +import { getAuth } from '@/core/utils/auth' const editPersonalProfileApi = async ({ data }) => { const auth = getAuth() @@ -7,4 +7,4 @@ const editPersonalProfileApi = async ({ data }) => { return dataProfile } -export default editPersonalProfileApi \ No newline at end of file +export default editPersonalProfileApi diff --git a/src/lib/auth/components/Login.jsx b/src/lib/auth/components/Login.jsx index 01b2a571..b4e94e0a 100644 --- a/src/lib/auth/components/Login.jsx +++ b/src/lib/auth/components/Login.jsx @@ -37,7 +37,10 @@ const Login = () => { children: ( <> Email belum diaktivasi, - + aktivasi sekarang @@ -51,18 +54,29 @@ const Login = () => { return (
- Logo Indoteknik + Logo Indoteknik

Mulai Belanja Sekarang

Masuk ke akun kamu untuk belanja

{alert && ( - + {alert.children} )} -
+
{
Belum punya akun Indoteknik?{' '} - + Daftar
diff --git a/src/lib/auth/components/Register.jsx b/src/lib/auth/components/Register.jsx index df08541d..135972d3 100644 --- a/src/lib/auth/components/Register.jsx +++ b/src/lib/auth/components/Register.jsx @@ -26,7 +26,12 @@ const Register = () => { return (
- Logo Indoteknik + Logo Indoteknik

Daftar Akun Indoteknik

@@ -34,7 +39,10 @@ const Register = () => { Buat akun sekarang lebih mudah dan terverifikasi - +