From d70d041b2b970e2d7ea6b76feac517c621fd9ab5 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 11 Jan 2024 23:24:32 -0600 Subject: [PATCH 1/2] more --- src/Components/Navigation/Navbar.js | 1 - src/styles/homepage.scss | 2 +- src/styles/login.scss | 6 ++++++ src/styles/signup.scss | 3 +++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/Components/Navigation/Navbar.js b/src/Components/Navigation/Navbar.js index 5ce8052..8e0199d 100644 --- a/src/Components/Navigation/Navbar.js +++ b/src/Components/Navigation/Navbar.js @@ -56,7 +56,6 @@ const NavbarElement = (props) => { } function packUpAndLeave(link) { - console.log("packUpAndLeave!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", link); navToggle(); handleClick(link); } diff --git a/src/styles/homepage.scss b/src/styles/homepage.scss index cff680d..41c4053 100644 --- a/src/styles/homepage.scss +++ b/src/styles/homepage.scss @@ -784,7 +784,7 @@ li.nav-item { .heading-2-mobile { display: flex; - font-size: 1.3rem; + font-size: 1.365rem; } button.button-1 { diff --git a/src/styles/login.scss b/src/styles/login.scss index 3cacb0e..a168910 100644 --- a/src/styles/login.scss +++ b/src/styles/login.scss @@ -83,4 +83,10 @@ .login-form-wrapper { width: 400px; } + .login-button-wrapper { + display: flex; + flex-direction: column; + align-items: center; + margin: auto; + } } diff --git a/src/styles/signup.scss b/src/styles/signup.scss index 599f761..2b41d5b 100644 --- a/src/styles/signup.scss +++ b/src/styles/signup.scss @@ -42,9 +42,11 @@ flex-direction: column; align-items: flex-end; } + .signup-btn { width: 150px; } + .signup-passw-inputs { width: 100%; } @@ -82,6 +84,7 @@ span { .signup-button-box { width: 320px; + align-items: center; } .signup-passw-inputs { From 36e0049e467726d56e3be728c724326fa3820b20 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 11 Jan 2024 23:37:31 -0600 Subject: [PATCH 2/2] More --- src/Components/Navigation/Navbar.js | 2 + src/Components/Navigation/Navpanel.js | 98 ++++++++++++++++++--------- 2 files changed, 67 insertions(+), 33 deletions(-) diff --git a/src/Components/Navigation/Navbar.js b/src/Components/Navigation/Navbar.js index 8e0199d..e5f969d 100644 --- a/src/Components/Navigation/Navbar.js +++ b/src/Components/Navigation/Navbar.js @@ -26,6 +26,7 @@ const CustomToggle = React.forwardRef(({ onClick }, ref) => ( const NavbarElement = (props) => { //const [showMenu, setShowMenu] = useState(false); const [menuOpen, setMenuOpen] = useState(true); + const [isMobile, setIsMobile] = useState(window.innerWidth < 440); const token = window.sessionStorage.getItem("token"); const navigate = useNavigate(); const navItems = token @@ -119,6 +120,7 @@ const NavbarElement = (props) => { menuOpen={menuOpen} navToggle={navToggle} packUpAndLeave={packUpAndLeave} + token={token} /> diff --git a/src/Components/Navigation/Navpanel.js b/src/Components/Navigation/Navpanel.js index cc079ca..8dca5d8 100644 --- a/src/Components/Navigation/Navpanel.js +++ b/src/Components/Navigation/Navpanel.js @@ -4,8 +4,8 @@ import "../../styles/contact.scss"; import { Link } from "react-router-dom"; export default function Navpanel(props) { - const { menuOpen, setMenuOpen, navToggle, packUpAndLeave } = props; - console.log("+++++++++menuOpen", menuOpen); + const { menuOpen, setMenuOpen, navToggle, packUpAndLeave, token } = props; + const mobileMainHeadingClass = menuOpen ? "mobileMainHeadingShow" : "mobile-main-heading-hide"; @@ -14,8 +14,6 @@ export default function Navpanel(props) { ? "mobile-heading-wrapper1" : "mobile-heading-wrapper"; - console.log("mobileMainHeadingClass", mobileMainHeadingClass); - console.log("mobileHeadingWrapperClass", mobileHeadingWrapperClass); return (
@@ -25,37 +23,71 @@ export default function Navpanel(props) {
-
-
- packUpAndLeave("login")} - > - Login - + {!token ? ( + - + )}