update 7 files

temp
mahdi 3 years ago
parent b72f69dea5
commit b88a0ff41f
  1. 12
      src/views/AR/index.js
  2. 11
      src/views/Auth/Profile/index.js
  3. 4
      src/views/DeliveryForm/Address/index.js
  4. 10
      src/views/Orders/index.js
  5. 36
      src/views/Products/layouts/Desktop/Main.js
  6. 4
      src/views/ShoppingCart/index.js

@ -5,7 +5,15 @@ import Book from "./layouts/Book";
function AR({ getArList, arList, headerOptions, setHeaderOptions }) {
useEffect(() => {
setHeaderOptions(headerOptions);
setHeaderOptions({
logo: true,
hamburgerMenu: true,
qr: true,
title: false,
back: false,
shown: true,
menu: false,
});
getArList();
}, []);
@ -23,7 +31,7 @@ const mapStateToProps = (state) => ({
const mapDispatchToProps = {
getArList: publicApi.getArList,
setHeaderOptions : publicApi.setHeaderOptions,
setHeaderOptions: publicApi.setHeaderOptions,
};
export default connect(mapStateToProps, mapDispatchToProps)(AR);

@ -25,6 +25,7 @@ function Profile({
province,
provinceList,
cityList,
setHeaderOptions,
}) {
let navigate = useNavigate();
const [render, setRender] = useState(false);
@ -53,6 +54,15 @@ function Profile({
});
useEffect(() => {
setHeaderOptions({
logo: true,
hamburgerMenu: true,
qr: true,
title: false,
back: false,
shown: true,
menu: false,
});
getProvince();
getCity({ provinceId: profile.provinceId });
}, []);
@ -448,6 +458,7 @@ export default connect(
upload: file.upload,
getProvince: publicApi.getProvince,
getCity: publicApi.getCity,
setHeaderOptions: publicApi.setHeaderOptions,
}
)(Profile);

@ -131,7 +131,7 @@ function Address({
<strong className="font-bold text-green7B dark:text-white lg:text-tiny">
انتخاب آدرس
</strong>
<ul className="list-none p-0 m-0 flex flex-col mt-2">
<ul className="list-none p-0 m-0 flex flex-col gap-y-3">
{addresses.map((address, index) => (
<Location
address={address}
@ -158,7 +158,7 @@ function Address({
) : (
<section className="mt-0.5 w-full">
<strong className="font-medium dark:text-white">انتخاب آدرس</strong>
<ul className="list-none p-0 m-0 flex flex-col gap-y-10">
<ul className="list-none p-0 m-0 flex flex-col gap-y-2">
{addresses.map((address, index) => (
<Location
address={address}

@ -7,7 +7,15 @@ import bookImage from "../../assets/images/book-mini.svg";
function Orders({ orders = [], headerOptions, setHeaderOptions }) {
React.useEffect(() => {
setHeaderOptions(headerOptions);
setHeaderOptions({
logo: true,
hamburgerMenu: true,
qr: true,
title: false,
back: false,
shown: true,
menu: false,
});
}, []);
return (
<div className="flex flex-col px-4">

@ -1,7 +1,7 @@
import React, { useEffect, useState } from "react";
import { connect } from "react-redux";
import { Link } from "react-router-dom";
import { ScrollingCarousel } from "@trendyol-js/react-carousel";
import { ScrollingCarousel, Carousel } from "@trendyol-js/react-carousel";
import Product from "../../../../components/Product";
import VodProduct from "../../../../components/VodProduct";
@ -17,6 +17,7 @@ export const Main = ({
sortMethods,
filterOptions,
setFilterOptions,
isMobile,
}) => {
const [filterLoading, setFilterLoading] = useState(false);
@ -212,6 +213,7 @@ export const Main = ({
<div className="flex flex-col w-full relative">
{/* arrow */}
<div className="w-fit self-end flex flex-row items-center justify-between gap-x-2 px-2 py-1 bg-gray-50 border border-solid border-gray-200 rounded-md50">
{/* right arrow */}
<div className="cursor-pointer">
<img
src={dropdownIcon}
@ -221,6 +223,7 @@ export const Main = ({
</div>
{/* divider */}
<div className="w-0.5 h-6 bg-gray-200"></div>
{/* left arrow */}
<div className="cursor-pointer">
<img
src={dropdownIcon}
@ -238,14 +241,33 @@ export const Main = ({
<Loading size={4} color="bg-green-400" />
</div>
)}
<div>
<div style={{ height: 180 }}>
{(filterOptions?.productType
? filterOptions.productType === "دوره ویدئویی"
: true) && (
<ScrollingCarousel className="max-w-full">
{Items(2)}
</ScrollingCarousel>
)}
: true) &&
(isMobile ? (
<ScrollingCarousel
rightArrow={<div>{">"}</div>}
leftArrow={<div>{"<"}</div>}
className="max-w-full"
useArrowKeys={true}
>
{Items(2)}
</ScrollingCarousel>
) : (
<Carousel
show={4}
slide={2}
swiping={true}
useArrowKeys={true}
transition={0.5}
className="max-w-full h-[180px] h-full"
// useArrowKeys={true}
>
{" "}
{Items(2)}
</Carousel>
))}
</div>
<div className="w-full flex flex-row flex-wrap mt-0 border-t-2 border-solid border-gray-100 overflow-y-hidden gap-4 justify-evenly pt-3">
{Items(1)}

@ -245,7 +245,7 @@ function ShoppingCart({
/>
{phase !== "products" && (
<button
className="bg-transparent mt-4 text-base border bg-blueC0 text-white font-bold rounded-md py-3.5 flex flex-row justify-center items-center"
className="bg-transparent mt-4 text-base border border-blueC0 text-blueC0 font-bold rounded-md py-3.5 flex flex-row justify-center items-center"
onClick={() => setPhase("products")}
>
بازگشت
@ -375,7 +375,7 @@ function ShoppingCart({
/>
{phase === "deliveryForm" && (
<button
className="bg-transparent mt-4 text-base lg:text-tiny border bg-blueC0 text-white font-bold rounded-md py-3.5 lg:py-4 flex flex-row justify-center items-center"
className="bg-transparent mt-4 text-base lg:text-tiny border border-blueC0 text-blueC0 font-bold rounded-md py-3.5 lg:py-4 flex flex-row justify-center items-center"
onClick={() => setPhase("products")}
>
بازگشت

Loading…
Cancel
Save