Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

preloader and page transition added #250

Merged
merged 11 commits into from
Oct 12, 2024
Merged

preloader and page transition added #250

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0c31757
docs(contributor): contrib-readme-action has updated readme
github-actions[bot] Oct 12, 2024
0836304
preloader and page transition added
itznayan Oct 12, 2024
ed6e130
docs(contributor): contrib-readme-action has updated readme
github-actions[bot] Oct 12, 2024
7308eae
preloader and page transition added
itznayan Oct 12, 2024
fcc447d
Merge branch 'main' of https://github.com/itznayan/PlayCafe
itznayan Oct 12, 2024
ecbb324
docs(contributor): contrib-readme-action has updated readme
github-actions[bot] Oct 12, 2024
a0aed99
added suggetion changes
itznayan Oct 12, 2024
05eafa8
Merge branch 'main' of https://github.com/itznayan/PlayCafe
itznayan Oct 12, 2024
2ea7b94
docs(contributor): contrib-readme-action has updated readme
github-actions[bot] Oct 12, 2024
3db28d0
Merge branch 'main' into main
RamakrushnaBiswal Oct 12, 2024
7f7e8d6
docs(contributor): contrib-readme-action has updated readme
github-actions[bot] Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,15 +154,22 @@ Special thanks to our amazing mentors who are guiding this project! 🙌
<sub><b>Ashwini_ab</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/itznayan">
<img src="https://avatars.githubusercontent.com/u/136584376?v=4" width="100;" alt="itznayan"/>
<br />
<sub><b>Mahera Nayan</b></sub>
</a>
</td>
</tr>
<tr>
<td align="center">
<a href="https://github.com/haseebzaki-07">
<img src="https://avatars.githubusercontent.com/u/147314463?v=4" width="100;" alt="haseebzaki-07"/>
<br />
<sub><b>Haseeb Zaki</b></sub>
</a>
</td>
</tr>
<tr>
<td align="center">
<a href="https://github.com/Suhas-Koheda">
<img src="https://avatars.githubusercontent.com/u/72063139?v=4" width="100;" alt="Suhas-Koheda"/>
Expand Down Expand Up @@ -197,13 +204,6 @@ Special thanks to our amazing mentors who are guiding this project! 🙌
<br />
<sub><b>Abhijit Motekar</b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/itznayan">
<img src="https://avatars.githubusercontent.com/u/136584376?v=4" width="100;" alt="itznayan"/>
<br />
<sub><b>Mahera Nayan</b></sub>
</a>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -235,22 +235,29 @@ Special thanks to our amazing mentors who are guiding this project! 🙌
<sub><b>Sawan kushwah </b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/devxMani">
<img src="https://avatars.githubusercontent.com/u/122438942?v=4" width="100;" alt="devxMani"/>
<br />
<sub><b>MANI </b></sub>
</a>
</td>
<td align="center">
<a href="https://github.com/Ayush215mb">
<img src="https://avatars.githubusercontent.com/u/154300084?v=4" width="100;" alt="Ayush215mb"/>
<br />
<sub><b>Ayush Yadav</b></sub>
</a>
</td>
</tr>
<tr>
<td align="center">
<a href="https://github.com/AliGates915">
<img src="https://avatars.githubusercontent.com/u/128673394?v=4" width="100;" alt="AliGates915"/>
<br />
<sub><b>Ali Gates</b></sub>
</a>
</td>
</tr>
<tr>
<td align="center">
<a href="https://github.com/mishradev1">
<img src="https://avatars.githubusercontent.com/u/118660840?v=4" width="100;" alt="mishradev1"/>
Expand Down Expand Up @@ -286,15 +293,15 @@ Special thanks to our amazing mentors who are guiding this project! 🙌
<sub><b>Bashua Mutiat</b></sub>
</a>
</td>
</tr>
<tr>
<td align="center">
<a href="https://github.com/NilanchalaPanda">
<img src="https://avatars.githubusercontent.com/u/110488337?v=4" width="100;" alt="NilanchalaPanda"/>
<br />
<sub><b>Nilanchal</b></sub>
</a>
</td>
</tr>
<tr>
<td align="center">
<a href="https://github.com/Sapna127">
<img src="https://avatars.githubusercontent.com/u/91309280?v=4" width="100;" alt="Sapna127"/>
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<>
<Preloader />
<BackToTopButton />
<Navbar />
<Outlet />
Expand Down
20 changes: 20 additions & 0 deletions frontend/src/components/MainHOC.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { AnimatePresence, motion } from 'framer-motion';
import React from 'react';

const MainHOC = (WrappedComponent) => {
return (props) => (
<AnimatePresence mode="wait">
<motion.div
key="animated-component"
initial={{ scale: 0.8, opacity: 0 }}
animate={{ scale: 1, opacity: 1 }}
exit={{ scale: 0.8, opacity: 0 }}
transition={{ duration: 0.4 }}
>
<WrappedComponent {...props} />
</motion.div>
</AnimatePresence>
);
};

export default MainHOC;
10 changes: 5 additions & 5 deletions frontend/src/components/Pages/Boardgame.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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('');

Expand Down Expand Up @@ -323,4 +323,4 @@ export default function Boardgame() {
</div>
</>
);
}
}
54 changes: 45 additions & 9 deletions frontend/src/components/Pages/Event.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -28,7 +28,7 @@ const months = [
'November',
'December',
];
export default function Event() {
function Event() {
const [events, setEvents] = useState([]);
const [error, setError] = useState(null);
useEffect(() => {
Expand Down Expand Up @@ -131,8 +131,18 @@ export default function Event() {
Upcoming Events and much more....
</h1>
<div className="flex w-full h-80 rounded-full items-center px-40 bg-yellow-100 justify-between shadow-md">
<img src={game} alt="game" loading="lazy" className="w-28 h-28" />
<img src={spin} alt="game" loading="lazy" className="w-28 h-28" />
<img
src={game}
alt="game"
loading="lazy"
className="w-28 h-28"
/>
<img
src={spin}
alt="game"
loading="lazy"
className="w-28 h-28"
/>
</div>
</div>
</div>
Expand Down Expand Up @@ -190,19 +200,44 @@ export default function Event() {
<div className="splide__track w-full ">
<ul className="splide__list">
<li className="splide__slide ">
<img src={img1} alt="Event 1" loading="lazy" className="w-full h-full" />
<img
src={img1}
alt="Event 1"
loading="lazy"
className="w-full h-full"
/>
</li>
<li className="splide__slide">
<img src={img2} alt="Event 2" loading="lazy" className="w-full h-full" />
<img
src={img2}
alt="Event 2"
loading="lazy"
className="w-full h-full"
/>
</li>
<li className="splide__slide">
<img src={img3} alt="Event 3" loading="lazy" className="w-full h-full" />
<img
src={img3}
alt="Event 3"
loading="lazy"
className="w-full h-full"
/>
</li>
<li className="splide__slide">
<img src={img4} alt="Event 4" loading="lazy" className="w-full h-full" />
<img
src={img4}
alt="Event 4"
loading="lazy"
className="w-full h-full"
/>
</li>
<li className="splide__slide">
<img src={img5} alt="Event 6" loading="lazy" className="w-full h-full" />
<img
src={img5}
alt="Event 6"
loading="lazy"
className="w-full h-full"
/>
</li>
{/* Add more images here */}
</ul>
Expand Down Expand Up @@ -254,3 +289,4 @@ export default function Event() {
</>
);
}
export default MainHOC(Event);
38 changes: 20 additions & 18 deletions frontend/src/components/Pages/Home.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
<div id="home" className="bg-[#FDF3C7]">
<Landing />
<About />
<ReviewCarousel />
<FeedbackForm />
</div>
);
}

export default function Home() {
useEffect(() => {
window.scrollTo(0, 0);
}, []);
return (
<div id="home" className="bg-[#FDF3C7]">
<Landing />
<About/>
<ReviewCarousel/>
<FeedbackForm />
</div>
)
}
export default MainHOC(Home);
19 changes: 13 additions & 6 deletions frontend/src/components/Pages/Menu.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 },
Expand Down Expand Up @@ -71,15 +71,22 @@ function ParallaxImage() {
<Mybook />
</div>
<TodaysSpecial /> */}
<div className="w-full md:flex md:items-center md:justify-center mb-20"> {/* Adjust this container */}
<div className="w-full md:flex md:items-center md:justify-center mb-20">
{' '}
{/* Adjust this container */}
<Mybook />
</div>
<div className="w-full md:flex md:items-center md:justify-center" style={{ paddingBottom: '80px' }}> {/* Add bottom padding here */}
<div
className="w-full md:flex md:items-center md:justify-center"
style={{ paddingBottom: '80px' }}
>
{' '}
{/* Add bottom padding here */}
<TodaysSpecial />
</div>
</div>
</div>
</>
);
}

export default ParallaxImage;
export default MainHOC(ParallaxImage);
18 changes: 9 additions & 9 deletions frontend/src/components/Pages/Register.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
Expand Down Expand Up @@ -184,3 +183,4 @@ export default function Register() {
</>
);
}
export default MainHOC(Register);
RamakrushnaBiswal marked this conversation as resolved.
Show resolved Hide resolved
Loading
Loading