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

Grupo 6_SkylabFilms #696

Open
wants to merge 140 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
140 commits
Select commit Hold shift + click to select a range
ad2f868
Solve chokidar error when doing npm start
May 3, 2021
e4a78d2
Delete unnecessary/updated files
May 3, 2021
ea52a27
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
May 3, 2021
ebba3db
Merge branch 'main' into Grupo_6
May 3, 2021
4c2fdba
Created routed and main navigation routes
blopez-dev May 3, 2021
96a6166
Main carusel functional, slider buttons
HosniMaRu May 4, 2021
b8cb1e5
Clean comments
HosniMaRu May 4, 2021
a85732a
Completed double routing to show user options
blopez-dev May 4, 2021
6fce245
Added form to login
blopez-dev May 4, 2021
bb5ce07
Merge pull request #460 from SkylabCoders/Auth-withh-firebase
blopez-dev May 4, 2021
19bf40c
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
May 4, 2021
9bb6a32
Change png format file to png
blopez-dev May 4, 2021
46e0c91
resolve conflict in Navigation.jsx
blopez-dev May 4, 2021
d8eb967
Change styles in styles.js to Navigation.jsx
blopez-dev May 4, 2021
286da4c
Merge pull request #464 from SkylabCoders/feature/01-main-navigation
blopez-dev May 4, 2021
1814814
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
May 4, 2021
69eb8f6
Change img extension from png no svg
May 4, 2021
116aa01
upadted composer
blopez-dev May 4, 2021
4899b8b
Accept incoming changes
May 4, 2021
2ef7354
Add incoming package-lock.json changes
May 4, 2021
827e13d
Correct index.jsx from store folder
May 4, 2021
95abc0b
Add carousel in dashboard
May 4, 2021
17d9cfe
Add carousel in home page
May 4, 2021
7dd05ca
Add styles to button carousel
May 4, 2021
b9be99f
Solve key console error in index.jsx
May 4, 2021
ad6b8e7
Delete extra comment
May 4, 2021
ea0b335
Add auth reducer
May 4, 2021
6732815
Pull remote
HosniMaRu May 4, 2021
7a8599a
Implemented Authentication mode
blopez-dev May 5, 2021
44b9a40
Added slideShow Home component
blopez-dev May 5, 2021
bcad7c2
Merge pull request #503 from SkylabCoders/Grupo_6-backup
blopez-dev May 5, 2021
95d1464
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
HosniMaRu May 5, 2021
3f2d9f9
Delete file from slide-show folder
May 5, 2021
f498f27
Update slide-show
HosniMaRu May 5, 2021
897a390
Change input login
blopez-dev May 5, 2021
b87f2a1
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
May 5, 2021
4ce36df
Modified wrapper title slideShow
blopez-dev May 5, 2021
85b6b70
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
May 5, 2021
e00f942
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
HosniMaRu May 5, 2021
a7cb2b6
Correct button carousel style
May 5, 2021
60f0cbc
Implemented user image profile in when this is logged
blopez-dev May 5, 2021
c572694
Remove unnecessary styles in carousel
May 5, 2021
a225b0c
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
May 5, 2021
57a36e6
Stylized area user profile in header
blopez-dev May 5, 2021
9f67e55
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
May 5, 2021
b4f7c71
Merge pull request #510 from SkylabCoders/feature/06-carousel-buttons
HosniMaRu May 5, 2021
4ae5ee0
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
May 5, 2021
f3bf0ae
Add the second banner carousel, all from the same films page from URL
May 5, 2021
65e7604
Feature title up
HosniMaRu May 5, 2021
7e1007c
Fixed bugs in title component
HosniMaRu May 5, 2021
3a7a771
Fixed title slider most viewed
HosniMaRu May 5, 2021
9261b52
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
HosniMaRu May 5, 2021
d32411e
merged Group 6
HosniMaRu May 5, 2021
3a92625
Adding super scss
HosniMaRu May 5, 2021
e6ec471
Merge pull request #522 from SkylabCoders/Feature/Hosni/Title-component
HosniMaRu May 5, 2021
3c76361
pull
HosniMaRu May 5, 2021
7a60bcd
Add footer to dashboard
May 5, 2021
dc21b3c
remote pull
HosniMaRu May 5, 2021
889a1d8
Merge pull request #523 from SkylabCoders/feature/06-footer
SantiagoMC52 May 5, 2021
a7a3f02
Adding lr-title in process
HosniMaRu May 5, 2021
d306c09
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
HosniMaRu May 5, 2021
d2f96e6
fixed default
HosniMaRu May 5, 2021
617042a
Test header, footer and films components
May 5, 2021
4feffdf
Test of layout component
May 5, 2021
caa7551
Test login component
May 5, 2021
2526f4b
Merge pull request #542 from SkylabCoders/feature/06-testing
blopez-dev May 5, 2021
9302c84
upadted carousel component and login
blopez-dev May 5, 2021
6f2fd5e
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
blopez-dev May 5, 2021
cf45271
Second title done
HosniMaRu May 5, 2021
c6e73eb
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
HosniMaRu May 5, 2021
977ce98
merge Group_6
HosniMaRu May 5, 2021
fadad06
Merge from remote
HosniMaRu May 5, 2021
1bb3b44
Merge pull request #543 from SkylabCoders/Feature/Hosni/lr-title
SantiagoMC52 May 6, 2021
81de806
Repair acces to contain
blopez-dev May 6, 2021
b36b04a
Feature Most Viewed title
HosniMaRu May 6, 2021
e0a651a
Merge branch 'Grupo_6' into Feature/Hosni/MV-title
HosniMaRu May 6, 2021
67c9d01
Merge pull request #555 from SkylabCoders/Feature/Hosni/MV-title
HosniMaRu May 6, 2021
5d49f50
Created new component to render a single Title
blopez-dev May 6, 2021
1d5694e
Updated repo
blopez-dev May 6, 2021
8450ede
Try to get id to show genres
blopez-dev May 6, 2021
78c4e2b
updated repo
blopez-dev May 6, 2021
e1932d9
Layout of the header of the page of each film
blopez-dev May 6, 2021
7d64afc
Added cast action and reducer
blopez-dev May 7, 2021
3c8e774
Add the correct buttons styles
May 7, 2021
c27abc0
Merge pull request #602 from SkylabCoders/Grupo6-new
SantiagoMC52 May 7, 2021
44f6b68
Fixed import cast on movie details
HosniMaRu May 7, 2021
5fa00de
Fixed import cast on movie details
HosniMaRu May 7, 2021
e56d181
Added Cast element in detail film
blopez-dev May 7, 2021
ed3b628
Fixed bugs in moviedetails.jsx
blopez-dev May 7, 2021
f6a1711
clean debugger
HosniMaRu May 7, 2021
ca44b0b
Fixed bug header
blopez-dev May 7, 2021
2bbc18a
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
HosniMaRu May 7, 2021
1e546d0
Display shows in tvshows component
May 7, 2021
500a2bd
Change the URL to obtain the tv shows
May 7, 2021
4a573f1
Merge pull request #614 from SkylabCoders/feature/06-tv-shows
blopez-dev May 7, 2021
b4617a9
Show recomended movies in the movie detail
blopez-dev May 7, 2021
dd0cb69
Updated branch
blopez-dev May 7, 2021
4da672b
Fixed problemes
blopez-dev May 7, 2021
6dfb90b
Delete a console log in actionCreators
May 7, 2021
d79a78f
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
HosniMaRu May 7, 2021
f73638b
Merge pull request #632 from SkylabCoders/Feature/Hosni/Movies-grid
HosniMaRu May 7, 2021
f34d31e
Feature Films show
HosniMaRu May 7, 2021
6284626
Merge pull request #634 from SkylabCoders/Feature/Hosni/Movies-grid
HosniMaRu May 7, 2021
fd7b36a
Path to Detail
HosniMaRu May 7, 2021
4f610dd
Fixed some bugs in test
blopez-dev May 7, 2021
5419e2a
Merge pull request #638 from SkylabCoders/Test
blopez-dev May 7, 2021
a56e449
Correct eslint error in eslint file and ad test watchAll in package.json
May 7, 2021
9b5e8d4
Deleted usseles files, fix magic strings
HosniMaRu May 8, 2021
dc1463d
Replace actionType for Heading to String
HosniMaRu May 8, 2021
0bcb104
Merge pull request #642 from SkylabCoders/Feature/Hosni/Delete-ussele…
SantiagoMC52 May 8, 2021
b5d1d23
Add detail from tv show
May 8, 2021
44fe9f6
Merge pull request #644 from SkylabCoders/feature/06-show-details
blopez-dev May 8, 2021
737de7e
Added titles in section movies
blopez-dev May 8, 2021
94c5e3a
Remplaced in 'Films' and 'Tv-shows' styles.css by style.js and add ma…
blopez-dev May 8, 2021
8c035fe
SlideShow prop myMovies.popular fixed
HosniMaRu May 8, 2021
72b12fa
Merge branch 'Grupo_6' into Feature/Hosni/Property-errors
HosniMaRu May 8, 2021
30790b7
Fixed styles in login butto
blopez-dev May 8, 2021
b4d267e
Fixed SliderCarusel proptypes
HosniMaRu May 8, 2021
0ff9b22
Adjusted styles for tv and movies sections
blopez-dev May 8, 2021
df48d41
Merge pull request #647 from SkylabCoders/feature/searchbar
blopez-dev May 8, 2021
57055ac
Added new feature to show related tv-shows
blopez-dev May 8, 2021
7813f0e
Merge pull request #653 from SkylabCoders/show-details-related
blopez-dev May 8, 2021
43127b0
Merge branch 'Grupo_6' into Feature/Hosni/Property-errors
HosniMaRu May 8, 2021
1126eac
Merge pull request #654 from SkylabCoders/Feature/Hosni/Property-errors
HosniMaRu May 8, 2021
dd30956
Created Searchbar component and result component
blopez-dev May 8, 2021
3de32d7
Implemented new feature: searchbar component
blopez-dev May 9, 2021
8348c31
Fixed conflicts files
blopez-dev May 9, 2021
01d2a63
Replace extension file in style searchbar
blopez-dev May 9, 2021
0d2dbe2
Fixed conflicts
blopez-dev May 9, 2021
65d2c9c
Added new dependencie to fetch query
blopez-dev May 9, 2021
db7f94b
Fixd conflicts
blopez-dev May 9, 2021
0a58772
Merge pull request #659 from SkylabCoders/feature/searchbar
blopez-dev May 9, 2021
9d5253b
Resolve conflict in films.js inside services folder
May 9, 2021
e8dba82
Add some tests
May 9, 2021
b72afd7
Merge pull request #661 from SkylabCoders/feature/06-testing
HosniMaRu May 9, 2021
0f637eb
Updated component searchbar and implemented in header
blopez-dev May 9, 2021
f64aaba
Merge branch 'Grupo_6' into feature/searchbar
blopez-dev May 9, 2021
aa2f77a
Merge pull request #665 from SkylabCoders/feature/searchbar
blopez-dev May 9, 2021
0c84dba
upadted package.json
blopez-dev May 10, 2021
ea9beeb
Modified styles header
blopez-dev May 12, 2021
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
17 changes: 10 additions & 7 deletions 00-TEAMS/06-TEAM/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,31 @@ module.exports = {
browser: true,
es2021: true,
node: true,
jest: true,
jest: true
},
extends: [
'plugin:react/recommended',
'airbnb',
'airbnb'
],
parserOptions: {
ecmaFeatures: {
jsx: true,
jsx: true
},
ecmaVersion: 12,
sourceType: 'module',
sourceType: 'module'
},
plugins: [
'react',
'react'
],
rules: {
'class-methods-use-this': 0,
'comma-dangle': [2, 'never'],
'linebreak-style': 0,
'global-require': 0,
'eslint linebreak-style': [0, 'error', 'windows'],
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
},
'import/prefer-default-export': 0,
'jsx-a11y/click-events-have-key-events': 0,
'jsx-a11y/no-static-element-interactions': 0,
'react/jsx-filename-extension': [1, { extensions: ['.js', '.jsx'] }]
}
};
24,137 changes: 1,492 additions & 22,645 deletions 00-TEAMS/06-TEAM/package-lock.json

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions 00-TEAMS/06-TEAM/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,30 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@auth0/auth0-react": "^1.4.0",
"@testing-library/jest-dom": "^5.12.0",
"@testing-library/react": "^11.2.6",
"@testing-library/user-event": "^12.8.3",
"axios": "^0.21.1",
"firebase": "^8.4.3",
"prop-types": "^15.7.2",
"pure-react-carousel": "^1.27.6",
"query-string": "^7.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-redux": "^7.2.4",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3",
"redux": "^4.1.0",
"redux-devtools-extension": "^2.13.9",
"redux-thunk": "^2.3.0",
"styled-components": "^5.2.3",
"web-vitals": "^1.1.1"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"test": "react-scripts test --watchAll --collect-coverage",
"eject": "react-scripts eject"
},
"eslintConfig": {
Expand All @@ -49,6 +53,7 @@
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.23.2",
"eslint-plugin-react-hooks": "^4.2.0"
"eslint-plugin-react-hooks": "^4.2.0",
"fork-ts-checker-webpack-plugin": "^4.1.6"
}
}
1 change: 1 addition & 0 deletions 00-TEAMS/06-TEAM/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<style>body{margin:0; padding:0;}</style>
<meta
name="description"
content="Web site created using create-react-app"
Expand Down
30 changes: 0 additions & 30 deletions 00-TEAMS/06-TEAM/src/App.jsx

This file was deleted.

8 changes: 0 additions & 8 deletions 00-TEAMS/06-TEAM/src/App.test.js

This file was deleted.

24 changes: 24 additions & 0 deletions 00-TEAMS/06-TEAM/src/application/Application.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import React from 'react';
import { Provider } from 'react-redux';
import { Auth0Provider } from '@auth0/auth0-react';
import { createStore } from './store';
import HeaderLayout from './components/layout/Layout';
import GlobalApp from './styles/GlobalStyles';

function App() {
return (
<GlobalApp>
<Auth0Provider
domain="dev-skylab.eu.auth0.com"
clientId="NtRILJGUuayWtHP9G8fFFDWgTFNMubaY"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Intentar no subir el clientId visible

redirectUri={window.location.origin}
>
<Provider store={createStore()}>
<HeaderLayout />
</Provider>
</Auth0Provider>
</GlobalApp>
);
}

export default App;
12 changes: 12 additions & 0 deletions 00-TEAMS/06-TEAM/src/application/components/layout/Layout.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';
import Header from './header/Header';
import Footer from './footer/Footer';

const Layout = () => (
<>
<Header />
<Footer />
</>
);

export default Layout;
24 changes: 24 additions & 0 deletions 00-TEAMS/06-TEAM/src/application/components/layout/Layout.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/* eslint-disable react/jsx-filename-extension */
import React from 'react';
import { unmountComponentAtNode } from 'react-dom';
import { render, screen } from '../../../common/test';
import Layout from './Layout';

let container = null;
beforeEach(() => {
container = document.createElement('div');
document.body.appendChild(container);
});

afterEach(() => {
unmountComponentAtNode(container);
container.remove();
container = null;
});

describe('Footer Component', () => {
test('should contain text Films', () => {
render(<Layout />, container);
expect(screen.getByText(/Películas más vistas/i)).toBeInTheDocument();
});
});
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React from 'react';
import './footer.css';
import BrandLogo from '../assets/BrandLogo.svg';

const Footer = () => (
<>
<div className="footer">
<div className="footer-logo">
<img className="footer-logo__img" src={BrandLogo} alt="" />
</div>
<div className="footer-info">
<p>Quiénes somos</p>
<p>Condiciones de uso</p>
<p>Política de privacidad y cookies</p>
<p>Trabaja con nosotros</p>
</div>
<div className="footer-films">
<p>Películas más vistas</p>
<p>Películas recomendadas</p>
<p>Películas populares</p>
<p>Películas de terror</p>
</div>
</div>
</>
);

export default Footer;
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/* eslint-disable react/jsx-filename-extension */
import React from 'react';
import { unmountComponentAtNode } from 'react-dom';
import { render, screen } from '../../../../common/test';
import Footer from './Footer';

let container = null;
beforeEach(() => {
container = document.createElement('div');
document.body.appendChild(container);
});

afterEach(() => {
unmountComponentAtNode(container);
container.remove();
container = null;
});

describe('Footer Component', () => {
test('should contain text Condiciones de uso', () => {
render(<Footer />, container);
expect(screen.getByText(/Condiciones de uso/i)).toBeInTheDocument();
});
});

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.footer {
background-color: #212121;
display: flex;
justify-content: space-around;
align-items: center;
height: 200px;

&-logo{
&__img {
width: 150px;
height: 150px;
}
}

&-info, &-films{
p{
margin-top: 20px;
font-size: 15px;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from 'react';
import AppRouter from '../../../router/AppRouter';

const Header = () => (
<AppRouter />
);

export default Header;
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/* eslint-disable react/jsx-filename-extension */
import React from 'react';
import { unmountComponentAtNode } from 'react-dom';
import { render, screen } from '../../../../common/test';
import Header from './Header';

let container = null;
beforeEach(() => {
container = document.createElement('div');
document.body.appendChild(container);
});

afterEach(() => {
unmountComponentAtNode(container);
container.remove();
container = null;
});

describe('Header Component', () => {
test('should contain text Tv Shows', () => {
render(<Header />, container);
expect(screen.getByText(/Tv Shows/i)).toBeInTheDocument();
});
test('should contain text peliculas', () => {
render(<Header />, container);
expect(screen.getByText(/Películas/i)).toBeInTheDocument();
});
test('should contain button', () => {
render(<Header />, container);
expect(screen.getByText(/Registrarse/i)).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import React, { useState } from 'react';
import { withRouter } from 'react-router-dom';

const UserMenu = (props) => {
const [openMenu, setOpenMenu] = useState(false);

return (
<div className="Menu">
<div className="m-item m-logo" onClick={() => setOpenMenu(!openMenu)}>
Menu
</div>
<div className={setClassNames(1)}>
Dashboard
</div>
<div className={setClassNames(2)}>
Settings
</div>
<div className={setClassNames(3)}>
Sign out
</div>
</div>
);
};

export default withRouter(UserMenu);
Loading