From 7a45ac1c222bd4e67aa3f711184f67be49b6d0d8 Mon Sep 17 00:00:00 2001 From: mahdi Date: Tue, 17 May 2022 16:06:44 +0430 Subject: [PATCH] update 5 files and delete 11 files --- .../images/IconTextinfo-icon.svg | 0 .../images/LeafletMapplaceholder.png | Bin src/App.js | 1 - .../CardDesgin/CardDesign1/index.js | 2 +- .../CardDesgin/CardDesign2/index.js | 2 +- src/components/GridListTable/index.js | 20 --- .../Header/desgin1/HeaderDesign1.js | 148 ------------------ src/components/Header/desgin1/arrow-down.svg | 4 - src/components/Header/desgin1/profile-pic.svg | 8 - .../Header/desgin1/search-normal.svg | 5 - src/components/IndianaDragScroll/index.js | 97 ------------ src/components/LeafletMap/index.js | 12 +- src/components/LeafletMap/index.scss | 0 .../{ => MiniComponents}/IconText/index.js | 8 +- src/components/MiniComponents/index.js | 2 + src/mahdi.js | 18 --- 16 files changed, 13 insertions(+), 314 deletions(-) rename src/components/IconText/info-icon.svg => public/images/IconTextinfo-icon.svg (100%) rename src/components/LeafletMap/placeholder.png => public/images/LeafletMapplaceholder.png (100%) delete mode 100644 src/components/GridListTable/index.js delete mode 100644 src/components/Header/desgin1/HeaderDesign1.js delete mode 100644 src/components/Header/desgin1/arrow-down.svg delete mode 100644 src/components/Header/desgin1/profile-pic.svg delete mode 100644 src/components/Header/desgin1/search-normal.svg delete mode 100644 src/components/IndianaDragScroll/index.js delete mode 100644 src/components/LeafletMap/index.scss rename src/components/{ => MiniComponents}/IconText/index.js (78%) delete mode 100644 src/mahdi.js diff --git a/src/components/IconText/info-icon.svg b/public/images/IconTextinfo-icon.svg similarity index 100% rename from src/components/IconText/info-icon.svg rename to public/images/IconTextinfo-icon.svg diff --git a/src/components/LeafletMap/placeholder.png b/public/images/LeafletMapplaceholder.png similarity index 100% rename from src/components/LeafletMap/placeholder.png rename to public/images/LeafletMapplaceholder.png diff --git a/src/App.js b/src/App.js index 8bf9f8d..0689462 100644 --- a/src/App.js +++ b/src/App.js @@ -11,7 +11,6 @@ import "./App.scss"; function App() { return ( <> -
mahdi lazy loaded
Loading...}> diff --git a/src/components/CardDesgin/CardDesign1/index.js b/src/components/CardDesgin/CardDesign1/index.js index 391d8b2..f21c356 100644 --- a/src/components/CardDesgin/CardDesign1/index.js +++ b/src/components/CardDesgin/CardDesign1/index.js @@ -1,6 +1,6 @@ import React from "react"; import CustomToast from "../CustomToast"; -import IconText from "../../IconText"; +import IconText from "../../MiniComponents/IconText"; import TitleSubtitle from "../../MiniComponents/TitleSubtitle"; const CardDesign1 = () => { diff --git a/src/components/CardDesgin/CardDesign2/index.js b/src/components/CardDesgin/CardDesign2/index.js index 9fcf359..5a58d13 100644 --- a/src/components/CardDesgin/CardDesign2/index.js +++ b/src/components/CardDesgin/CardDesign2/index.js @@ -1,6 +1,6 @@ import React, { useState } from "react"; -import IconText from "../../IconText"; +import IconText from "../../MiniComponents/IconText"; import ButtonDivTag from "../../ButtonDesign/ButtonDivTag"; import TitleSubtitle from "../../MiniComponents/TitleSubtitle"; diff --git a/src/components/GridListTable/index.js b/src/components/GridListTable/index.js deleted file mode 100644 index 33b01fc..0000000 --- a/src/components/GridListTable/index.js +++ /dev/null @@ -1,20 +0,0 @@ -import React from "react"; -import FolderTree from "../FolderTree"; -import ReactTable5 from "../ReactTable5"; - -const GridListTable = () => { - return ( -
- {/* right */} -
- -
- {/* left */} -
- -
-
- ); -}; - -export default GridListTable; diff --git a/src/components/Header/desgin1/HeaderDesign1.js b/src/components/Header/desgin1/HeaderDesign1.js deleted file mode 100644 index 1b2c4cf..0000000 --- a/src/components/Header/desgin1/HeaderDesign1.js +++ /dev/null @@ -1,148 +0,0 @@ -import React from "react"; - -import cartIcon from "../../../assets/icons/dark-crimson-cart-icon.svg"; -// import whiteCartIcon from "../../../assets/icons/white-cart-icon.svg"; -import profileIcon from "../../../assets/icons/dark-crimson-profile-icon.svg"; -// import searchIcon from "../../../assets/icons/dark-crimson-search-box.svg"; -// import lightGraySearchIcon from "../../../assets/icons/light-gray-search-box.svg"; -// import darkCrimsonHamburgerMenu from "../../../assets/icons/dark-crimson-hamburger-menu.svg"; -// import whiteHamburgerMenu from "../../../assets/icons/white-hamburger-menu-icon.svg"; -import profilePic from "./profile-pic.svg"; -import downwardArrow from "./arrow-down.svg"; -import search from "./search-normal.svg"; -import Switch from "../../Switch"; - -const HeaderDesign1 = ({ username, userJob }) => { - return ( -
- {/* {headerDivider && ( -
- )} */} -
-
- - دانوین - -
- - - -
-
- -
-
- - -
- {/*
-
- -
-
*/} - {/*

Price`}> - 140,000 - - تومان - -

*/} - {/* */} - {/* */} - - {/* */} - {/* */} -
-
-

{username}

-

{userJob}

-
- - -
-
-
-
- ); -}; - -export default HeaderDesign1; - -// یک تگ دیو در نظر گرفتم برای 3 تا ایکن سرچ/پروفایل/اضافه کردن به سبد خرید که اینارو انداختم داخل دیو ایکن هولدر - -// text colors that is used in this component -// text-productPrice -// text-white - -// background colors that is used in this component -// bg-darkCrimsonBgColor - -// border colors that is used in this component -// border-darkCrimsonBorderColor - -HeaderDesign1.defaultProps = { - username: "رستم پهلوان زاده", - userJob: "مدیریت سامانه هوشمند", - headerDivider: true, - - topHeader: true, - bottomHeader: true, - - menuItems: false, - category: false, - searchBox: true, - - // icons - loginBtn: true, - - whiteIconCart: false, - darkCrimsonIconCart: false, - - whiteIconHamburgerMenu: false, - darkIconHamburgerMenu: true, - - iconHolder: true, - iconProfile: false, - iconCart: true, - iconSearch: false, -}; diff --git a/src/components/Header/desgin1/arrow-down.svg b/src/components/Header/desgin1/arrow-down.svg deleted file mode 100644 index 3247f0c..0000000 --- a/src/components/Header/desgin1/arrow-down.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/components/Header/desgin1/profile-pic.svg b/src/components/Header/desgin1/profile-pic.svg deleted file mode 100644 index 0367242..0000000 --- a/src/components/Header/desgin1/profile-pic.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/components/Header/desgin1/search-normal.svg b/src/components/Header/desgin1/search-normal.svg deleted file mode 100644 index 842c907..0000000 --- a/src/components/Header/desgin1/search-normal.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/components/IndianaDragScroll/index.js b/src/components/IndianaDragScroll/index.js deleted file mode 100644 index 1617f52..0000000 --- a/src/components/IndianaDragScroll/index.js +++ /dev/null @@ -1,97 +0,0 @@ -import React from "react"; - -import ScrollContainer from "react-indiana-drag-scroll"; -/** min から max までの数字の入った配列を生成する関数 */ -const range = (min, max, step = 1) => { - return Array.from( - { length: (max - min + step) / step }, - (v, k) => min + k * step - ); -}; -export default function IndianaDragScroll() { - return ( -
- -
-
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
mahdi
-
- -
- divider between vertical && horizontal scroll bar inside - IndianaDragScroll COMPONENT -
- -
-
この上では
-
ドラッグしてもスクロールしません
-
-
- {range(0, 100).map((i, index) => ( -
- {i} -
- ))} -
- -
- ); -} diff --git a/src/components/LeafletMap/index.js b/src/components/LeafletMap/index.js index 10b6f7e..b8f858e 100644 --- a/src/components/LeafletMap/index.js +++ b/src/components/LeafletMap/index.js @@ -1,6 +1,6 @@ // it has style inside index.scss ---> // Start LeafletMap && end LeafletMap -import React, { useState, useRef, useMemo } from "react"; +import React, { useState, useRef, useMemo, placeholder } from "react"; import { MapContainer, @@ -23,10 +23,6 @@ import { EditControl } from "react-leaflet-draw"; import "leaflet-draw"; import "./index.scss"; -import grid from "../../assets/images/grid.png"; - -import placeholder from "./placeholder.png"; - import * as L from "leaflet"; const bedNumb = "تخت شماره 33"; @@ -227,7 +223,7 @@ const LeafletMap = () => { opacity={0.8} /> { }; export default LeafletMap; + +LeafletMap.defaultProps = { + placeholder: "images/LeafletMapplaceholder.png", +}; diff --git a/src/components/LeafletMap/index.scss b/src/components/LeafletMap/index.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/IconText/index.js b/src/components/MiniComponents/IconText/index.js similarity index 78% rename from src/components/IconText/index.js rename to src/components/MiniComponents/IconText/index.js index a31e998..a9d3731 100644 --- a/src/components/IconText/index.js +++ b/src/components/MiniComponents/IconText/index.js @@ -1,11 +1,9 @@ import React from "react"; -import infoIcon from "./info-icon.svg"; - -const IconText = ({ contentClassname }) => { +const IconText = ({ contentClassname, icon }) => { return (
- info + info

ابتدا باید دیوار ها به صورت حدودی ترسیم شوند و تمامی نقاط به یگ دیگر وصل شوند تا طرح برای جایگذاری وسایل آماده شود @@ -17,6 +15,6 @@ const IconText = ({ contentClassname }) => { export default IconText; IconText.defaultProps = { - icon: infoIcon, + icon: "images/IconTextinfo-icon.svg", contentClassname: "text-[#2E2E2E]", }; diff --git a/src/components/MiniComponents/index.js b/src/components/MiniComponents/index.js index 222a581..1285680 100644 --- a/src/components/MiniComponents/index.js +++ b/src/components/MiniComponents/index.js @@ -9,6 +9,7 @@ import BreadCrumb from "./BreadCrumb"; import CancleIcon from "./CancleIcon"; import CircleInCircle from "./CircleInCircle"; import DropDown from "./DropDown"; +import IconText from "./IconText"; function MiniComponents() { const list = { @@ -21,6 +22,7 @@ function MiniComponents() { 7: , 7: , 8: , + 8: , }; const [type, setType] = useState(1); diff --git a/src/mahdi.js b/src/mahdi.js deleted file mode 100644 index c053496..0000000 --- a/src/mahdi.js +++ /dev/null @@ -1,18 +0,0 @@ -import React, { Component, lazy, Suspense } from "react"; -import { Provider } from "react-redux"; -import store from "./redux/store"; -import Router from "./router.js"; - -const mahdi = () => { - return ( - <> -

hi there i am loaded NOWW

- - - - ; - - ); -}; - -export default mahdi;