From 7021d0ba07fdc02cb11fab888a662c2ca80b4ddf Mon Sep 17 00:00:00 2001 From: YasinOnm08 Date: Wed, 25 Sep 2024 11:22:59 +0200 Subject: [PATCH] header rewrite start --- app/components/Header.tsx | 19 +++++--- app/components/Login.tsx | 9 ++-- app/styles/Login.css | 31 ------------- app/styles/header.css | 96 +++++++-------------------------------- app/styles/responsive.css | 25 +++++----- app/styles/variables.css | 3 +- 6 files changed, 47 insertions(+), 136 deletions(-) diff --git a/app/components/Header.tsx b/app/components/Header.tsx index 26a3f99..50eaa60 100644 --- a/app/components/Header.tsx +++ b/app/components/Header.tsx @@ -17,6 +17,11 @@ const Header: React.FC = ({ onViewChange, showDivs, toggleDivs, sho setMenuOpen(!menuOpen) } + const buttonClicked = (page: "AI" | "Documentation" | "FAQ") => { + onViewChange(page) + toggleMenu() + } + return ( <>
@@ -26,18 +31,20 @@ const Header: React.FC = ({ onViewChange, showDivs, toggleDivs, sho - {/* */} - + +
+ +
); diff --git a/app/components/Login.tsx b/app/components/Login.tsx index d98896e..6a6171f 100644 --- a/app/components/Login.tsx +++ b/app/components/Login.tsx @@ -52,11 +52,10 @@ const Login: React.FC = () => { return (
{/* Login or Settings Button */} -
- -
+ + {/* Conditional rendering of the Login Popup */} {showLoginPopup && ( diff --git a/app/styles/Login.css b/app/styles/Login.css index 8c77229..579d780 100644 --- a/app/styles/Login.css +++ b/app/styles/Login.css @@ -1,34 +1,3 @@ -/* Container for the login layout */ -.login-container { - display: grid; - grid-template-columns: 1fr 3fr; /* 1fr for sidebar, 3fr for main content */ - grid-auto-flow: column; - overflow-x: hidden; - height: 100%; /* Ensure it takes full height */ -} - -/* Button for login action */ -.login-button { - position: absolute; - top: 5px; - right: 10px; - z-index: 9999; /* Highest z-index for the login button */ - margin: 1px; -} - -.login-button button { - padding: 10px 20px; - background-color: var(--input-button-color); - color: var(--text-color); - border: none; - border-radius: 5px; - cursor: pointer; - transition: background-color 0.3s; -} - -.login-button button:hover { - background-color: var(--input-button-hover-color); -} /* Overlay for popup - full screen and centered */ .popup-overlay { diff --git a/app/styles/header.css b/app/styles/header.css index c630cb2..0e1303e 100644 --- a/app/styles/header.css +++ b/app/styles/header.css @@ -1,93 +1,29 @@ -header { - background-color: var(--header-background-color); /* Use the new header background color */ - color: var(--header-text-color); /* Use the new header text color */ - width: 100%; - text-decoration: none; - position: fixed; +header{ + position: absolute; + padding: 0 20px; top: 0; left: 0; - padding: 10px 20px; - box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2); - z-index: 1000; - font-family: var(--font-family); + width: 100%; + height: 10vh; display: flex; justify-content: space-between; align-items: center; } -.nav-links{ - display: flex; - gap: 15px; -} - -.nav-btn{ - background: transparent; - border: none; - cursor: pointer; - /* color */ -} - -.nav-btn:hover{ - /* color */ -} - .hamburger{ display: none; - flex-direction: column; +} + +.login-button button{ + padding: 10px 20px; + background-color: var(--input-button-color); + color: var(--text-color); + border: none; + border-radius: 5px; cursor: pointer; + transition: background-color 0.3s; } -.hamburger span{ - width: 25px; - height: 3px; - background-color: var(--header-text-color); - margin: 4px; - transition: 0.3s; -} - -.hamburger.open span:nth-child(1){ - transform: rotate(45deg) translate(5px, 5px); -} - -.hamburger.open span:nth-child(2){ - opacity: 0; -} - -.hamburger.open span:nth-child(3){ - transform: rotate(-45deg) translate(5px, -5px); -} - -.header-button{ - -} -.header-button img{ - height: 8vh; -} - -@media (max-width:768px) { - .nav-links{ - display: none; - position: absolute; - top: 60px; - right: 0; - /* background color */ - width: 100%; - flex-direction: column; - align-items: flex-start; - padding: 10px; - } - - .nav-links.active{ - display: flex; - } - - .nav-btn{ - width: 100%; - text-align: center; - padding: 10px; - } - - .hamburger{ - display: flex; - } +.login-button button:hover { + background-color: var(--input-button-hover-color); } \ No newline at end of file diff --git a/app/styles/responsive.css b/app/styles/responsive.css index 3921092..f09edeb 100644 --- a/app/styles/responsive.css +++ b/app/styles/responsive.css @@ -8,8 +8,6 @@ /* Header styles */ header { - flex-direction: column; - align-items: center; position: fixed; top: 0; left: 0; @@ -36,17 +34,6 @@ margin: 0; } - header li button { - margin: 2px; - margin-bottom: 0; - } - - header li img { - height: 1.5em; - vertical-align: middle; - margin-top: 10px; - } - /* Left panel styles */ .left-panel { display: hidden; /* Initially hidden */ @@ -120,6 +107,18 @@ .login-button button{ margin: 20px 0; } + + .hamburger.open{ + margin-top: 0.5vh; + } + + .nav-links{ + position: fixed; + } + + .hamburger { + display: flex; + } } /* Responsive adjustments for the settings */ diff --git a/app/styles/variables.css b/app/styles/variables.css index a051e6d..928e21d 100644 --- a/app/styles/variables.css +++ b/app/styles/variables.css @@ -18,7 +18,8 @@ --left-panel-background-color: #79832e; /* Background color for left panel */ --conversation-background-color: #79832e; /* Background color for conversation container */ --doc-background-color: #ffffff; /* Background color for documents */ - --close-button-color: red; + --close-button-color: red; + --burger-menu-background-color: #79832e; /* FAQ Colors */ --faq-background-color: #474D22; /* Background color for FAQ section */