From 3c8813a24905efed926b9c410605b2a7d5ec1457 Mon Sep 17 00:00:00 2001 From: Nilanchal Date: Fri, 11 Oct 2024 20:22:12 +0530 Subject: [PATCH 1/3] Navbar bug fixed --- .../src/components/Shared/footer/Content.jsx | 70 +++++++++---------- .../src/components/Shared/footer/Footer.jsx | 3 +- 2 files changed, 35 insertions(+), 38 deletions(-) diff --git a/frontend/src/components/Shared/footer/Content.jsx b/frontend/src/components/Shared/footer/Content.jsx index 0812a3d7..7a101361 100644 --- a/frontend/src/components/Shared/footer/Content.jsx +++ b/frontend/src/components/Shared/footer/Content.jsx @@ -1,10 +1,10 @@ -import React, { useEffect, useState } from 'react'; +import { useEffect, useState } from 'react'; import Logo from '../../../assets/Logo/playcafe.png'; import { FaFacebook, FaInstagram, FaTiktok } from 'react-icons/fa'; export default function Content() { return ( -
+
@@ -40,16 +40,12 @@ const Section2 = () => { } text-white`} >

BoardGame {!isWide &&
}

Cafe

@@ -103,35 +99,37 @@ const Nav = () => { const emailAddress = 'sipnplaynyc@gmail.com'; return ( -
-
-

About

- {navLinks.map((item, index) => ( - - {item.name} - - ))} -
-
-

Socials

- {socialLink.map((item, index) => ( - - {item.icon} - {item.name} - - ))} +
+
+
+

About

+ {navLinks.map((item, index) => ( + + {item.name} + + ))} +
+
+

Socials

+ {socialLink.map((item, index) => ( + + {item.icon} + {item.name} + + ))} +
-
+

Contact Us

{ @@ -8,7 +7,7 @@ const Footer = () => { style={{ clipPath: 'polygon(0% 0, 100% 0%, 100% 100%, 0 100%)' }} >
-
+
From 85d40ee8e47d37ea0f955bf18a60fa212085d1c8 Mon Sep 17 00:00:00 2001 From: Nilanchal Date: Sun, 13 Oct 2024 18:56:45 +0530 Subject: [PATCH 2/3] Fixed the overflow of whole body --- frontend/src/components/Shared/Navbar.jsx | 13 ++++++------- frontend/src/components/ui/Landing.jsx | 4 ++-- frontend/src/index.css | 7 ++++++- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/frontend/src/components/Shared/Navbar.jsx b/frontend/src/components/Shared/Navbar.jsx index e74f284b..af9a8fda 100644 --- a/frontend/src/components/Shared/Navbar.jsx +++ b/frontend/src/components/Shared/Navbar.jsx @@ -1,14 +1,14 @@ import { useState, useEffect } from 'react'; import Logo from '../../assets/Logo/playcafe.png'; import { Link, useLocation, useNavigate } from 'react-router-dom'; -import Cookies from 'js-cookie' +import Cookies from 'js-cookie'; const Navbar = () => { const [isloggedIn, setisloggedIn] = useState(false); const [isModalOpen, setIsModalOpen] = useState(false); const [isScrolled, setIsScrolled] = useState(false); const [isMenuOpen, setIsMenuOpen] = useState(false); - const [token,setToken] = useState(Cookies.get('authToken')); + const [token, setToken] = useState(Cookies.get('authToken')); const location = useLocation(); const navigate = useNavigate(); // Correctly initialize useNavigate @@ -33,7 +33,6 @@ const Navbar = () => { return () => { window.removeEventListener('scroll', handleScroll); }; - }, []); const toggleMenu = () => { @@ -42,12 +41,12 @@ const Navbar = () => { const handleLogout = () => { // setisloggedIn(false); // Set isLoggedIn to false on confirmation - //managing log in , logout using jwt tokens - Cookies.remove("authToken"); + //managing log in , logout using jwt tokens + Cookies.remove('authToken'); setToken(null); setIsModalOpen(false); // Close the modal - setIsMenuOpen(false) // after getting logged out close the menu if it is open - navigate("/login");//navigate to login after get logged out + setIsMenuOpen(false); // after getting logged out close the menu if it is open + navigate('/login'); //navigate to login after get logged out }; const isHomePage = location.pathname === '/'; diff --git a/frontend/src/components/ui/Landing.jsx b/frontend/src/components/ui/Landing.jsx index 30f93f11..0ecefc1a 100644 --- a/frontend/src/components/ui/Landing.jsx +++ b/frontend/src/components/ui/Landing.jsx @@ -35,10 +35,10 @@ function Landing() { return (
-
+
{/* Text Content */} -
+

A unique café experience awaits you

diff --git a/frontend/src/index.css b/frontend/src/index.css index 73a77c0c..eca33bfa 100644 --- a/frontend/src/index.css +++ b/frontend/src/index.css @@ -22,6 +22,12 @@ } } +/* ------- THIS IS WILL REMOVE THE EMPTY SPACE THAT IS BEING CREATED ON THE EXTREME RIGHT SIDE OF THE WEBSITE ------- */ +/* *::-webkit-scrollbar { + display: none; +} */ +/* ------------------------------------------------------------------------------------------------------------------ */ + ::-webkit-scrollbar { width: 7px; height: 7px; @@ -36,4 +42,3 @@ background-color: #004d43; border-radius: 10px; } - From 6571b5e608f41903ea60b52641f74a8c9a58b608 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 13 Oct 2024 13:27:08 +0000 Subject: [PATCH 3/3] docs(contributor): contrib-readme-action has updated readme --- README.md | 85 +++++++++++-------------------------------------------- 1 file changed, 16 insertions(+), 69 deletions(-) diff --git a/README.md b/README.md index 6b2dc422..98e2e83e 100644 --- a/README.md +++ b/README.md @@ -140,42 +140,12 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Arindam - - - Ashwinib26 -
- Ashwini_ab - - - - - itznayan -
- Mahera Nayan - - tejasbenibagde
Tejas Benibagde - - - - - - Shirisha-16 -
- Tyarla Shirisha - - - - - haseebzaki-07 -
- Haseeb Zaki - @@ -184,13 +154,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Suhas Koheda - - - vishnuprasad2004 -
- Vishnu Prasad Korada - - sajalbatra @@ -198,15 +161,15 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Sajal Batra + + - - Amnyadav + + vishnuprasad2004
- Aman Yadav + Vishnu Prasad Korada - - AbhijitMotekar99 @@ -214,6 +177,13 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Abhijit Motekar + + + itznayan +
+ Mahera Nayan + + Navneetdadhich @@ -235,6 +205,8 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Shiva Bajpai + + Sawan-Kushwah @@ -242,15 +214,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Sawan kushwah - - - devxMani -
- MANI - - - - Ayush215mb @@ -286,6 +249,8 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Jay shah + + Mohitranag18 @@ -293,8 +258,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Mohit Rana - - MutiatBash @@ -302,13 +265,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Bashua Mutiat - - - NilanchalaPanda -
- Nilanchal - - Sapna127 @@ -316,13 +272,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Sapna Kul - - - Sourabh782 -
- Sourabh Singh Rawat - - stutxi @@ -337,8 +286,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Syed Faraz - - Vaibhav-Kumar-K-R