From 0c3175760ceea3745a291430157d2ff0c12abebe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 12 Oct 2024 06:11:21 +0000 Subject: [PATCH 1/8] docs(contributor): contrib-readme-action has updated readme --- README.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ed36c57e..0e48196d 100644 --- a/README.md +++ b/README.md @@ -235,6 +235,13 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Sawan kushwah + + + devxMani +
+ MANI + + Ayush215mb @@ -242,6 +249,8 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Ayush Yadav + + AliGates915 @@ -249,8 +258,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Ali Gates - - mishradev1 @@ -286,6 +293,8 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Bashua Mutiat + + NilanchalaPanda @@ -293,8 +302,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Nilanchal - - Sapna127 From 08363046c060538c1c41ff2f78075058af4c8068 Mon Sep 17 00:00:00 2001 From: Nayan Mahera Date: Sat, 12 Oct 2024 13:07:11 +0530 Subject: [PATCH 2/8] preloader and page transition added --- frontend/src/App.jsx | 2 + frontend/src/components/MainHOC.jsx | 20 +++++ frontend/src/components/Pages/Boardgame.jsx | 10 +-- frontend/src/components/Pages/Event.jsx | 54 ++++++++++--- frontend/src/components/Pages/Home.jsx | 38 +++++----- frontend/src/components/Pages/Menu.jsx | 19 +++-- frontend/src/components/Pages/Register.jsx | 18 ++--- frontend/src/components/Preloader.jsx | 84 +++++++++++++++++++++ frontend/src/main.jsx | 2 - 9 files changed, 198 insertions(+), 49 deletions(-) create mode 100644 frontend/src/components/MainHOC.jsx create mode 100644 frontend/src/components/Preloader.jsx diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 7e248824..bb8ff82b 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -4,10 +4,12 @@ import Navbar from '../src/components/Shared/Navbar'; import Footer from '../src/components/Shared/Footer'; import { Outlet } from 'react-router-dom'; import BackToTopButton from './components/Shared/BackToTopButton'; +import Preloader from './components/Preloader'; function App() { return ( <> + {/* */} diff --git a/frontend/src/components/MainHOC.jsx b/frontend/src/components/MainHOC.jsx new file mode 100644 index 00000000..9b3418e9 --- /dev/null +++ b/frontend/src/components/MainHOC.jsx @@ -0,0 +1,20 @@ +import { AnimatePresence, motion } from 'framer-motion'; +import React from 'react'; + +const MainHOC = (WrappedComponent) => { + return (props) => ( + + + + + + ); +}; + +export default MainHOC; diff --git a/frontend/src/components/Pages/Boardgame.jsx b/frontend/src/components/Pages/Boardgame.jsx index 001bb69a..3fb27d81 100644 --- a/frontend/src/components/Pages/Boardgame.jsx +++ b/frontend/src/components/Pages/Boardgame.jsx @@ -1,4 +1,4 @@ -import React, { useState ,useEffect} from 'react'; +import React, { useState, useEffect } from 'react'; import board1 from '../../assets/Boardgames/board1.png'; import board2 from '../../assets/Boardgames/board2.png'; import board3 from '../../assets/Boardgames/board3.jpg'; @@ -9,11 +9,11 @@ import board7 from '../../assets/Boardgames/board7.png'; import board8 from '../../assets/Boardgames/board8.png'; import board10 from '../../assets/Boardgames/board10.png'; import bg from '../../assets/Boardgames/bg.jpg'; - import { LazyLoadImage } from 'react-lazy-load-image-component'; import 'react-lazy-load-image-component/src/effects/blur.css'; - -export default function Boardgame() { +import MainHOC from '../MainHOC'; +export default MainHOC(Boardgame); +function Boardgame() { const [selectedBoard, setSelectedBoard] = useState(null); const [email, setEmail] = useState(''); @@ -323,4 +323,4 @@ export default function Boardgame() { ); -} \ No newline at end of file +} diff --git a/frontend/src/components/Pages/Event.jsx b/frontend/src/components/Pages/Event.jsx index fa133f31..90e9d3d0 100644 --- a/frontend/src/components/Pages/Event.jsx +++ b/frontend/src/components/Pages/Event.jsx @@ -12,7 +12,7 @@ import img5 from '../../assets/img/event6.jpg'; import band from '../../assets/landing/band.gif'; import game from '../../assets/Boardgames/carrom.gif'; import spin from '../../assets/Boardgames/spin.gif'; - +import MainHOC from '../MainHOC'; const daysOfWeek = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']; const months = [ 'January', @@ -28,7 +28,7 @@ const months = [ 'November', 'December', ]; -export default function Event() { +function Event() { const [events, setEvents] = useState([]); const [error, setError] = useState(null); useEffect(() => { @@ -131,8 +131,18 @@ export default function Event() { Upcoming Events and much more....
- game - game + game + game
@@ -190,19 +200,44 @@ export default function Event() {
  • - Event 1 + Event 1
  • - Event 2 + Event 2
  • - Event 3 + Event 3
  • - Event 4 + Event 4
  • - Event 6 + Event 6
    • {/* Add more images here */}
@@ -254,3 +289,4 @@ export default function Event() { ); } +export default MainHOC(Event); diff --git a/frontend/src/components/Pages/Home.jsx b/frontend/src/components/Pages/Home.jsx index 2f5001f1..a37bf94c 100644 --- a/frontend/src/components/Pages/Home.jsx +++ b/frontend/src/components/Pages/Home.jsx @@ -1,20 +1,22 @@ - -import Landing from "../ui/Landing"; -import ReviewCarousel from "../ui/ReviewCarousel"; -import FeedbackForm from "../ui/FeedbackForm"; -import About from "./About"; +import Landing from '../ui/Landing'; +import ReviewCarousel from '../ui/ReviewCarousel'; +import FeedbackForm from '../ui/FeedbackForm'; +import About from './About'; import React, { useEffect } from 'react'; +import MainHOC from '../MainHOC'; + +function Home() { + useEffect(() => { + window.scrollTo(0, 0); + }, []); + return ( +
+ + + + +
+ ); +} -export default function Home() { - useEffect(() => { - window.scrollTo(0, 0); - }, []); - return ( -
- - - - -
- ) -} \ No newline at end of file +export default MainHOC(Home); diff --git a/frontend/src/components/Pages/Menu.jsx b/frontend/src/components/Pages/Menu.jsx index 70fdddae..73cb1402 100644 --- a/frontend/src/components/Pages/Menu.jsx +++ b/frontend/src/components/Pages/Menu.jsx @@ -1,11 +1,11 @@ - -import { useState , useEffect } from 'react'; +import { useState, useEffect } from 'react'; import { motion } from 'framer-motion'; import Mybook from './MyBook'; import TodaysSpecial from './TodaysSpecial'; import { GiArrowDunk } from 'react-icons/gi'; import Cafe3dImg from '../../assets/Menu_assets/mega-creator.png'; +import MainHOC from '../MainHOC'; const parallaxVariants = { initial: { scale: 1 }, animate: { scale: 1.05 }, @@ -71,15 +71,22 @@ function ParallaxImage() {
*/} -
{/* Adjust this container */} +
+ {' '} + {/* Adjust this container */}
-
{/* Add bottom padding here */} +
+ {' '} + {/* Add bottom padding here */} -
+
); } -export default ParallaxImage; +export default MainHOC(ParallaxImage); diff --git a/frontend/src/components/Pages/Register.jsx b/frontend/src/components/Pages/Register.jsx index c55aff36..e8b660cd 100644 --- a/frontend/src/components/Pages/Register.jsx +++ b/frontend/src/components/Pages/Register.jsx @@ -1,13 +1,12 @@ +import { useState, useEffect } from 'react'; +import pic from '../../assets/img/abt1.jpg'; +import pic2 from '../../assets/img/abt1.png'; +import pic3 from '../../assets/img/abt2.png'; +import pic4 from '../../assets/img/abt3.png'; +import pic5 from '../../assets/img/abt4.png'; +import MainHOC from '../MainHOC'; -import { useState , useEffect } from "react"; -import pic from "../../assets/img/abt1.jpg"; -import pic2 from "../../assets/img/abt1.png"; -import pic3 from "../../assets/img/abt2.png"; -import pic4 from "../../assets/img/abt3.png"; -import pic5 from "../../assets/img/abt4.png"; - - -export default function Register() { +function Register() { const [date, setDate] = useState(''); const [time, setTime] = useState(''); const [guests, setGuests] = useState(); @@ -184,3 +183,4 @@ export default function Register() { ); } +export default MainHOC(Register); diff --git a/frontend/src/components/Preloader.jsx b/frontend/src/components/Preloader.jsx new file mode 100644 index 00000000..1be21786 --- /dev/null +++ b/frontend/src/components/Preloader.jsx @@ -0,0 +1,84 @@ +import { motion, AnimatePresence } from 'framer-motion'; +import { useEffect, useState } from 'react'; + +const Preloader = () => { + const [loading, setLoading] = useState(true); + const [percentage, setPercentage] = useState(0); + + // Simulate loading completion and faster percentage increment + useEffect(() => { + const loadingInterval = setInterval(() => { + setPercentage((prev) => { + if (prev >= 100) { + clearInterval(loadingInterval); + setTimeout(() => setLoading(false), 600); // Keep loading state true for the exit animation duration + return 100; + } + return prev + 1; // Increment percentage by 1 for a longer load time + }); + }, 15); // Adjusted interval for a smoother, slower progression + + return () => clearInterval(loadingInterval); + }, []); + + // Skill Animation Variants + const skillVariants = { + initial: { y: '100%' }, + animate: { y: -290 }, + exit: { y: '100%' }, + }; + + return ( + <> + + {loading && ( + + {/* Marquee effect for Mahera Nayan */} +
+ + {/* Skills Section in the Middle */} +
+
+ +
+
+ + {/* Loading Percentage (aligned above the bar, right side) */} + + {percentage} + + + {/* Loading Bar */} + + + )} + + + ); +}; + +export default Preloader; diff --git a/frontend/src/main.jsx b/frontend/src/main.jsx index 1e0a66fb..0853bb3a 100644 --- a/frontend/src/main.jsx +++ b/frontend/src/main.jsx @@ -1,9 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; import './index.css'; - import router from './router'; - import { RouterProvider } from 'react-router-dom'; ReactDOM.createRoot(document.getElementById('root')).render( From ed6e130861ee8c4dbbf667720120c28a018d486d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 12 Oct 2024 07:38:18 +0000 Subject: [PATCH 3/8] docs(contributor): contrib-readme-action has updated readme --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 0e48196d..e81113ad 100644 --- a/README.md +++ b/README.md @@ -184,6 +184,13 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Sajal Batra + + + itznayan +
+ Mahera Nayan + + Amnyadav @@ -197,13 +204,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌
Abhijit Motekar - - - - itznayan -
- Mahera Nayan - From 7308eaeae172e0823219a3b8712f9f56ae0ab21f Mon Sep 17 00:00:00 2001 From: Nayan Mahera Date: Sat, 12 Oct 2024 13:08:20 +0530 Subject: [PATCH 4/8] preloader and page transition added --- frontend/src/App.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index bb8ff82b..c5a927fb 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -9,7 +9,7 @@ import Preloader from './components/Preloader'; function App() { return ( <> - {/* */} + From ecbb3240b4a2d75d83c37fb38af920d51abc69be Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 12 Oct 2024 07:39:42 +0000 Subject: [PATCH 5/8] docs(contributor): contrib-readme-action has updated readme --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e81113ad..610fff91 100644 --- a/README.md +++ b/README.md @@ -154,6 +154,15 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Ashwini_ab + + + itznayan +
+ Mahera Nayan + + + + haseebzaki-07 @@ -161,8 +170,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Haseeb Zaki - - Suhas-Koheda @@ -184,13 +191,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Sajal Batra - - - itznayan -
- Mahera Nayan - - Amnyadav From a0aed99acd4545208af6f8dba3bbef7ce4885d1e Mon Sep 17 00:00:00 2001 From: Nayan Mahera Date: Sat, 12 Oct 2024 13:25:03 +0530 Subject: [PATCH 6/8] added suggetion changes --- frontend/src/components/Preloader.jsx | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/frontend/src/components/Preloader.jsx b/frontend/src/components/Preloader.jsx index 1be21786..764addae 100644 --- a/frontend/src/components/Preloader.jsx +++ b/frontend/src/components/Preloader.jsx @@ -22,11 +22,6 @@ const Preloader = () => { }, []); // Skill Animation Variants - const skillVariants = { - initial: { y: '100%' }, - animate: { y: -290 }, - exit: { y: '100%' }, - }; return ( <> @@ -39,21 +34,7 @@ const Preloader = () => { transition={{ duration: 1.4, ease: [0.83, 0, 0.17, 1] }} className="fixed top-0 left-0 w-full h-full bg-black z-[100] flex items-center justify-center overflow-hidden" > - {/* Marquee effect for Mahera Nayan */} -
- {/* Skills Section in the Middle */} -
-
- -
-
{/* Loading Percentage (aligned above the bar, right side) */} Date: Sat, 12 Oct 2024 07:56:18 +0000 Subject: [PATCH 7/8] docs(contributor): contrib-readme-action has updated readme --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 610fff91..e81113ad 100644 --- a/README.md +++ b/README.md @@ -154,15 +154,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Ashwini_ab - - - itznayan -
- Mahera Nayan - - - - haseebzaki-07 @@ -170,6 +161,8 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Haseeb Zaki + + Suhas-Koheda @@ -191,6 +184,13 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Sajal Batra + + + itznayan +
+ Mahera Nayan + + Amnyadav From 7f7e8d69286c172f1e24aa2d6a49c4175b71315a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 12 Oct 2024 12:59:07 +0000 Subject: [PATCH 8/8] docs(contributor): contrib-readme-action has updated readme --- README.md | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index e81113ad..865dac71 100644 --- a/README.md +++ b/README.md @@ -140,6 +140,20 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Arindam + + + Ashwinib26 +
+ Ashwini_ab + + + + + itznayan +
+ Mahera Nayan + + tejasbenibagde @@ -147,11 +161,13 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Tejas Benibagde + + - - Ashwinib26 + + Shirisha-16
- Ashwini_ab + Tyarla Shirisha @@ -161,8 +177,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Haseeb Zaki - - Suhas-Koheda @@ -184,13 +198,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Sajal Batra - - - itznayan -
- Mahera Nayan - - Amnyadav @@ -198,6 +205,8 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Aman Yadav + + AbhijitMotekar99 @@ -205,8 +214,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Abhijit Motekar - - Navneetdadhich @@ -242,6 +249,8 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 MANI + + Ayush215mb @@ -249,8 +258,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Ayush Yadav - - AliGates915 @@ -286,6 +293,8 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Mohit Rana + + MutiatBash @@ -293,8 +302,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌 Bashua Mutiat - - NilanchalaPanda