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.

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

Added catalogue page, css tweaks #52

Merged
merged 1 commit into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5,886 changes: 2,689 additions & 3,197 deletions frontEnd/package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions frontEnd/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"16": "^0.0.2",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
Expand Down
4 changes: 4 additions & 0 deletions frontEnd/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import React from "react"
import {BrowserRouter as Router, Routes, Route } from 'react-router-dom';
import SignIn from "./pages/SignIn"
import Browse from "./pages/Browse"
import Catalogue from "./pages/Catalogue"

function App(){
return (
Expand All @@ -13,6 +14,9 @@ return (
<Route path="/browse" exact element={<Browse/>} />
<Route path="/NetflixClone" exact element={<Signup/>}/>
<Route path="/Raj" exact element={<Signup/>}/>
<Route path="/Catalogue" exact element={<Catalogue/>}/>


</Routes>
</Router>
</>
Expand Down
1 change: 1 addition & 0 deletions frontEnd/src/index.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.root{
background-color: black;
color: black;
}
8 changes: 7 additions & 1 deletion frontEnd/src/pages/Browse.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import axios from "axios"


function Browse(){
let navigate=useNavigate;
let navigate=useNavigate();
let [data,setData]= useState("");

async function getData(){
Expand All @@ -20,13 +20,19 @@ function Browse(){

}

function Catalog(){

navigate('/Catalogue')
}

return(


<>
<h1> Who's Watching</h1>
<button onClick={getData}>Dataaa</button>
<p>{data}</p>
<button onClick={Catalog}>Go To Catalogue</button>



Expand Down
54 changes: 54 additions & 0 deletions frontEnd/src/pages/Catalogue.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
.base2{

font-family: Netflix Sans, Helvetica Neue, Segoe UI, Roboto, Ubuntu, sans-serif;
}


.head{
display: flex;
flex-direction: row;
row-gap: 3rem;
justify-content: space-around;
background-color: black;
color:white

}
.menu{
display: flex;
flex-direction: row;
justify-content: space-around;
align-items: center;

}
ul{
display: flex;
flex-direction: row;

list-style-type: none;
row-gap: 3rem;


}

ul li {
margin-right: 1.5rem; /* Adjust the value as needed */
}

.rightSideMenuOptions ul li {
margin-left: 1rem; /* Adjust the value as needed */
}















74 changes: 74 additions & 0 deletions frontEnd/src/pages/Catalogue.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@

import React from "react";
import "./Catalogue.css"

function Catalogue(){


return(
<div className="base2">


<div className="head">

<div className="menu">
<ul>
<li>
Home

</li>

<li>
TV Shows
</li>
<li>
Movies

</li>
<li>
New and Popular

</li>
<li>
My List

</li>
<li>
Browse By Languages

</li>

</ul>


</div>

<div className="rightSideMenuOptions">
<ul>
<li>
Search
</li>
<li>
Children
</li>
<li>
Notifications
</li>
<li>
Switch Profile
</li>
</ul>


</div>

</div>




</div>
)
}

export default Catalogue;
7 changes: 4 additions & 3 deletions frontEnd/src/pages/SignIn.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
justify-content: center;
align-content: center;
align-items: center;
font-family: Netflix Sans, Helvetica Neue, Segoe UI, Roboto, Ubuntu, sans-serif;
}

.redfont{
Expand Down Expand Up @@ -68,7 +69,7 @@ margin-left:43%;

}

.entLine{
.entLine {

display:flex;
flex-direction: row;
Expand Down Expand Up @@ -103,10 +104,10 @@ margin-left:43%;

/* // #f3f3f3; */

.NewNetf{
.NewNetf {
margin-left: 14%;
margin-right: 14%;
font-size: 13px;
font-size: 11px;
font-family:Netflix Sans,Helvetica Neue,Segoe UI,Roboto,Ubuntu,sans-serif; ;
color: #8c8c8c;
font-size: 13px;
Expand Down
4 changes: 2 additions & 2 deletions frontEnd/src/pages/SignupPages/KidsProfile.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
padding-top: 5%;
}

h2{
.textKidsProfile h2{
font-size: 3rem;
font-weight: 900;
}

p{
.textKidsProfile p{
font-size: 1.5rem;
font-weight: 400;
}
Expand Down
2 changes: 1 addition & 1 deletion frontEnd/src/pages/SignupPages/TV.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ h2{
color: white;
}

p{
.tvText p{
font-size: 1.5rem;
font-weight: 400;
margin: 1rem 0 0;
Expand Down
Loading