Skip to content

Commit

Permalink
Update All Files
Browse files Browse the repository at this point in the history
  • Loading branch information
hhoomph committed Jan 1, 2020
1 parent e224325 commit a7fc4ed
Show file tree
Hide file tree
Showing 67 changed files with 857 additions and 655 deletions.
3 changes: 3 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# API_HOST = https://api.qaroon.ir/api/
API_HOST = https://api.qarun.ir/api/
Debug_HOST = http://localhost:3000/api/
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

# misc
.DS_Store
.env

npm-debug.log*
yarn-debug.log*
yarn-error.log*
Expand Down
6 changes: 3 additions & 3 deletions components/Activity/Product.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState, useEffect, useRef, memo } from 'react';
import Link from '../Link';
import { FaTimes } from 'react-icons/fa';
import React, { useState, useEffect, useRef, memo } from "react";
import Link from "../Link";
import { FaTimes } from "react-icons/fa";
const Product = props => {
const [hide, setHide] = useState(false);
return (
Expand Down
14 changes: 7 additions & 7 deletions components/Auth/Logout.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import nextCookie from 'next-cookies';
import cookie from 'js-cookie';
import Router from 'next/router';
import nextCookie from "next-cookies";
import cookie from "js-cookie";
import Router from "next/router";
const Logout = () => {
cookie.remove('accessToken');
cookie.remove('refreshToken');
cookie.remove("accessToken");
cookie.remove("refreshToken");
// to support logging out from all windows
window.localStorage.setItem('logout', Date.now());
Router.push('/login');
window.localStorage.setItem("logout", Date.now());
Router.push("/login");
};
export default Logout;
4 changes: 2 additions & 2 deletions components/Banner/Banner.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Fragment, useState, useEffect, memo } from 'react';
import Link from '../Link';
import React, { Fragment, useState, useEffect, memo } from "react";
import Link from "../Link";
const Banner = props => {
return (
<div className="col-12 col-lg-6 banner">
Expand Down
12 changes: 6 additions & 6 deletions components/Banner/Banners.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React, { Fragment, useState, useEffect, memo } from 'react';
import Link from '../Link';
import Banner from './Banner';
import '../../scss/components/banners.scss';
import React, { Fragment, useState, useEffect, memo } from "react";
import Link from "../Link";
import Banner from "./Banner";
import "../../scss/components/banners.scss";
const Banners = () => {
return (
<div className="container">
<div className="row rtl banners">
<Banner link={'bannerLink'} image={'Layer30.png'} />
<Banner link={'bannerLink'} image={'Layer33.png'} />
<Banner link={"bannerLink"} image={"Layer30.png"} />
<Banner link={"bannerLink"} image={"Layer33.png"} />
</div>
</div>
);
Expand Down
8 changes: 4 additions & 4 deletions components/Button/SubmitButton.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useContext, useRef, useState, useEffect, memo } from 'react';
import Loading from '../Loader/Loading';
import '../../scss/components/button.scss';
import React, { useContext, useRef, useState, useEffect, memo } from "react";
import Loading from "../Loader/Loading";
import "../../scss/components/button.scss";
const SubmitButton = props => {
return (
<button onClick={props.onClick} className={props.className} type="button" disabled={props.loading}>
Expand All @@ -15,4 +15,4 @@ const SubmitButton = props => {
</button>
);
};
export default memo(SubmitButton);
export default memo(SubmitButton);
29 changes: 15 additions & 14 deletions components/CatProductsRow/CatProductsRow.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import React, { Fragment, useState, useEffect, memo } from 'react';
import Link from '../Link';
import Category from './Category';
import Sort from './Sort';
import Product from './Product';
import fetchData from '../../utils/fetchData';
import Loading from '../Loader/Loading';
import '../../scss/components/catProductsRow.scss';
import React, { Fragment, useState, useEffect, memo } from "react";
import Link from "../Link";
import Category from "./Category";
import Sort from "./Sort";
import Product from "./Product";
import fetchData from "../../utils/fetchData";
import Loading from "../Loader/Loading";
import "../../scss/components/catProductsRow.scss";
const CatProductsRow = props => {
const [products, setProducts] = useState(props.products);
const [sortFilter, setSortFilter] = useState('New');
const [sortFilter, setSortFilter] = useState("New");
const handleSort = sortType => {
setSortFilter(sortType);
};
const [loading, setLoading] = useState(false);
const getProducts = async () => {
setLoading(true);
let GetMarketAround = await fetchData(
'User/U_Product/GetMarketAround',
"User/U_Product/GetMarketAround",
{
method: 'POST',
method: "POST",
body: JSON.stringify({
filters: sortFilter,
categoryId: 1,
Expand All @@ -44,13 +44,14 @@ const CatProductsRow = props => {
const renderProducts = () => {
if (loading) {
return (
<div style={{ display: 'block !important', width: '100%', height: '40px', textAlign: 'center' }}>
<div style={{ display: "block !important", width: "100%", height: "40px", textAlign: "center" }}>
<Loading />
</div>
);
} else {
const productsElements = products.map(product => {
const productThumbNail = product.pictures[0] != undefined ? `https://api.qarun.ir/${product.pictures[0].thumbNail}` : '/static/img/no-product-image.png';
const productThumbNail =
product.pictures[0] != undefined ? `https://api.qarun.ir/${product.pictures[0].thumbNail}` : "/static/img/no-product-image.png";
return (
<Product
key={product.id}
Expand Down Expand Up @@ -97,7 +98,7 @@ const CatProductsRow = props => {
<Sort handleSort={handleSort} />
<div className="col-12 mt-2 cat_title">
<h3>اطراف</h3>
<Link href={``} passHref>
<Link href={""} passHref>
<a className="more">همه</a>
</Link>
</div>
Expand Down
92 changes: 46 additions & 46 deletions components/CatProductsRow/Category.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React, { Fragment, useState, useEffect, memo } from 'react';
import Link from '../Link';
import { IoIosMore } from 'react-icons/io';
import WindowsWidth from '../WindowsWidth';
import '../../scss/components/categoriesRow.scss';
const Category = (props) => {
import React, { Fragment, useState, useEffect, memo } from "react";
import Link from "../Link";
import { IoIosMore } from "react-icons/io";
import WindowsWidth from "../WindowsWidth";
import "../../scss/components/categoriesRow.scss";
const Category = props => {
const width = WindowsWidth();
const renderCatLi = () => {
// If Windows.Width < 992 (large) just show 5 coulmn users else show 11 users
// If Windows.Width < 992 (large) just show 5 column users else show 11 users
// if (width < 992) {
// return (
// <>
Expand All @@ -28,45 +28,45 @@ const Category = (props) => {
// </>
// );
// } else {
return (
<>
<li className="nav-item">
<Link href="/category/" passHref>
<a className="nav-link active">سوپر مارکت</a>
</Link>
</li>
<li className="nav-item">
<Link href="/category/" passHref>
<a className="nav-link">رستوران و فست فود</a>
</Link>
</li>
<li className="nav-item">
<Link href="/category/" passHref>
<a className="nav-link">نان و شیرینی</a>
</Link>
</li>
<li className="nav-item">
<Link href="/category/" passHref>
<a className="nav-link">سوپر مارکت</a>
</Link>
</li>
<li className="nav-item">
<Link href="/category/" passHref>
<a className="nav-link">رستوران و فست فود</a>
</Link>
</li>
<li className="nav-item">
<Link href="/category/" passHref>
<a className="nav-link">نان و شیرینی</a>
</Link>
</li>
<li className="nav-item">
<Link href="/category/" passHref>
<a className="nav-link">سوپر مارکت</a>
</Link>
</li>
</>
);
return (
<>
<li className="nav-item">
<Link href="/category/" passHref>
<a className="nav-link active">سوپر مارکت</a>
</Link>
</li>
<li className="nav-item">
<Link href="/category/" passHref>
<a className="nav-link">رستوران و فست فود</a>
</Link>
</li>
<li className="nav-item">
<Link href="/category/" passHref>
<a className="nav-link">نان و شیرینی</a>
</Link>
</li>
<li className="nav-item">
<Link href="/category/" passHref>
<a className="nav-link">سوپر مارکت</a>
</Link>
</li>
<li className="nav-item">
<Link href="/category/" passHref>
<a className="nav-link">رستوران و فست فود</a>
</Link>
</li>
<li className="nav-item">
<Link href="/category/" passHref>
<a className="nav-link">نان و شیرینی</a>
</Link>
</li>
<li className="nav-item">
<Link href="/category/" passHref>
<a className="nav-link">سوپر مارکت</a>
</Link>
</li>
</>
);
// }
};
return (
Expand Down
4 changes: 1 addition & 3 deletions components/CatProductsRow/FirstCatProductsRow.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@ const FirstCatProductsRow = props => {
} else {
const productsElements = products.map(product => {
const productThumbNail =
product.pictures[0] != undefined
? `https://api.qarun.ir/${product.pictures[0].thumbNail}`
: "/static/img/no-product-image.png";
product.pictures[0] != undefined ? `https://api.qarun.ir/${product.pictures[0].thumbNail}` : "/static/img/no-product-image.png";
return (
<Product
key={product.id}
Expand Down
26 changes: 13 additions & 13 deletions components/CatProductsRow/Product.js
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
import React, { Fragment, useState, useEffect, useContext, memo } from 'react';
import Link from '../Link';
import fetchData from '../../utils/fetchData';
import Router from 'next/router';
import { FaShoppingBasket } from 'react-icons/fa';
import WindowsWidth from '../WindowsWidth';
import { numberSeparator, removeSeparator } from '../../utils/tools';
import { CartCountContext } from '../../context/context';
import React, { Fragment, useState, useEffect, useContext, memo } from "react";
import Link from "../Link";
import fetchData from "../../utils/fetchData";
import Router from "next/router";
import { FaShoppingBasket } from "react-icons/fa";
import WindowsWidth from "../WindowsWidth";
import { numberSeparator, removeSeparator } from "../../utils/tools";
import { CartCountContext } from "../../context/context";
const Product = props => {
const cartCountDispatch = useContext(CartCountContext);
const addToCart = async () => {
//setLoading(true);
const result = await fetchData(
'User/U_Cart/Add',
"User/U_Cart/Add",
{
method: 'POST',
method: "POST",
body: JSON.stringify({
productId: props.id,
count: 1
})
},
props.ctx
);
if (result !== undefined && result.isSuccess !== undefined && result.isSuccess) {
if (result !== undefined && result.isSuccess !== undefined && result.isSuccess) {
//toast.success('محصول شما با موفقیت به سبد خرید اضافه شد.');
cartCountDispatch({ type: 'add' });
cartCountDispatch({ type: "add" });
} else if (result !== undefined && result.message != undefined) {
//toast.warn(result.message);
} else if (result !== undefined && result.error != undefined) {
Expand Down Expand Up @@ -78,4 +78,4 @@ const Product = props => {
</div>
);
};
export default memo(Product);
export default memo(Product);
16 changes: 8 additions & 8 deletions components/CatProductsRow/Sort.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React, { Fragment, useState, useEffect, memo } from 'react';
import Link from '../Link';
import React, { Fragment, useState, useEffect, memo } from "react";
import Link from "../Link";
const Sort = props => {
const handleSort = props.handleSort;
const [sorts, setSorts] = useState([
{ id: 0, name: 'تازه', filter: 'New', active: true },
{ id: 1, name: 'تخفیف', filter: 'Discount', active: false },
{ id: 2, name: 'پرفروش', filter: 'BestSeller', active: false },
{ id: 3, name: 'محبوب', filter: 'Popular', active: false },
{ id: 4, name: 'فعال', filter: 'NotSet', active: false }
{ id: 0, name: "تازه", filter: "New", active: true },
{ id: 1, name: "تخفیف", filter: "Discount", active: false },
{ id: 2, name: "پرفروش", filter: "BestSeller", active: false },
{ id: 3, name: "محبوب", filter: "Popular", active: false },
{ id: 4, name: "فعال", filter: "NotSet", active: false }
]);
const toggleActiveSort = index => {
sorts[index];
Expand All @@ -23,7 +23,7 @@ const Sort = props => {
setSorts(all);
};
const showSorts = sorts.map(sort => {
let classN = sort.active ? 'nav-link active' : 'nav-link';
let classN = sort.active ? "nav-link active" : "nav-link";
return (
<li key={sort.id} className="nav-item">
<a
Expand Down
8 changes: 4 additions & 4 deletions components/CategoryMenu/Category.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React, { Fragment, useState, useEffect, memo } from 'react';
import Link from '../Link';
import React, { Fragment, useState, useEffect, memo } from "react";
import Link from "../Link";
const Category = props => {
return (
<li className={props.active ? 'nav-item active' : 'nav-item'}>
<li className={props.active ? "nav-item active" : "nav-item"}>
<i className="bullet"></i>
<Link href={`/categories/${props.id}`} passHref>
<a className={props.active ? 'nav-link active' : 'nav-link'}>{props.name}</a>
<a className={props.active ? "nav-link active" : "nav-link"}>{props.name}</a>
</Link>
</li>
);
Expand Down
18 changes: 9 additions & 9 deletions components/CategoryMenu/CategoryMenu.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React, { Fragment, useState, useEffect, memo } from 'react';
import { useRouter } from 'next/router';
import Link from '../Link';
import '../../scss/components/CategoryMenu.scss';
import Category from './Category';
import { ReactComponent as LeftSvg } from '../../public/static/svg/left-arrow.svg';
import React, { Fragment, useState, useEffect, memo } from "react";
import { useRouter } from "next/router";
import Link from "../Link";
import "../../scss/components/CategoryMenu.scss";
import Category from "./Category";
import { ReactComponent as LeftSvg } from "../../public/static/svg/left-arrow.svg";
const CategoryMenu = props => {
const categories = props.categories || [];
const router = useRouter();
Expand All @@ -14,13 +14,13 @@ const CategoryMenu = props => {
<div className="col-6 text-left">
<Link href="/" passHref>
<a className="qarun_title">
{/* قارون */}
<img src="/static/img/text-logo.png" width="80" height="auto" className="d-inline-block align-top" alt="" />
{/* قارون */}
<img src="/static/img/text-logo.png" width="80" height="auto" className="d-inline-block align-top" alt="" />
</a>
</Link>
</div>
<div className="col-6 text-right">
<a onClick={() => router.back()} style={{ cursor: 'pointer' }}>
<a onClick={() => router.back()} style={{ cursor: "pointer" }}>
<LeftSvg className="svg_icon" />
</a>
</div>
Expand Down
Loading

0 comments on commit a7fc4ed

Please sign in to comment.