From 8370a22fa19e1e45bfa4ee98766652cbcb919296 Mon Sep 17 00:00:00 2001 From: mahdi Date: Tue, 17 May 2022 09:32:49 +0430 Subject: [PATCH] update 6 files and delete 13 files --- .../images/CustomToast2CustomToast2pen.svg | 0 .../images/CustomToast2profilePic1.svg | 0 .../images/CustomToast2profilePic2.svg | 0 .../images/CustomToast2profilePic3.svg | 0 .../images/CustomToast2profilePic4.svg | 0 .../images/CustomToast2profilePic5.svg | 0 .../images/CustomToastpen-icon.svg | 2 +- .../CardDesgin/CardDesign1/index.js | 2 +- .../{ => CardDesgin}/CustomToast/index.js | 0 .../{ => CardDesgin}/CustomToast2/index.js | 0 .../ContactUs/ContactInfoSectioin/index.js | 37 ++++++------------- .../CurrentDateShamsi/index.js | 0 .../CurrentTime/index.js | 0 src/components/CurrentDateTime/index.js | 28 ++++++++++++++ .../MiniComponents/BookDesign/index.js | 12 +++--- .../{ => SelectBox}/CustomSelectBox/index.js | 0 src/components/SelectBox/index.js | 2 + .../{ => SwitchDesign}/CustomSwitch/index.js | 0 src/components/SwitchDesign/index.js | 2 + src/redux/data.js | 11 ++++++ 20 files changed, 63 insertions(+), 33 deletions(-) rename src/components/CustomToast2/pen.svg => public/images/CustomToast2CustomToast2pen.svg (100%) rename src/components/CustomToast2/images/profilePic1.svg => public/images/CustomToast2profilePic1.svg (100%) rename src/components/CustomToast2/images/profilePic2.svg => public/images/CustomToast2profilePic2.svg (100%) rename src/components/CustomToast2/images/profilePic3.svg => public/images/CustomToast2profilePic3.svg (100%) rename src/components/CustomToast2/images/profilePic4.svg => public/images/CustomToast2profilePic4.svg (100%) rename src/components/CustomToast2/images/profilePic5.svg => public/images/CustomToast2profilePic5.svg (100%) rename src/components/CustomToast/pen-icon.svg => public/images/CustomToastpen-icon.svg (99%) rename src/components/{ => CardDesgin}/CustomToast/index.js (100%) rename src/components/{ => CardDesgin}/CustomToast2/index.js (100%) rename src/components/{ => CurrentDateTime}/CurrentDateShamsi/index.js (100%) rename src/components/{ => CurrentDateTime}/CurrentTime/index.js (100%) create mode 100644 src/components/CurrentDateTime/index.js rename src/components/{ => SelectBox}/CustomSelectBox/index.js (100%) rename src/components/{ => SwitchDesign}/CustomSwitch/index.js (100%) diff --git a/src/components/CustomToast2/pen.svg b/public/images/CustomToast2CustomToast2pen.svg similarity index 100% rename from src/components/CustomToast2/pen.svg rename to public/images/CustomToast2CustomToast2pen.svg diff --git a/src/components/CustomToast2/images/profilePic1.svg b/public/images/CustomToast2profilePic1.svg similarity index 100% rename from src/components/CustomToast2/images/profilePic1.svg rename to public/images/CustomToast2profilePic1.svg diff --git a/src/components/CustomToast2/images/profilePic2.svg b/public/images/CustomToast2profilePic2.svg similarity index 100% rename from src/components/CustomToast2/images/profilePic2.svg rename to public/images/CustomToast2profilePic2.svg diff --git a/src/components/CustomToast2/images/profilePic3.svg b/public/images/CustomToast2profilePic3.svg similarity index 100% rename from src/components/CustomToast2/images/profilePic3.svg rename to public/images/CustomToast2profilePic3.svg diff --git a/src/components/CustomToast2/images/profilePic4.svg b/public/images/CustomToast2profilePic4.svg similarity index 100% rename from src/components/CustomToast2/images/profilePic4.svg rename to public/images/CustomToast2profilePic4.svg diff --git a/src/components/CustomToast2/images/profilePic5.svg b/public/images/CustomToast2profilePic5.svg similarity index 100% rename from src/components/CustomToast2/images/profilePic5.svg rename to public/images/CustomToast2profilePic5.svg diff --git a/src/components/CustomToast/pen-icon.svg b/public/images/CustomToastpen-icon.svg similarity index 99% rename from src/components/CustomToast/pen-icon.svg rename to public/images/CustomToastpen-icon.svg index a49016c..447dae8 100644 --- a/src/components/CustomToast/pen-icon.svg +++ b/public/images/CustomToastpen-icon.svg @@ -7,4 +7,4 @@ - + \ No newline at end of file diff --git a/src/components/CardDesgin/CardDesign1/index.js b/src/components/CardDesgin/CardDesign1/index.js index fc2da84..391d8b2 100644 --- a/src/components/CardDesgin/CardDesign1/index.js +++ b/src/components/CardDesgin/CardDesign1/index.js @@ -1,5 +1,5 @@ import React from "react"; -import CustomToast from "../../CustomToast"; +import CustomToast from "../CustomToast"; import IconText from "../../IconText"; import TitleSubtitle from "../../MiniComponents/TitleSubtitle"; diff --git a/src/components/CustomToast/index.js b/src/components/CardDesgin/CustomToast/index.js similarity index 100% rename from src/components/CustomToast/index.js rename to src/components/CardDesgin/CustomToast/index.js diff --git a/src/components/CustomToast2/index.js b/src/components/CardDesgin/CustomToast2/index.js similarity index 100% rename from src/components/CustomToast2/index.js rename to src/components/CardDesgin/CustomToast2/index.js diff --git a/src/components/ContactUs/ContactInfoSectioin/index.js b/src/components/ContactUs/ContactInfoSectioin/index.js index b405b2c..074c760 100644 --- a/src/components/ContactUs/ContactInfoSectioin/index.js +++ b/src/components/ContactUs/ContactInfoSectioin/index.js @@ -2,41 +2,32 @@ import React from "react"; -import customerSupport from "images/customer-support.png"; -import lightGreenLine from "images/light-green-line.svg"; - const ContactInfoSectioin = ({ - contactInfoSectionBgColor, + className, dayNumTextColor, contentTextColor, }) => { return (
{/* line */} - + {/* middle content */} -

- 7 +

+ 7 روز هفته - 24 + 24 ساعته
منتظر شنیدن صدای گرمتان هستیم

-
+
021654412 @@ -48,11 +39,7 @@ const ContactInfoSectioin = ({
{/* line */} - +
); }; @@ -60,7 +47,7 @@ const ContactInfoSectioin = ({ export default ContactInfoSectioin; ContactInfoSectioin.defaultProps = { - contactInfoSectionBgColor: "bg-midGrayBgColor", - dayNumTextColor: "text-lightBlueTextColor2", - contentTextColor: "text-darkCrimsonTextColor", + className: "bg-[#DBDBDB]", + dayNumTextColor: "text-[#196EC0]", + contentTextColor: "text-[#05335F]", }; diff --git a/src/components/CurrentDateShamsi/index.js b/src/components/CurrentDateTime/CurrentDateShamsi/index.js similarity index 100% rename from src/components/CurrentDateShamsi/index.js rename to src/components/CurrentDateTime/CurrentDateShamsi/index.js diff --git a/src/components/CurrentTime/index.js b/src/components/CurrentDateTime/CurrentTime/index.js similarity index 100% rename from src/components/CurrentTime/index.js rename to src/components/CurrentDateTime/CurrentTime/index.js diff --git a/src/components/CurrentDateTime/index.js b/src/components/CurrentDateTime/index.js new file mode 100644 index 0000000..cf86b7d --- /dev/null +++ b/src/components/CurrentDateTime/index.js @@ -0,0 +1,28 @@ +import React, { useState } from "react"; + +import CurrentDateShamsi from "./CurrentDateShamsi"; +import CurrentTime from "./CurrentTime"; + +function CurrentDateTime() { + const list = { + 1: , + 2: , + }; + const [type, setType] = useState(1); + + return ( +
+ + {list[type]} +
+ ); +} + +export default CurrentDateTime; diff --git a/src/components/MiniComponents/BookDesign/index.js b/src/components/MiniComponents/BookDesign/index.js index f38377d..0648a2d 100644 --- a/src/components/MiniComponents/BookDesign/index.js +++ b/src/components/MiniComponents/BookDesign/index.js @@ -1,8 +1,4 @@ import React from "react"; -// import "./BookDesign.scss"; - -import book from "../../../assets/images/book.svg"; -import bookCover from "../../../assets/images/book-white-cover.svg"; export const BookDesign = ({ bookBackCoverBg }) => { return ( @@ -26,11 +22,15 @@ export const BookDesign = ({ bookBackCoverBg }) => {
- +
diff --git a/src/components/CustomSelectBox/index.js b/src/components/SelectBox/CustomSelectBox/index.js similarity index 100% rename from src/components/CustomSelectBox/index.js rename to src/components/SelectBox/CustomSelectBox/index.js diff --git a/src/components/SelectBox/index.js b/src/components/SelectBox/index.js index a396904..6f8db23 100644 --- a/src/components/SelectBox/index.js +++ b/src/components/SelectBox/index.js @@ -2,11 +2,13 @@ import React, { useState } from "react"; import SelectCheckbox from "./SelectCheckbox"; import SelectRadio from "./SelectRadio"; +import CustomSelectBox from "./CustomSelectBox"; function Advertisements() { const list = { 1: , 2: , + 3: , }; const [type, setType] = useState(1); return ( diff --git a/src/components/CustomSwitch/index.js b/src/components/SwitchDesign/CustomSwitch/index.js similarity index 100% rename from src/components/CustomSwitch/index.js rename to src/components/SwitchDesign/CustomSwitch/index.js diff --git a/src/components/SwitchDesign/index.js b/src/components/SwitchDesign/index.js index dd593ca..468c141 100644 --- a/src/components/SwitchDesign/index.js +++ b/src/components/SwitchDesign/index.js @@ -2,11 +2,13 @@ import React, { useState } from "react"; import Switch from "./Switch"; import Switch2 from "./Switch2"; +import CustomSwitch from "./CustomSwitch"; function SwitchDesign() { const list = { 1: , 2: , + 3: , }; const [type, setType] = useState(1); return ( diff --git a/src/redux/data.js b/src/redux/data.js index 437e669..17e14f2 100644 --- a/src/redux/data.js +++ b/src/redux/data.js @@ -39,6 +39,7 @@ import UploadFile from "../components/UploadFile"; import AnimatedInput from "../components/AnimatedInput/Input"; import BoxNextToEachOther from "../components/BoxNextToEachOther"; import ContactUs from "../components/ContactUs"; +import CurrentDateTime from "../components/CurrentDateTime"; // mini components import MiniComponents from "../components/MiniComponents"; @@ -742,6 +743,16 @@ const components = [ code: null, }, }, + { + name: "Current Date Time", + author: "Andalib", + props: [], + content: { + name: "Current Date Time", + component: , + code: null, + }, + }, // mini components { name: "Mini Components",