From 6858639161fda5f8d9a1c9b7413eec9d56063d51 Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Wed, 3 Aug 2022 10:55:30 +0300 Subject: [PATCH 01/42] update: update navigation components - Update 'products' to 'apps' - Make nav content stay withing the same contains as the page body on large screen. - Change nav items order on mobile - Add emojis to profile menu items #107 --- src/App.tsx | 8 +- src/Components/Navbar/NavDesktop.tsx | 18 ++-- src/Components/Navbar/NavMobile.tsx | 88 ++++++++++--------- .../CategoryPage/HeaderImage/HeaderImage.tsx | 2 +- .../ExplorePage/Categories/Categories.tsx | 2 +- .../ProjectsSection/ProjectsSection.tsx | 6 +- src/styles/index.scss | 22 +++-- src/utils/hooks/useCurrentSection.ts | 4 +- 8 files changed, 81 insertions(+), 69 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 5d0c5b1..96f174c 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -93,9 +93,9 @@ function App() { } /> }> - } /> - } /> - } /> + } /> + } /> + } /> } /> } /> @@ -108,7 +108,7 @@ function App() { } /> } /> - } /> + } /> diff --git a/src/Components/Navbar/NavDesktop.tsx b/src/Components/Navbar/NavDesktop.tsx index ae3e460..797b6ab 100644 --- a/src/Components/Navbar/NavDesktop.tsx +++ b/src/Components/Navbar/NavDesktop.tsx @@ -5,16 +5,14 @@ import ASSETS from "src/assets"; import Search from "./Search/Search"; import IconButton from "../IconButton/IconButton"; import { Link, useNavigate } from "react-router-dom"; -import { useRef, useState } from "react"; +import { useState } from "react"; import { Menu, MenuItem, MenuButton, - useMenuState, - ControlledMenu, } from '@szhsin/react-menu'; import '@szhsin/react-menu/dist/index.css'; -import { FiChevronDown, FiLogIn } from "react-icons/fi"; +import { FiChevronDown } from "react-icons/fi"; import Avatar from "src/features/Profiles/Components/Avatar/Avatar"; import { createRoute } from "src/utils/routing"; import Button from "../Button/Button"; @@ -41,7 +39,7 @@ export default function NavDesktop() { return (