diff --git a/src/components/Navigations/MainNavigation.css b/src/components/Navigations/MainNavigation.css index 79a99e6..94e417d 100644 --- a/src/components/Navigations/MainNavigation.css +++ b/src/components/Navigations/MainNavigation.css @@ -5,22 +5,53 @@ padding: 1rem; } -.main-navigation ul { - display: flex; - list-style: none; - margin: 0; - padding: 0; +.main-navigation .navbar { + background-color: #333 !important; } -.main-navigation ul li { - margin-right: 1rem; +.main-navigation .navbar-item { + color: white !important; + font-weight: bold; } -.main-navigation ul li a { +.main-navigation .navbar-item:hover { + background-color: #444 !important; + color: #f5f5f5 !important; +} + +.main-navigation .button { + margin-left: 0.5rem; +} + +.main-navigation .button.is-primary { + background-color: #007BFF; + border-color: #0056b3; +} + +.main-navigation .button.is-primary:hover { + background-color: #0056b3; + border-color: #003f7f; +} + +.main-navigation .button.is-danger { + background-color: #e3342f; + border-color: #a21c1c; +} + +.main-navigation .button.is-danger:hover { + background-color: #a21c1c; + border-color: #6c0e0e; +} + +.main-navigation .navbar-burger { color: white; - text-decoration: none; } -.main-navigation ul li a:hover { - text-decoration: underline; +.main-navigation .navbar-burger:hover { + background-color: #444; +} + +.main-navigation .navbar-item:not(:last-child) { + border-right: 1px solid #555; + padding-right: 1rem; } \ No newline at end of file diff --git a/src/components/Navigations/MainNavigation.js b/src/components/Navigations/MainNavigation.js index 9f7ee18..5be7605 100644 --- a/src/components/Navigations/MainNavigation.js +++ b/src/components/Navigations/MainNavigation.js @@ -1,42 +1,77 @@ -//src/components/MainNavigation.js - -import React, {useContext} from "react"; +import React, { useContext } from "react"; import { Link } from "react-router-dom"; -import "./MainNavigation.css"; -import {AuthContext} from "../../AuthProvider"; +import { AuthContext } from "../../AuthProvider"; +import "bulma/css/bulma.min.css"; const MainNavigation = () => { const { user, login, logout } = useContext(AuthContext); + return ( - ); }; diff --git a/src/components/Navigations/SideNavigation.css b/src/components/Navigations/SideNavigation.css index 00d8d8c..d1db9e8 100644 --- a/src/components/Navigations/SideNavigation.css +++ b/src/components/Navigations/SideNavigation.css @@ -1,29 +1,60 @@ -/*src/components/SideNavigation.css*/ +/* src/components/SideNavigation.css */ .side-navigation { width: 250px; - background-color: #f4f4f4; + background-color: #ffffff; padding: 1rem; - border-right: 1px solid #ddd; + border-right: 1px solid #dbdbdb; + height: 100%; + overflow-y: auto; + box-shadow: 2px 0 5px rgba(0, 0, 0, 0.1); } .side-navigation h3 { - margin-top: 0; + font-size: 1.2rem; + font-weight: 600; + color: #4a4a4a; + margin-bottom: 0.75rem; + border-bottom: 1px solid #dbdbdb; + padding-bottom: 0.5rem; } .side-navigation ul { list-style: none; padding: 0; + margin: 0; } .side-navigation ul li { margin-bottom: 0.5rem; + transition: background-color 0.3s ease, padding-left 0.3s ease; +} + +.side-navigation ul li:hover { + background-color: #f5f5f5; + padding-left: 10px; } .side-navigation ul li a { text-decoration: none; - color: #333; + color: #3273dc; + font-weight: 500; + display: inline-block; + width: 100%; + padding: 0.5rem 0.75rem; + border-radius: 4px; + transition: color 0.3s ease, background-color 0.3s ease; } .side-navigation ul li a:hover { - text-decoration: underline; + text-decoration: none; + color: #ffffff; + background-color: #3273dc; +} + +.side-navigation ul li span { + font-weight: 700; + color: #363636; + margin-bottom: 0.5rem; + display: inline-block; + padding: 0.5rem 0.75rem; } \ No newline at end of file diff --git a/src/components/Navigations/SideNavigation.js b/src/components/Navigations/SideNavigation.js index cf09af6..67338b0 100644 --- a/src/components/Navigations/SideNavigation.js +++ b/src/components/Navigations/SideNavigation.js @@ -1,9 +1,6 @@ -// src/components/SideNavigation.js - import React, { useEffect, useState } from "react"; import { Link } from "react-router-dom"; -import "./SideNavigation.css"; -import {fetchWithCache} from "../../utils/fetchWithCache"; +import { fetchWithCache } from "../../utils/fetchWithCache"; import PermissionGuard from "../PermissionGuard"; import config from "../../config"; @@ -42,17 +39,24 @@ const SideNavigation = () => { function renderTree(node, basePath = "") { return (