From 4413d29eab620bb8f1b8eda909d7831f4395da80 Mon Sep 17 00:00:00 2001 From: mahdi andalib Date: Wed, 11 May 2022 17:07:22 +0430 Subject: [PATCH] update 6 files and delete 16 files --- .../Vector.svg => public/images/Vector44.svg | 0 .../images/arrow-down12.svg | 0 .../images}/discount-shape.svg | 0 .../images}/home-2.svg | 0 .../logout.svg => public/images/logout22.svg | 0 .../images}/notification.svg | 0 .../images/profile-pic22.svg | 0 .../images/profileeeeee.svg | 0 .../images/receipt-texdst.svg | 0 .../images/search2222.svg | 0 .../images/setting222.svg | 0 .../images}/square.svg | 0 .../images}/wallet-3.svg | 0 src/components/Feedback/index.js | 6 +- .../Sidebar/SidebarDesign2/index.css | 12 ---- .../Sidebar/SidebarDesign2/index.css.map | 9 --- .../Sidebar/SidebarDesign2/index.js | 61 +++++++++---------- .../Sidebar/SidebarDesign2/index.scss | 0 src/components/Sidebar/SidebarMenu/index.js | 2 +- src/components/Sidebar/index.js | 27 ++++++++ src/components/SwitchDesign/Switch2/index.js | 15 +++++ src/components/SwitchDesign/index.js | 2 + src/index.scss | 39 ++++++++++++ src/redux/data.js | 11 ++++ 24 files changed, 128 insertions(+), 56 deletions(-) rename src/components/Sidebar/SidebarDesign2/Vector.svg => public/images/Vector44.svg (100%) rename src/components/Sidebar/SidebarDesign2/arrow-down.svg => public/images/arrow-down12.svg (100%) rename {src/components/Sidebar/SidebarDesign2 => public/images}/discount-shape.svg (100%) rename {src/components/Sidebar/SidebarDesign2 => public/images}/home-2.svg (100%) rename src/components/Sidebar/SidebarDesign2/logout.svg => public/images/logout22.svg (100%) rename {src/components/Sidebar/SidebarDesign2 => public/images}/notification.svg (100%) rename src/components/Sidebar/SidebarDesign2/profile-pic.svg => public/images/profile-pic22.svg (100%) rename src/components/Sidebar/SidebarDesign2/profilee.svg => public/images/profileeeeee.svg (100%) rename src/components/Sidebar/SidebarDesign2/receipt-text.svg => public/images/receipt-texdst.svg (100%) rename src/components/Sidebar/SidebarDesign2/search-normal.svg => public/images/search2222.svg (100%) rename src/components/Sidebar/SidebarDesign2/setting.svg => public/images/setting222.svg (100%) rename {src/components/Sidebar/SidebarDesign2 => public/images}/square.svg (100%) rename {src/components/Sidebar/SidebarDesign2 => public/images}/wallet-3.svg (100%) delete mode 100644 src/components/Sidebar/SidebarDesign2/index.css delete mode 100644 src/components/Sidebar/SidebarDesign2/index.css.map delete mode 100644 src/components/Sidebar/SidebarDesign2/index.scss create mode 100644 src/components/Sidebar/index.js create mode 100644 src/components/SwitchDesign/Switch2/index.js diff --git a/src/components/Sidebar/SidebarDesign2/Vector.svg b/public/images/Vector44.svg similarity index 100% rename from src/components/Sidebar/SidebarDesign2/Vector.svg rename to public/images/Vector44.svg diff --git a/src/components/Sidebar/SidebarDesign2/arrow-down.svg b/public/images/arrow-down12.svg similarity index 100% rename from src/components/Sidebar/SidebarDesign2/arrow-down.svg rename to public/images/arrow-down12.svg diff --git a/src/components/Sidebar/SidebarDesign2/discount-shape.svg b/public/images/discount-shape.svg similarity index 100% rename from src/components/Sidebar/SidebarDesign2/discount-shape.svg rename to public/images/discount-shape.svg diff --git a/src/components/Sidebar/SidebarDesign2/home-2.svg b/public/images/home-2.svg similarity index 100% rename from src/components/Sidebar/SidebarDesign2/home-2.svg rename to public/images/home-2.svg diff --git a/src/components/Sidebar/SidebarDesign2/logout.svg b/public/images/logout22.svg similarity index 100% rename from src/components/Sidebar/SidebarDesign2/logout.svg rename to public/images/logout22.svg diff --git a/src/components/Sidebar/SidebarDesign2/notification.svg b/public/images/notification.svg similarity index 100% rename from src/components/Sidebar/SidebarDesign2/notification.svg rename to public/images/notification.svg diff --git a/src/components/Sidebar/SidebarDesign2/profile-pic.svg b/public/images/profile-pic22.svg similarity index 100% rename from src/components/Sidebar/SidebarDesign2/profile-pic.svg rename to public/images/profile-pic22.svg diff --git a/src/components/Sidebar/SidebarDesign2/profilee.svg b/public/images/profileeeeee.svg similarity index 100% rename from src/components/Sidebar/SidebarDesign2/profilee.svg rename to public/images/profileeeeee.svg diff --git a/src/components/Sidebar/SidebarDesign2/receipt-text.svg b/public/images/receipt-texdst.svg similarity index 100% rename from src/components/Sidebar/SidebarDesign2/receipt-text.svg rename to public/images/receipt-texdst.svg diff --git a/src/components/Sidebar/SidebarDesign2/search-normal.svg b/public/images/search2222.svg similarity index 100% rename from src/components/Sidebar/SidebarDesign2/search-normal.svg rename to public/images/search2222.svg diff --git a/src/components/Sidebar/SidebarDesign2/setting.svg b/public/images/setting222.svg similarity index 100% rename from src/components/Sidebar/SidebarDesign2/setting.svg rename to public/images/setting222.svg diff --git a/src/components/Sidebar/SidebarDesign2/square.svg b/public/images/square.svg similarity index 100% rename from src/components/Sidebar/SidebarDesign2/square.svg rename to public/images/square.svg diff --git a/src/components/Sidebar/SidebarDesign2/wallet-3.svg b/public/images/wallet-3.svg similarity index 100% rename from src/components/Sidebar/SidebarDesign2/wallet-3.svg rename to public/images/wallet-3.svg diff --git a/src/components/Feedback/index.js b/src/components/Feedback/index.js index 55d6092..3e4d9c2 100644 --- a/src/components/Feedback/index.js +++ b/src/components/Feedback/index.js @@ -26,13 +26,17 @@ const Feedback = ({ feedbakTitle, feedbacks }) => { activeFeedback ? "pb-8" : "pb-0" } relative cursor-pointer transition-all duration-500`} key={index} - onClick={() => setActiveFeedback(item)} + // onClick={() => setActiveFeedback(item)} + onClick={() => + setActiveFeedback(activeFeedback === item ? null : item) + } > +

// Start Sidebar/SidebarDesign2 && end Sidebar/SidebarDesign2 import React, { useState } from "react"; - -import Switch from "../../Switch"; import SearchBox from "../../SearchBox"; -import downwardArrow from "./arrow-down.svg"; -import profilePic from "./profile-pic.svg"; -import home from "./home-2.svg"; -import square from "./square.svg"; -import wallet from "./wallet-3.svg"; -import discount from "./discount-shape.svg"; -import receipt from "./receipt-text.svg"; -import profileIcon from "./profilee.svg"; -import setting from "./setting.svg"; -import logout from "./logout.svg"; -import notification from "./notification.svg"; - const SidebarMenu = ({ items, buttons, username, userJob, className }) => { const [activeDropdown, setActiveDropdown] = useState(null); @@ -26,12 +12,20 @@ const SidebarMenu = ({ items, buttons, username, userJob, className }) => { > {/* profile */}

- profile-pic + profile-pic

{username}

{userJob}

- arrow + arrow
{/* search box */} @@ -45,7 +39,7 @@ const SidebarMenu = ({ items, buttons, username, userJob, className }) => {
{/* right active border */}
@@ -60,13 +54,13 @@ const SidebarMenu = ({ items, buttons, username, userJob, className }) => { ) } > - -

+ +

{menuItem.title}

{menuItem.notification && (
{menuItem.notification} @@ -140,7 +134,7 @@ SidebarMenu.defaultProps = { title: "منوی کاربری برای شما", menuItems: [ { - icon: home, + icon: "images/home-2.svg", title: "صفحه اصلی", borderRadius: "rounded", backgroundColor: "bg-gray-200", @@ -149,7 +143,7 @@ SidebarMenu.defaultProps = { menuSubItems: [], }, { - icon: square, + icon: "images/square.svg", title: "داشبود من", borderRadius: null, backgroundColor: null, @@ -158,7 +152,7 @@ SidebarMenu.defaultProps = { menuSubItems: [], }, { - icon: notification, + icon: "images/notification.svg", title: "مرکز اعلانات", borderRadius: "rounded-full", backgroundColor: "bg-transparent", @@ -172,21 +166,21 @@ SidebarMenu.defaultProps = { title: "حسابداری و مالی", menuItems: [ { - icon: wallet, + icon: "images/Vector44.svg", title: "کیف پول", borderRadius: null, backgroundColor: null, borderColor: null, notification: null, - leftIcon: downwardArrow, + leftIcon: "images/arrow-down12.svg", menuSubItems: [ - { title: "کوپن ها", leftIcon: downwardArrow }, - { title: "رسید ها", leftIcon: downwardArrow }, - { title: "صندوق", leftIcon: downwardArrow }, + { title: "کوپن ها", leftIcon: "images/arrow-down12.svg" }, + { title: "رسید ها", leftIcon: "images/arrow-down12.svg" }, + { title: "صندوق", leftIcon: "images/arrow-down12.svg" }, ], }, { - icon: discount, + icon: "images/arrow-down12.svg", title: "کوپن ها", borderRadius: "rounded-full", backgroundColor: "bg-transparent", @@ -195,7 +189,7 @@ SidebarMenu.defaultProps = { menuSubItems: [], }, { - icon: receipt, + icon: "images/receipt-texdst.svg", title: "رسید ها", borderRadius: null, backgroundColor: null, @@ -209,7 +203,7 @@ SidebarMenu.defaultProps = { title: "حساب کاربری", menuItems: [ { - icon: profileIcon, + icon: "images/profile-pic22.svg", title: "حساب کاربری", borderRadius: null, backgroundColor: null, @@ -218,7 +212,7 @@ SidebarMenu.defaultProps = { menuSubItems: [], }, { - icon: setting, + icon: "images/setting222.svg", title: "تنظیمات", borderRadius: null, backgroundColor: null, @@ -227,7 +221,7 @@ SidebarMenu.defaultProps = { menuSubItems: [], }, { - icon: logout, + icon: "images/logout22.svg", title: "خروج از حساب کاربری", borderRadius: null, backgroundColor: null, @@ -238,6 +232,7 @@ SidebarMenu.defaultProps = { ], }, ], + username: "رستم پهلوان زاده", userJob: "مدیریت سامانه هوشمند", }; diff --git a/src/components/Sidebar/SidebarDesign2/index.scss b/src/components/Sidebar/SidebarDesign2/index.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/Sidebar/SidebarMenu/index.js b/src/components/Sidebar/SidebarMenu/index.js index e3e44a4..2cf10d9 100644 --- a/src/components/Sidebar/SidebarMenu/index.js +++ b/src/components/Sidebar/SidebarMenu/index.js @@ -1,7 +1,7 @@ // it has style inside index.scss ---> // Start Sidebar/SidebarMenu && end Sidebar/SidebarMenu import React from "react"; -import Switch from "../../Switch"; +import Switch from "../../SwitchDesign/Switch"; const COMPONENTS = { Switch: , diff --git a/src/components/Sidebar/index.js b/src/components/Sidebar/index.js new file mode 100644 index 0000000..d3dd161 --- /dev/null +++ b/src/components/Sidebar/index.js @@ -0,0 +1,27 @@ +import React, { useState } from "react"; + +import SidebarMenu from "./SidebarMenu"; +import SidebarDesign2 from "./SidebarDesign2"; + +function Advertisements() { + const list = { + 1: , + 2: , + }; + const [type, setType] = useState(1); + return ( +
+ + {list[type]} +
+ ); +} + +export default Advertisements; diff --git a/src/components/SwitchDesign/Switch2/index.js b/src/components/SwitchDesign/Switch2/index.js new file mode 100644 index 0000000..d279ea8 --- /dev/null +++ b/src/components/SwitchDesign/Switch2/index.js @@ -0,0 +1,15 @@ +// it has style inside index.scss ---> // Start Switch2 Component && end Switch2 Component + +import React from "react"; + +export default function index() { + return ( +
+ + +
+ ); +} diff --git a/src/components/SwitchDesign/index.js b/src/components/SwitchDesign/index.js index 8028d98..dd593ca 100644 --- a/src/components/SwitchDesign/index.js +++ b/src/components/SwitchDesign/index.js @@ -1,10 +1,12 @@ import React, { useState } from "react"; import Switch from "./Switch"; +import Switch2 from "./Switch2"; function SwitchDesign() { const list = { 1: , + 2: , }; const [type, setType] = useState(1); return ( diff --git a/src/index.scss b/src/index.scss index e59ee8e..d51fba5 100644 --- a/src/index.scss +++ b/src/index.scss @@ -1160,3 +1160,42 @@ $success: #23c933; } // * end CheckBox Component + +// TODO Start Switch2 Component + +.switch { + position: relative; + input[type="checkbox"] { + visibility: hidden; + position: absolute; + &:checked + label { + transform: rotate(0deg); + background-color: #000; + &:before { + transform: translateX(35.5px); + background-color: #fff; + } + } + } + + label { + transition: transform 0.3s ease-in-out; + transform-origin: 50% 50%; + + &:before { + transition: transform 0.3s ease; + transition-delay: 0s; + content: ""; + display: block; + position: absolute; + width: 24px; + height: 24px; + background-color: #000; + border-radius: 50%; + top: 2px; + left: 3px; + } + } +} + +// * end Switch2 Component diff --git a/src/redux/data.js b/src/redux/data.js index c9cf179..be2cc23 100644 --- a/src/redux/data.js +++ b/src/redux/data.js @@ -21,6 +21,7 @@ import Input from "../components/Input"; import Navbar from "../components/Navbar"; import SearchDesign from "../components/SearchDesign"; import SwitchDesign from "../components/SwitchDesign"; +import Sidebar from "../components/Sidebar"; // mini components import MiniComponents from "../components/MiniComponents"; @@ -544,6 +545,16 @@ const components = [ code: null, }, }, + { + name: "Sidebar", + author: "Andalib", + props: [], + content: { + name: "Sidebar", + component: , + code: null, + }, + }, // mini components { name: "Mini Components",