From 360eadd79edf02e2cc5b189e1e9bb4fbef4cbf3e Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bdumont@grandlyon.com>
Date: Tue, 18 Apr 2023 15:34:21 +0200
Subject: [PATCH] move navigations
---
src/components/Layout/Layout.tsx | 8 ++++----
.../{Navbar/Navbar.tsx => Navigation/BottomBar.tsx} | 6 +++---
src/components/{Menu/Menu.tsx => Navigation/SideBar.tsx} | 6 +++---
.../{Navbar/navbar.scss => Navigation/bottombar.scss} | 0
.../{Menu/menu.scss => Navigation/sidebar.scss} | 0
5 files changed, 10 insertions(+), 10 deletions(-)
rename src/components/{Navbar/Navbar.tsx => Navigation/BottomBar.tsx} (87%)
rename src/components/{Menu/Menu.tsx => Navigation/SideBar.tsx} (90%)
rename src/components/{Navbar/navbar.scss => Navigation/bottombar.scss} (100%)
rename src/components/{Menu/menu.scss => Navigation/sidebar.scss} (100%)
diff --git a/src/components/Layout/Layout.tsx b/src/components/Layout/Layout.tsx
index 440e00c2..56c36435 100644
--- a/src/components/Layout/Layout.tsx
+++ b/src/components/Layout/Layout.tsx
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from 'react'
+import BottomBar from '../Navigation/BottomBar'
+import SideBar from '../Navigation/SideBar'
import styles from './layout.module.scss'
-import Menu from '../Menu/Menu'
-import Navbar from '../Navbar/Navbar'
interface LayoutProps {
children: React.ReactNode
@@ -30,11 +30,11 @@ const Layout: React.FC<LayoutProps> = ({ children }: LayoutProps) => {
<div className={styles.root}>
{!isMobile ? (
<div className={styles.menuWrapper}>
- <Menu />
+ <SideBar />
</div>
) : (
<div className={styles.mobileNavWrapper}>
- <Navbar />
+ <BottomBar />
</div>
)}
<div className={styles.wrapper}>
diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navigation/BottomBar.tsx
similarity index 87%
rename from src/components/Navbar/Navbar.tsx
rename to src/components/Navigation/BottomBar.tsx
index bf71857f..ec7cf5f4 100644
--- a/src/components/Navbar/Navbar.tsx
+++ b/src/components/Navigation/BottomBar.tsx
@@ -3,9 +3,9 @@ import { NavLink } from 'react-router-dom'
import { useAuth } from '../../hooks/useAuth'
import { UserContext } from '../../hooks/userContext'
import { routes } from '../Routes/Router'
-import './navbar.scss'
+import './bottombar.scss'
-const Navbar: React.FC = () => {
+const BottomBar: React.FC = () => {
const { user } = useContext(UserContext)
const { logoutUser } = useAuth()
@@ -32,4 +32,4 @@ const Navbar: React.FC = () => {
)
}
-export default Navbar
+export default BottomBar
diff --git a/src/components/Menu/Menu.tsx b/src/components/Navigation/SideBar.tsx
similarity index 90%
rename from src/components/Menu/Menu.tsx
rename to src/components/Navigation/SideBar.tsx
index 014efe8a..c134495a 100644
--- a/src/components/Menu/Menu.tsx
+++ b/src/components/Navigation/SideBar.tsx
@@ -4,9 +4,9 @@ import logo from '../../assets/icons/ecolyo-logo.svg'
import { useAuth } from '../../hooks/useAuth'
import { UserContext } from '../../hooks/userContext'
import { routes } from '../Routes/Router'
-import './menu.scss'
+import './sidebar.scss'
-const Menu: React.FC = () => {
+const SideBar: React.FC = () => {
const { user } = useContext(UserContext)
const { logoutUser } = useAuth()
@@ -42,4 +42,4 @@ const Menu: React.FC = () => {
)
}
-export default Menu
+export default SideBar
diff --git a/src/components/Navbar/navbar.scss b/src/components/Navigation/bottombar.scss
similarity index 100%
rename from src/components/Navbar/navbar.scss
rename to src/components/Navigation/bottombar.scss
diff --git a/src/components/Menu/menu.scss b/src/components/Navigation/sidebar.scss
similarity index 100%
rename from src/components/Menu/menu.scss
rename to src/components/Navigation/sidebar.scss
--
GitLab