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

v6 done #14

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
097b8b9
moviePageComponent
shna-rafeeq Jun 30, 2020
7148105
RoutingDone
shna-rafeeq Jun 30, 2020
2e4f3b5
RoutingV2
shna-rafeeq Jun 30, 2020
081a9ff
traileradded-genreadded
shna-rafeeq Jun 30, 2020
a8eb547
actorsadded
shna-rafeeq Jun 30, 2020
f25f762
updated
shna-rafeeq Jul 1, 2020
a67cda7
carouseladded
shna-rafeeq Jul 1, 2020
d8a39ba
unuesd-removed
shna-rafeeq Jul 1, 2020
3954129
roitingwithSearch-fixed
shna-rafeeq Jul 1, 2020
21d113b
MoviePage-someStyle
shna-rafeeq Jul 1, 2020
c33ba4b
MoviePageStyle
shna-rafeeq Jul 1, 2020
d9a187c
v5-done
shna-rafeeq Jul 1, 2020
59582c9
uselssthing-removed
shna-rafeeq Jul 2, 2020
fec0a40
changeshandled
shna-rafeeq Jul 3, 2020
fab0b71
updated
shna-rafeeq Jul 3, 2020
91e9a34
issuesFixed
shna-rafeeq Jul 3, 2020
67fcdf0
..
shna-rafeeq Jul 3, 2020
cb5db35
createModal
shna-rafeeq Jul 3, 2020
fdd5ff1
modal added
shna-rafeeq Jul 3, 2020
eaa6fe5
Merge branch 'master' into review
shna-rafeeq Jul 3, 2020
6c961c6
fullresponsive
shna-rafeeq Jul 3, 2020
234f7af
Merge branch 'master' into review
shna-rafeeq Jul 3, 2020
8f72c83
finalfinalversion
shna-rafeeq Jul 3, 2020
12ac883
searchhandled
shna-rafeeq Jul 3, 2020
c8b18ac
issueshandled
shna-rafeeq Jul 4, 2020
06c7462
nodemodules remove
shna-rafeeq Jul 4, 2020
cb0ca1b
nodemodules remove
shna-rafeeq Jul 4, 2020
c3e2301
nodemodules remove
shna-rafeeq Jul 4, 2020
91bcaa1
Merge branch 'under-review' into review
shna-rafeeq Jul 4, 2020
58bd8a0
nodemodules fixed
shna-rafeeq Jul 4, 2020
9ef125a
version-6
shna-rafeeq Jul 5, 2020
c7ae231
updatingV-6
shna-rafeeq Jul 5, 2020
a1f9983
headerfixedV-6
shna-rafeeq Jul 5, 2020
6d32851
.....
shna-rafeeq Jul 5, 2020
61f1ca5
fixingHome
shna-rafeeq Jul 6, 2020
b036a23
V-6 final result
shna-rafeeq Jul 6, 2020
5b92b9b
makeHomeButton
shna-rafeeq Jul 6, 2020
c9149b8
cssOrganized
shna-rafeeq Jul 6, 2020
23ac1f3
node modules
shna-rafeeq Jul 6, 2020
1ab1729
Merge branch 'master' into review
shna-rafeeq Jul 6, 2020
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
154 changes: 154 additions & 0 deletions bawan-shna-abdulrahman/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 10 additions & 6 deletions bawan-shna-abdulrahman/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,20 @@
"react": "^16.13.1",
"react-bootstrap": "^1.0.1",
"react-dom": "^16.13.1",
"react-player": "^2.4.0",
"react-redux": "^7.2.0",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.1",
"react-simple-flex-grid": "^1.3.21"
"react-simple-flex-grid": "^1.3.21",
"redux": "^4.0.5"
},
"scripts": {
"predeploy": "npm run build",
"deploy": "gh-pages -d build",
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
"deploy": "npx gh-pages -d build",
"start": "npx react-scripts start",
"build": "npx react-scripts build",
"test": "npx react-scripts test",
"eject": "npx react-scripts eject"
},
"eslintConfig": {
"extends": "react-app"
Expand Down
53 changes: 21 additions & 32 deletions bawan-shna-abdulrahman/src/App.js
Original file line number Diff line number Diff line change
@@ -1,42 +1,31 @@
import React, { useState } from "react";
import React, { useState, useContext } from "react";
import "./App.css";
import "bootstrap/dist/css/bootstrap.css";
import Header from "./Components/Header";
import Main from "./Components/Main";
import Footer from "./Components/Footer";
import MoviePage from "./Components/MoviePage";
import Info from "./Components/info";
import { BrowserRouter as Router, Route, Redirect } from "react-router-dom";
import { StateProvider } from "./Components/StateProvider";

function App() {
const [isLoading, setIsLoading] = useState(true);
const [query, setQuery] = useState("");
const [movies, setMovies] = useState([]);

const handleQuery = (query) => {
setQuery(query);
};

const handleMovies = (movies) => {
setMovies(movies);
setIsLoading(false);
};

export default function App() {
return (
<div className="page-container">
<div className="content-wrap">
<Header
handleQuery={handleQuery}
handleMovies={handleMovies}
isLoading={isLoading}
setIsLoading={setIsLoading}
/>
<Main
isLoading={isLoading}
setIsLoading={setIsLoading}
movies={movies}
query={query}
/>
<Router>
<div className="page-container">
<div className="content-wrap">
<StateProvider>
<Header />
<Route path="/iraq-bc-movies-project-students">
<Redirect to="/"> </Redirect>
</Route>
<Route path="/movie/:id" component={MoviePage} />
<Route path="/person/:id" component={Info} />
<Route exact path="/" component={Main} />
</StateProvider>
</div>
<Footer />
</div>
<Footer />
</div>
</Router>
);
}
export default App;
3 changes: 3 additions & 0 deletions bawan-shna-abdulrahman/src/Components/BoxShadow.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.shadow-box:hover {
box-shadow: 0px 1px 21px -6px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default function DropdownCategories(props) {
fetch(SEARCH_URL_CATEGORIES)
.then((res) => res.json())
.then((data) => {
if (Boolean(data.genres))
if (data.genres !== undefined)
setCategories([{ id: 0, name: "All" }, ...data.genres]);
})
.catch((err) => console.log(err));
Expand Down
1 change: 0 additions & 1 deletion bawan-shna-abdulrahman/src/Components/Footer.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.main-footer {
margin-top: 50px;
color: white;
background-color: #343a40;
position: relative;
Expand Down
4 changes: 1 addition & 3 deletions bawan-shna-abdulrahman/src/Components/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
export default function Footer() {
return (
<div className="main-footer">
<small style={{ marginRight: "20px" }}>
Developed with ❤ by bawan-shna-abdulrahman
</small>
<small style={{ marginRight: "20px" }}>Developed with ❤ by shna</small>
<a href="https://github.com/shna-rafeeq" style={{ color: "white" }}>
<FontAwesomeIcon icon={faGithub} />
</a>
Expand Down
Loading