Skip to content

Commit

Permalink
Merge pull request #98 from monika8848/monika-dev
Browse files Browse the repository at this point in the history 
UI fixes in all pages
  • Loading branch information
@Shadab-khan207
Shadab-khan207 authored Oct 3, 2023
2 parents 8cb20c3 + da0128a commit f50daaf
Show file tree
Hide file tree
Showing 23 changed files with 318 additions and 185 deletions.
47 changes: 32 additions & 15 deletions cards/MyOrderCard.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
return (
<>
<div key={data.id}>
<div className="card-header pb-1 ">
<div className="row pb-0">
<div className="card-header ">
<div className="row pb-0 pt-1 pb-1 myorder-header-pt" >
<div className=" mb-sm-0 col-md-2 col-6 order-div">
<p className="text-uppercase gray myorder_p">
{selectedMultiLangData?.order_placed}
Expand Down Expand Up @@ -92,8 +92,25 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
</div>
))}
</div>
<div className="text-end col-md-6 col-8 order-cards">
<p className="mb-0 myorder_p d-inline-flex justify-content-end">
<div className="text-end col-md-4 col-4 order-cards ">
<p className="myorder_p pt-2">
{selectedMultiLangData?.orders} # {data?.name}
</p>
</div>

<div className="col-md-2 col-4 text-end" >
<div className=" text-center " >
<div className="flex-fill detail_link text-capitalize b2c_btn btn_order_detail fs-13" >
<Link href={`myOrder/${data?.name}`} legacyBehavior>
<a href={`myOrder/${data?.name}`} className=" color-detail fs-13 btn-orderdetail-mob" >
{selectedMultiLangData?.order_details}
</a>
</Link>
</div>
</div>
</div>
{/* <div className="text-end col-md-4 col-4 order-cards">
<p className=" myorder_p pt-2">
{selectedMultiLangData?.orders}
<span># {data?.name}</span>
</p>
Expand All @@ -107,15 +124,15 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
</Link>
</div>
</div>
</div>
</div> */}
</div>
</div>
{data?.order_details?.map((detail: any) => (
<div
className="cart_item cart_item-myorder-m card-body order_cartdetails"
key={detail?.item_name}
>
<div className="d-flex pb-0" >
<div className="d-flex mb-2 pb-0" >
<div className="flex-fill">
<h6 className="green text-capitalize bold mb-0 mt-2 order-ptag d-inline-flex">
<div>{selectedMultiLangData?.status} </div>
Expand All @@ -126,13 +143,13 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
</div>

<div className="d-flex align-items-center row">
<div className="mb-3 mb-sm-0 col-lg-2 col-md-2 col-4 mt-2">
<div className="mb-3 mb-sm-0 col-lg-2 col-md-2 col-4 mt-0">
<div className="product-img">
<img
src={`${CONSTANTS.API_BASE_URL}/${
detail?.img !== null ? detail?.img : detail?.brand_img
}`}
className="product_img img-fluid orderdetail_img"
className="product_img img-fluid orderdetail_img cart-image"
alt="product-img"
/>
</div>
Expand Down Expand Up @@ -261,13 +278,13 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
)}

{isDealer ? (
<div className="text-end col-lg-2 col-md-2 col-12">
<button className=" order_links mb-2 d-block text-uppercase">
<div className="col-lg-2 col-md-2 col-12 view-product-link-b2c">
<button className=" order_links mb-2 d-block text-uppercase b2c_btn view-product-link-b2c">
<Link
href={`${detail?.product_url}?currency=${currency_state_from_redux?.selected_currency_value}`}
legacyBehavior
>
<a className="orderdetails_btn">
<a className="color-blue">
{" "}
{selectedMultiLangData?.view_product}
</a>
Expand All @@ -276,14 +293,14 @@ const MyOrderCard = ({ data, selectedMultiLangData }: any) => {
</div>
) : (
<>
<div className=" col-lg-2"></div>
<div className="text-end col-lg-2 col-md-2 col-12">
<button className=" order_links mb-2 d-block text-uppercase">

<div className="col-lg-2 col-md-2 col-12 view-product-link-b2c">
<button className=" order_links mb-2 d-block text-uppercase b2c_btn view-product-link-b2c">
<Link
href={`${detail?.product_url}?currency=${currency_state_from_redux?.selected_currency_value}`}
legacyBehavior
>
<a className="orderdetails_btn">
<a className="color-blue">
{" "}
{selectedMultiLangData?.view_product}
</a>
Expand Down
21 changes: 11 additions & 10 deletions components/CartListing.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,20 +163,21 @@ const CartListing = () => {
) : (
<>
{Object.keys(cartListingItems).length > 0 ? (
<div className="cart-ps-container">
<div className="cart-ps-container pb-0 mb-0">
<div className="row">
<div className="col-9">
<div className="cart_heading mb-3">
<h2 className=" shopping-cart-heading products-name pb-4">
<div className="page_heading">
<h4 className=" mb-0"
>
{selectedMultiLangData?.shopping_cart}
</h2>
</h4>
</div>
</div>

<div className="col-3 d-flex justify-content-end">
<p className="checkbox-cursor product-font-family">
<p className="checkbox-cursor product-font-family mb-0 pb-0 mt-1">
<a
className="clear_cart bold"
className="clear_cart bold mb-0"
onClick={() => ClearCartHandle(cartListingItems.name)}
>
{selectedMultiLangData?.clear_cart}
Expand Down Expand Up @@ -288,7 +289,7 @@ const CartListing = () => {
<>
<div key={index} className="border ">
<div className="container">
<h3 className="mt-2 text-decoration-underline products-name category-name-font">
<h3 className="mt-2 text-decoration-underline products-name category-name-font" >
{category.category}
</h3>

Expand Down Expand Up @@ -396,7 +397,7 @@ const CartListing = () => {

<hr />
<div className="container mb-0 pb-0">
<div className="col-12">
<div className="col-12 pb-0 mb-0">
<div className="row justify-content-start product-font">
<div className="col-md-6 note-line-height">
<h5>{selectedMultiLangData?.note}:-</h5>
Expand All @@ -423,7 +424,7 @@ const CartListing = () => {
{selectedMultiLangData?.sub_total}{" "}
</div>
:
<div className="col-lg-3 col-6 text-end price_font_family products-name bold">
<div className="col-lg-3 col-6 price_font_family products-name bold">
{
cartListingItems?.categories[0]?.orders[0]
?.currency_symbol
Expand Down Expand Up @@ -527,7 +528,7 @@ const CartListing = () => {
</div>
</div>

<hr />
{/* <hr /> */}
</div>
</div>
) : (
Expand Down
13 changes: 8 additions & 5 deletions components/Catalog/CatalogListCard.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,17 @@ const CatalogListCard = ({
console.log(catalogListItem, "catalogListItem");
return (
<>
<div className="row mb-5 d-flex justify-content-center ">
<div className="col-lg-7 catalog-wrapper text-center">
<h3 className="text-center text-captilize pb-2 products-name">
<div className="row mt-5 mb-0 d-flex justify-content-center mx-auto pb-0" >
<div className="col-lg-7 catalog-wrapper text-center " >

<h4 className="text-captilize pb-2 color-black fs-20" >
{selectedMultiLangData?.catalog_list}
</h3>
</h4>


{catalogListItem?.length > 0 &&
catalogListItem?.map((catalog: any, i: any) => (
<div className="col-md-12 col-lg-12 mt-4 " key={i}>
<div className="col-md-12 col-lg-12 mt-4 mb-0 " key={i}>
<div className="card catalogListing-card rounded-3 mb-5">
<div className="card-header catalogListing-cardHeader d-flex justify-content-between">
<h5 className="text-uppercase catalog-heading">
Expand Down
9 changes: 6 additions & 3 deletions components/Catalog/CreateCatalog.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ const CreateCatalog = ({
}: any) => {
return (
<>
<div className="d-flex justify-content-center">
<div className="d-flex justify-content-center ms-5" >
<div className="col-lg-7 text-center">
<div className="row mx-auto">
<h3 className="text-center text-captilize pb-4">
<div className=" text-center page_heading">
<h4 className=" my-0" >
{selectedMultiLangData?.create_catalog}
</h3>
</h4>
</div>

<div className="col-lg-8 col-12 px-0 d-flex justify-content-center">
<input
type="text"
Expand Down
8 changes: 4 additions & 4 deletions components/CheckoutPageComponent/CheckoutPageMaster.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ const CheckoutPageMaster = () => {

console.log("visitor state", currencySymbolForSummary);
return (
<div className="container margin_from_nav_checkout mb-5">
<div className="container margin_from_nav">
{isBreakpoint ? (
<>
<div className="ps-4 checkout_web_heading ">
<h3 className="products-name">{selectedMultiLangData?.checkout_page}</h3>
<hr />
<div className="page_heading ps-4 ms-1" >
<h4 className="color-black mb-0">{selectedMultiLangData?.checkout_page}</h4>
{/* <hr /> */}
</div>
<WebCheckout
shippingAddresses={shippingAddresses}
Expand Down
8 changes: 4 additions & 4 deletions components/CheckoutPageComponent/HandleOrderSection.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ const HandleOrderSection = (props: any) => {
<div className="accordion" id="accordionExample">
{CONSTANTS.ENABLE_APPLY_COUPON_CODE ? (
<>
<div className="accordion-item border-0">
<div className="accordion-item border-0" >
<h2 className="accordion-header" id="headingOne">
<button
className="accordion-button collapsed pt-4 px-2 pb-2 fs-4 ms-1 accorder-btn-plus"
className="accordion-button collapsed pt-3 px-2 pb-1 fs-4 ms-0 accorder-btn-plus"
type="button"
data-bs-toggle="collapse"
data-bs-target="#collapseOne"
Expand Down Expand Up @@ -129,7 +129,7 @@ const HandleOrderSection = (props: any) => {
<div className="accordion-item border-0">
<h2 className="accordion-header" id="headingTwo">
<button
className="accordion-button collapsed pt-4 fs-4 px-2 ms-1 accorder-btn-plus"
className="accordion-button collapsed pt-3 fs-4 ms-0 ps-2 accorder-btn-plus"
type="button"
data-bs-toggle="collapse"
data-bs-target="#collapseTwo"
Expand Down Expand Up @@ -162,7 +162,7 @@ const HandleOrderSection = (props: any) => {
</form>
<button
type="button"
className="btn btn-sm transparent custom-btn d-block w-100 standard-btn btn-fancy mt-2"
className="btn btn-sm transparent custom-btn d-block w-100 standard-btn btn-fancy my-2"
onClick={(e: any) => handleStoreCredit(e)}
>
{selectedMultiLangData?.use_store_credit}
Expand Down
4 changes: 2 additions & 2 deletions components/DealerLedger/DealerAccounting.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ const DealerAccounting = ({
}: any) => {
return (
<>
<div className="container mt-0 mb-0 delaer-leader-container" >
<div className="container mt-0 mb-0 delaer-leader-container " >
<div className="row justify-content-center">
<div className="page_heading">
<h4 className="dealer-heading text-captilize color-black p-0 m-0" >Dealer Ledger</h4>
<h4 className="my-0" >Dealer Ledger</h4>
</div>
<div className="col-lg-3 card border-dark mx-2 mt-0 px-0 mb-2 color-black" >
<div className="card-header text-center fs-3 color-black">
Expand Down
16 changes: 8 additions & 8 deletions components/DealerLedger/DealerLedger.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const DealerLedger = () => {
dealerLedgerSummary={dealerLedgerSummary}
selectedMultiLangData={selectedMultiLangData}
/>
<div className="row justify-content-center dealer-ledger-container mt-0 pt-0 products-name dealer-account-container">
<div className="row justify-content-center dealer-ledger-container mt-0 pt-0 color-black dealer-account-container">
<div className="col-lg-8">
<div className="row m-lg-5">
<div className="col-lg-4 col-6 mt-0 pt-0 mb-0 pb-0">
Expand All @@ -96,17 +96,17 @@ const DealerLedger = () => {
</div>
</div>
<div className="col-lg-6 col-6">
<div className="fs-3 bold products-name">
<div className="fs-3 bold color-black">
{dealerLedgerSummary?.party_name}
</div>
</div>
</div>
<div className="row mx-lg-5 mt-0 products-name">
<div className="row mx-lg-5 mt-0 color-black">
<div className="col-lg-4 col-4 mb-0 pb-0 mt-0 pt-0 d-inline-flex justify-content-around">
<div className="w-25">
<input
type="radio"
className="form-check-input products-name"
className="form-check-input color-black"
id="radio1"
name="optradio"
value="option1"
Expand All @@ -116,7 +116,7 @@ const DealerLedger = () => {
</div>
<div className="w-75">
<label
className="form-check-label products-name"
className="form-check-label color-black"
htmlFor="radio1"
>
{selectedMultiLangData?.month}
Expand Down Expand Up @@ -144,12 +144,12 @@ const DealerLedger = () => {
</select>
</div>
</div>
<div className="row mx-lg-5 my-2 products-name">
<div className="row mx-lg-5 my-2 color-black">
<div className="col-lg-4 col-4 mt-lg-2 d-inline-flex justify-content-around">
<div className="w-25">
<input
type="radio"
className="form-check-input products-name"
className="form-check-input color-black"
id="radio2"
name="optradio"
value="option1"
Expand All @@ -158,7 +158,7 @@ const DealerLedger = () => {
</div>
<div className="w-75">
<label
className="form-check-label text-start products-name"
className="form-check-label text-start color-black"
htmlFor="radio1"
>
{selectedMultiLangData?.date_range}
Expand Down
Loading

0 comments on commit f50daaf

Please sign in to comment.