diff --git a/src/assets/images/icons/account.svg b/src/assets/images/icons/account.svg new file mode 100644 index 0000000..a1a0d0a --- /dev/null +++ b/src/assets/images/icons/account.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/icons/dashboard.svg b/src/assets/images/icons/dashboard.svg new file mode 100644 index 0000000..9e0e79e --- /dev/null +++ b/src/assets/images/icons/dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/icons/family.svg b/src/assets/images/icons/family.svg new file mode 100644 index 0000000..8e1c7f8 --- /dev/null +++ b/src/assets/images/icons/family.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/icons/logout.svg b/src/assets/images/icons/logout.svg new file mode 100644 index 0000000..dedc9b3 --- /dev/null +++ b/src/assets/images/icons/logout.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/icons/market.svg b/src/assets/images/icons/market.svg new file mode 100644 index 0000000..fcd606d --- /dev/null +++ b/src/assets/images/icons/market.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/icons/my-task.svg b/src/assets/images/icons/my-task.svg new file mode 100644 index 0000000..a864cdf --- /dev/null +++ b/src/assets/images/icons/my-task.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/images/icons/profile.svg b/src/assets/images/icons/profile.svg new file mode 100644 index 0000000..35d854a --- /dev/null +++ b/src/assets/images/icons/profile.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index 1f99a17..10905f7 100644 --- a/src/components/AuthPages/Login/index.jsx +++ b/src/components/AuthPages/Login/index.jsx @@ -207,11 +207,11 @@ export default function Login() { {/* switch login component */} -
+
@@ -234,7 +234,7 @@ export default function Login() { { loginType == 'full' ? ( //user login component -
+
+
) : name === "master-card" ? ( card + ) : name === "new-dashboard" ? ( + dashboard + ) : name === "new-family" ? ( + family + ) : name === "new-logout" ? ( + logout + ) : name === "new-market" ? ( + market + ) : name === "new-mytask" ? ( + task ) : ( "" )} diff --git a/src/components/Partials/MobileSideBar.jsx b/src/components/Partials/MobileSideBar.jsx index c0086a2..e6f5356 100644 --- a/src/components/Partials/MobileSideBar.jsx +++ b/src/components/Partials/MobileSideBar.jsx @@ -87,7 +87,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ title="Dashboard" route="/" sidebar={sidebar} - iconName="market" + iconName="new-dashboard" /> {userDetails && userDetails?.account_type !== "FAMILY" && ( )}
@@ -125,7 +125,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ @@ -244,24 +244,8 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ type="button" className="signout-btn flex items-center space-x-1 p-2.5 w-2/3 h-[52px] bg-sky-blue transition duration-300 ease-in-out hover:bg-gray-900 rounded-full" > - - - - - - + + { +const ListItem = ({ sidebar, route, title, bubble, popup, iconName }) => { return (
  • { }`} > - + diff --git a/src/components/Partials/Sidebar.jsx b/src/components/Partials/Sidebar.jsx index 6a6607f..379202b 100644 --- a/src/components/Partials/Sidebar.jsx +++ b/src/components/Partials/Sidebar.jsx @@ -113,7 +113,7 @@ export default function Sidebar({ title="Dashboard" route="/" sidebar={sidebar} - iconName="market" + iconName="new-dashboard" /> {userDetails && userDetails?.account_type !== "FAMILY" && ( )} @@ -129,7 +129,7 @@ export default function Sidebar({ title="My Task(s)" route="/mytask" sidebar={sidebar} - iconName="market" + iconName="new-mytask" />
  • @@ -150,7 +150,7 @@ export default function Sidebar({ @@ -272,24 +272,8 @@ export default function Sidebar({ type="button" className="signout-btn flex items-center space-x-1 p-2.5 w-2/3 h-[52px] bg-sky-blue transition duration-300 ease-in-out hover:bg-gray-900 rounded-full" > - - - - - - + + {