Skip to content

Commit

Permalink
resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
samyakmaitre committed Oct 6, 2024
2 parents 5175b38 + 257a008 commit fd4f40f
Show file tree
Hide file tree
Showing 48 changed files with 1,432 additions and 19,260 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# dependencies
/node_modules
.env
/.pnp
.pnp.js

Expand Down
18,209 changes: 0 additions & 18,209 deletions package-lock.json

This file was deleted.

21 changes: 1 addition & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,10 @@
"version": "0.1.0",
"private": true,
"dependencies": {


"@radix-ui/react-slot": "^1.1.0",


"@radix-ui/react-accordion": "^1.2.1",
"@radix-ui/react-slot": "^1.1.0",

"@reduxjs/toolkit": "^2.2.7",

"@testing-library/user-event": "^13.5.0",
"@types/react-router-dom": "^5.3.3",
"axios": "^1.7.7",
"bootstrap": "^5.3.3",

"framer-motion": "^11.10.0",
"lucide-react": "^0.447.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-icons": "^5.3.0",

"concurrently": "^9.0.1",
"framer-motion": "^11.11.1",
"lucide-react": "^0.447.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hot-toast": "^2.4.1",
Expand All @@ -46,6 +26,7 @@
"react-router-dom": "^6.26.2",
"react-scripts": "^5.0.1",
"react-slick": "^0.30.2",
"react-toastify": "^10.0.5",
"slick-carousel": "^1.8.1",
"web-vitals": "^2.1.4"
},
Expand Down
Binary file added public/event.avif
Binary file not shown.
Binary file added public/events3.avif
Binary file not shown.
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="./theatre.png" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
Expand Down
Binary file added public/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 3 additions & 5 deletions src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
color: #000;
}

.App-link {
Expand All @@ -75,7 +75,7 @@ body {

/* Header Styles */
header {
background-color: #ff0000;
background-color: #ff4b2b;
color: white;
padding: 1rem 0;
text-align: center;
Expand Down Expand Up @@ -104,9 +104,6 @@ header nav ul li {
background-color: #282c34;
}




/* Movie List Styles */
.movie-list {
display: flex;
Expand All @@ -117,6 +114,7 @@ header nav ul li {

.movie {
background-color: white;
color: #000;
border: 1px solid #ddd;
border-radius: 5px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
Expand Down
45 changes: 22 additions & 23 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
/** @format */
import React from 'react';
import { BrowserRouter as Router } from 'react-router-dom'; // Import Router from react-router-dom
import 'bootstrap/dist/css/bootstrap.min.css'; // Import Bootstrap CSS

import React, { useEffect } from "react";
import { Route, BrowserRouter as Router, Routes } from "react-router-dom"; // Import Router from react-router-dom
import "bootstrap/dist/css/bootstrap.min.css"; // Import Bootstrap CSS
import Home from "./components/Home";
import Template from "./components/Auth/Template";
import { fairyDustCursor } from "./components/FairyDust"; // Import the fairy-dust effect
import Header from './components/Header';
import NavBar from './components/NavBar';
import MovieList from './components/MovieList';
import ImageSlider from './components/ImageSlider';
import Footer from './components/Footer';
import Offers from './components/Offers';
import './App.css'; // Your custom CSS

function App() {
// Initialize the fairy-dust cursor effect globally
useEffect(() => {
fairyDustCursor();
}, []);

return (
<div>
<Router>
<Routes>
<Route path="/" element={<Home />} />
<Route path="/login" element={<Template formType={"login"} />} />
<Route path="/signup" element={<Template formType={"signup"} />} />
</Routes>
</Router>
</div>
);
return (
<Router>
<div className="App">
<Header />
<NavBar />
<ImageSlider />
<MovieList />
<Offers />
<Footer />
</div>
</Router>
);
}

export default App;
13 changes: 13 additions & 0 deletions src/Config/Config.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@


const Config={
API_KEY: process.env.REACT_APP_FIREBASE_API_KEY,
AUTH_DOMAIN: process.env.REACT_APP_AUTH_DOMAIN,
PROJECT_ID: process.env.REACT_APP_PROJECTID,
STORAGE_BUCKET: process.env.REACT_APP_STORAGE_BUCKET,
SENDERID: process.env.REACT_APP_SENDERID,
APPID: process.env.REACT_APP_APPID,
}


export default Config
80 changes: 80 additions & 0 deletions src/ContextAPI/ContextAPI.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
import React, { createContext, useEffect, useState } from 'react'
import { useNavigate } from 'react-router-dom';
import {signInWithPopup, signOut} from 'firebase/auth'
import {auth, provider} from '../pages/AuthGuard/Firebase'
import {toast} from 'react-toastify'


export const StoreContext=createContext(null);

const ContextAPI = (props) => {
const[loading, setLoading]=useState(false);
const[userEmail, setUserEmail]=useState(null);
const[token, setToken]=useState(" ");
const navigate=useNavigate();

const handleGoogleSignIn = async () => {
setLoading(true);
await signInWithPopup(auth, provider)
.then((result) => {
setLoading(false);
const user = result.user;
const { email, refreshToken } = user;

setToken(refreshToken || token);
setUserEmail(email);

toast.success("Registered Successfully!", {
position: "top-left",
theme: "dark",
});
navigate("/");
})
.catch((error) => {
setLoading(false);
toast.error(`${error.message}`, {
position: "top-left",
autoClose: 5000,
theme: "dark",
});
});
};

const handleLogout = async () => {
await signOut(auth)
.then(() => {
setToken(localStorage.removeItem("token"));
setUserEmail("");
toast.success("Logged out!", { theme: "colored" });
navigate("/");
setTimeout(() => {
window.location.reload();
}, 2000);
})
.catch((error) => {
toast.error(`${error.message}`, { theme: "colored" });
});
};

useEffect(()=>{
if(localStorage.getItem('token')){
setToken(localStorage.getItem('token'));
}
}, [])

const ContextValue={
setLoading, loading,
navigate,
setToken, token,
handleGoogleSignIn, handleLogout,
userEmail, setUserEmail,
}

return (
<StoreContext.Provider value={ContextValue}>
{props.children}
</StoreContext.Provider>
)
}

export default ContextAPI
34 changes: 34 additions & 0 deletions src/assets/assets.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import poster1 from '../assets/images/poster1.jpg';
import poster2 from '../assets/images/poster2.jpg';
import poster3 from '../assets/images/poster3.jpg';
import poster4 from '../assets/images/poster4.jpg';
import poster5 from '../assets/images/poster5.jpg';

import offer1 from '../assets/images/offer1.png';
import offer2 from '../assets/images/offer2.png';
import offer3 from '../assets/images/offer3.png';
import offer4 from '../assets/images/offer4.png';
import offer5 from '../assets/images/offer5.png';

import event1 from '../assets/images/eve.webp';
import event2 from '../assets/images/event.avif';
import event3 from '../assets/images/event2.avif';
import event4 from '../assets/images/events.avif';
import event5 from '../assets/images/events3.avif';

import show1 from '../assets/images/list.avif';
import show2 from '../assets/images/list2.avif';
import sport from '../assets/images/sport.avif';
import stream1 from '../assets/images/stream.webp';
import stream2 from '../assets/images/streams.webp';
import linkedin_icon from '../assets/images/linkedin_icon.png'
import facebook_icon from '../assets/images/facebook_icon.png'
import twitter_icon from '../assets/images/twitter_icon.png'

export const assets={
poster1,poster2,poster3,poster4,poster5,
offer1,offer2,offer3,offer4,offer5,
event1, event2,event3,event4,event5,
show1,show2, sport,stream1,stream2,
linkedin_icon,facebook_icon,twitter_icon,
};
Binary file added src/assets/images/eve.webp
Binary file not shown.
Binary file added src/assets/images/event.avif
Binary file not shown.
Binary file added src/assets/images/event2.avif
Binary file not shown.
Binary file added src/assets/images/events.avif
Binary file not shown.
Binary file added src/assets/images/events3.avif
Binary file not shown.
Binary file added src/assets/images/facebook_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/img1.avif
Binary file not shown.
Binary file added src/assets/images/linkedin_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/list.avif
Binary file not shown.
Binary file added src/assets/images/list2.avif
Binary file not shown.
Binary file added src/assets/images/mg2.avif
Binary file not shown.
Binary file added src/assets/images/news.avif
Binary file not shown.
Binary file added src/assets/images/sport.avif
Binary file not shown.
Binary file added src/assets/images/stream.webp
Binary file not shown.
Binary file added src/assets/images/streams.webp
Binary file not shown.
Binary file added src/assets/images/twitter_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
32 changes: 32 additions & 0 deletions src/assets/styles/EventList.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/* MovieList.css */

.event-wrapper{
display: flex;
flex-direction: column;
gap: 25px;
margin: 8.5rem ;
align-items: center;
justify-content: flex-start;
}
.event-wrapper .event-header{
align-self: self-start;
font-size: 3.34rem;
color: #c31210;
}
.movie-list {
display: flex;
overflow-x: auto;
scroll-snap-type: x mandatory;
gap: 10px;
padding: 10px;
}

.movie-list::-webkit-scrollbar {
display: none;
}

.movie-list > div {
flex: 0 0 calc(20% - 10px);
scroll-snap-align: start;
}

Loading

0 comments on commit fd4f40f

Please sign in to comment.