update 5 files and delete 11 files

master
mahdi 3 years ago
parent ac98bdebcf
commit 7a45ac1c22
  1. 0
      public/images/IconTextinfo-icon.svg
  2. 0
      public/images/LeafletMapplaceholder.png
  3. 1
      src/App.js
  4. 2
      src/components/CardDesgin/CardDesign1/index.js
  5. 2
      src/components/CardDesgin/CardDesign2/index.js
  6. 20
      src/components/GridListTable/index.js
  7. 148
      src/components/Header/desgin1/HeaderDesign1.js
  8. 4
      src/components/Header/desgin1/arrow-down.svg
  9. 8
      src/components/Header/desgin1/profile-pic.svg
  10. 5
      src/components/Header/desgin1/search-normal.svg
  11. 97
      src/components/IndianaDragScroll/index.js
  12. 12
      src/components/LeafletMap/index.js
  13. 0
      src/components/LeafletMap/index.scss
  14. 8
      src/components/MiniComponents/IconText/index.js
  15. 2
      src/components/MiniComponents/index.js
  16. 18
      src/mahdi.js

Before

Width:  |  Height:  |  Size: 471 B

After

Width:  |  Height:  |  Size: 471 B

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

@ -11,7 +11,6 @@ import "./App.scss";
function App() {
return (
<>
<div className="bg-red-400">mahdi lazy loaded</div>
<Suspense fallback={<div>Loading...</div>}>
<Provider store={store}>
<Router />

@ -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 = () => {

@ -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";

@ -1,20 +0,0 @@
import React from "react";
import FolderTree from "../FolderTree";
import ReactTable5 from "../ReactTable5";
const GridListTable = () => {
return (
<section className="flex flex-row">
{/* right */}
<div className="w-[265px] " style={{ backgroundColor: "#FBFBFB" }}>
<FolderTree />
</div>
{/* left */}
<div className="flex-1">
<ReactTable5 />
</div>
</section>
);
};
export default GridListTable;

@ -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 (
<header
className={`mx-auto py-3 px-4 rounded-b-md w-full shadow-sm bg-white`}
>
{/* {headerDivider && (
<div className="border-b border-lightGrayBorderColor mb-5"></div>
)} */}
<div className="flex justify-between items-center relative">
<div className="flex w-1/5">
<span className={`text-sm font-sansbold ml-4 pt-1 text-productPrice`}>
دانوین
</span>
</div>
<div className="flex items-center relative justify-self-start flex-1">
<div className="hidden lg:flex items-start justify-start flex-1 ">
<a href="#" className={`text-xs text-productPrice mx-3`}>
محصولات
</a>
<a href="#" className={`text-xs text-productPrice mx-3`}>
دسته بندی
</a>
<a href="#" className={`text-xs text-productPrice mx-3`}>
تماس با ما
</a>
<a href="#" className={`text-xs text-productPrice mx-3`}>
درباره ما
</a>
<a href="#" className={`text-xs text-productPrice mx-3`}>
پیگیری
</a>
<a href="#" className={`text-xs text-productPrice mx-3`}>
وبلاگ
</a>
</div>
</div>
<div className="flex justify-end items-center ">
<div className="ml-4">
<Switch />
</div>
<div className="flex flex-row-reverse items-center relative w-60 ml-3">
<img
src={search}
alt=""
className="w-5 h-5 absolute left-3 cursor-pointer"
/>
<input
type="text"
placeholder="جستجو در پنل کاربری..."
className="text-xs rounded pr-4 pl-10 py-2 w-full border border-blue-300 focus:outline-none placeholder:text-blue-300"
/>
</div>
{/* <div class="flex justify- ">
<div class="form-check form-switch">
<input
class="form-check-input appearance-none w-9 -ml-10 rounded-full float-left h-5 align-top bg-white bg-no-repeat bg-contain bg-gray-300 focus:outline-none cursor-pointer shadow-sm"
type="checkbox"
role="switch"
id="flexSwitchCheckChecked"
checked
/>
</div>
</div> */}
{/* <p className={`text-xs ml-2 text-product>Price`}>
140,000
<span className={`text-xs font-light text-productPrice`}>
تومان
</span>
</p> */}
{/* <img src={whiteCartIcon} alt="" className="w-5 h-5 ml-2" /> */}
{/* <img src={searchIcon} alt="" className="w-7 h-5 ml-2" /> */}
<img src={cartIcon} alt="" className="w-7 h-5 ml-2" />
{/* <img src={profileIcon} alt="" className="w-5 h-5" /> */}
{/* <button
className={`ml-2 text-xs font-light border rounded-md py-2 px-8 bg-white border-darkCrimsonBorderColor text-productPrice`}
>
ورود
</button> */}
<div className="flex flex-row items-center">
<div className=" flex-col flex-1 mr-3">
<p className="text-blue-900 text-sm">{username}</p>
<p className="text-blue-700 text-xs">{userJob}</p>
</div>
<img src={downwardArrow} alt="" className="w-4 cursor-pointer" />
<img src={profilePic} alt="" className="w-10 rounded-full" />
</div>
</div>
</div>
</header>
);
};
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,
};

@ -1,4 +0,0 @@
<svg id="arrow-down" xmlns="http://www.w3.org/2000/svg" width="18.5" height="18.5" viewBox="0 0 18.5 18.5">
<path id="Vector" d="M9.958,0H.832A.83.83,0,0,0,.246,1.418L4.239,5.411a1.642,1.642,0,0,0,2.32,0L8.077,3.893l2.474-2.474A.834.834,0,0,0,9.958,0Z" transform="translate(3.855 6.305)" fill="#c8def9"/>
<path id="Vector-2" data-name="Vector" d="M0,0H18.5V18.5H0Z" transform="translate(18.5 18.5) rotate(180)" fill="none" opacity="0"/>
</svg>

Before

Width:  |  Height:  |  Size: 448 B

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 102 KiB

@ -1,5 +0,0 @@
<svg id="search-normal" xmlns="http://www.w3.org/2000/svg" width="29.902" height="29.902" viewBox="0 0 29.902 29.902">
<path id="Vector" d="M23.672,11.836A11.836,11.836,0,1,1,11.836,0,11.836,11.836,0,0,1,23.672,11.836Z" transform="translate(2.492 2.492)" fill="none" stroke="#e2eafc" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
<path id="Vector-2" data-name="Vector" d="M2.492,2.492,0,0" transform="translate(24.918 24.918)" fill="none" stroke="#e2eafc" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>
<path id="Vector-3" data-name="Vector" d="M0,0H29.9V29.9H0Z" fill="none" opacity="0"/>
</svg>

Before

Width:  |  Height:  |  Size: 646 B

@ -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 (
<div className="bg-blue-400 p-4 h-52">
<ScrollContainer ignoreElements={"#not-work-drag"}>
<div
className="bg-red-400 h-52"
id="not-work-drag"
style={{
height: "100%",
background: "rgba(0, 208, 255, 0.8)",
position: "absolute",
display: "flex",
flexDirection: "column",
justifyContent: "space-between",
left: "12%",
}}
></div>
<div className="flex flex-col h-52 bg-red-400" style={{}}>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
<div>mahdi</div>
</div>
</ScrollContainer>
<div className="w-full bg-yellow-300 h-5 my-20 text-center text-base text-red-600 rounded">
divider between vertical && horizontal scroll bar inside
IndianaDragScroll COMPONENT
</div>
<ScrollContainer ignoreElements={"#not-work-drag"}>
<div
id="not-work-drag"
style={{
height: "100%",
background: "rgba(0, 208, 255, 0.8)",
position: "absolute",
display: "flex",
flexDirection: "column",
justifyContent: "space-between",
left: "12%",
}}
>
<div>この上では</div>
<div>ドラッグしてもスクロールしません</div>
</div>
<div style={{ display: "flex" }}>
{range(0, 100).map((i, index) => (
<div key={index} style={{ margin: "1em .25em" }}>
{i}
</div>
))}
</div>
</ScrollContainer>
</div>
);
}

@ -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}
/>
<TileLayer
url={grid}
url="images/grid.png"
apikey="db5ae1f5778a448ca662554581f283c5"
maxZoom={24}
maxNativeZoom={24}
@ -284,3 +280,7 @@ const LeafletMap = () => {
};
export default LeafletMap;
LeafletMap.defaultProps = {
placeholder: "images/LeafletMapplaceholder.png",
};

@ -1,11 +1,9 @@
import React from "react";
import infoIcon from "./info-icon.svg";
const IconText = ({ contentClassname }) => {
const IconText = ({ contentClassname, icon }) => {
return (
<div className="flex flex-row items-start mt-2">
<img src={infoIcon} alt="info" />
<img src={icon} alt="info" />
<p className={`${contentClassname} text-xs text-justify mr-3 leading-5`}>
ابتدا باید دیوار ها به صورت حدودی ترسیم شوند و تمامی نقاط به یگ دیگر وصل
شوند تا طرح برای جایگذاری وسایل آماده شود
@ -17,6 +15,6 @@ const IconText = ({ contentClassname }) => {
export default IconText;
IconText.defaultProps = {
icon: infoIcon,
icon: "images/IconTextinfo-icon.svg",
contentClassname: "text-[#2E2E2E]",
};

@ -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: <CancleIcon />,
7: <CircleInCircle />,
8: <DropDown />,
8: <IconText />,
};
const [type, setType] = useState(1);

@ -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 (
<>
<h2>hi there i am loaded NOWW</h2>
<Provider store={store}>
<Router />
</Provider>
;
</>
);
};
export default mahdi;
Loading…
Cancel
Save