Skip to content

Commit

Permalink
...
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianhajdin committed Aug 7, 2022
1 parent db9f374 commit 2d852e9
Show file tree
Hide file tree
Showing 7 changed files with 12,116 additions and 21,185 deletions.
33,245 changes: 12,088 additions & 21,157 deletions package-lock.json

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"name": "project_youtube_video_player",
"version": "0.1.0",
"version": "1.0.0",
"private": true,
"dependencies": {
"@emotion/react": "^11.5.0",
"@emotion/styled": "^11.3.0",
"@mui/icons-material": "^5.0.5",
"@mui/material": "^5.0.6",
"axios": "^0.24.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-player": "^2.9.0",
"react-router-dom": "^5.3.0",
"react-scripts": "4.0.3"
"@emotion/react": "^11.10.0",
"@emotion/styled": "^11.10.0",
"@mui/icons-material": "^5.8.4",
"@mui/material": "^5.9.3",
"axios": "^0.27.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-player": "^2.10.1",
"react-router-dom": "^6.3.0",
"react-scripts": "^5.0.1"
},
"scripts": {
"start": "react-scripts start",
Expand Down
18 changes: 9 additions & 9 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
import { BrowserRouter, Routes, Route } from "react-router-dom";
import { Box } from '@mui/material';

import { ChannelDetail, VideoDetail, SearchFeed, Navbar, Feed } from './components';

const App = () => (
<Router>
<BrowserRouter>
<Box sx={{ backgroundColor: '#000' }}>
<Navbar />
<Switch>
<Route exact path='/' component={Feed} />
<Route path='/video/:id' component={VideoDetail} />
<Route path='/channel/:id' component={ChannelDetail} />
<Route path='/search/:searchTerm' component={SearchFeed} />
</Switch>
<Routes>
<Route exact path='/' element={<Feed />} />
<Route path='/video/:id' element={<VideoDetail />} />
<Route path='/channel/:id' element={<ChannelDetail />} />
<Route path='/search/:searchTerm' element={<SearchFeed />} />
</Routes>
</Box>
</Router>
</BrowserRouter>
);

export default App;
2 changes: 1 addition & 1 deletion src/components/Navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";
import { Stack } from "@mui/material";
import { Link } from "react-router-dom";

import Logo from "../logo.png";
import Logo from "../utils/logo.png";
import { SearchBar } from "./";

const Navbar = () => (
Expand Down
6 changes: 3 additions & 3 deletions src/components/SearchBar.jsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import React, { useState } from 'react';
import { useHistory } from 'react-router';
import { useNavigate } from "react-router-dom";
import { Paper, IconButton } from '@mui/material';
import SearchIcon from '@mui/icons-material/Search';

const SearchBar = () => {
const [searchTerm, setSearchTerm] = useState('');
const history = useHistory();
const navigate = useNavigate();

const onhandleSubmit = (e) => {
e.preventDefault();

if (searchTerm) {
history.push(`/search/${searchTerm}`);
navigate.push(`/search/${searchTerm}`);

setSearchTerm('');
}
Expand Down
8 changes: 4 additions & 4 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React from 'react';
import ReactDOM from 'react-dom';
import ReactDOM from 'react-dom/client';

import App from './App';
import './index.css';

ReactDOM.render(
const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
<React.StrictMode>
<App />
</React.StrictMode>,
document.getElementById('root')
</React.StrictMode>
);
File renamed without changes

0 comments on commit 2d852e9

Please sign in to comment.