-
Notifications
You must be signed in to change notification settings - Fork 1
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
blopez-dev
wants to merge
140
commits into
main
Choose a base branch
from
Grupo_6
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+3,696
−22,831
Open
Grupo 6_SkylabFilms #696
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
e4a78d2
Delete unnecessary/updated files
ea52a27
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
ebba3db
Merge branch 'main' into Grupo_6
4c2fdba
Created routed and main navigation routes
blopez-dev 96a6166
Main carusel functional, slider buttons
HosniMaRu b8cb1e5
Clean comments
HosniMaRu a85732a
Completed double routing to show user options
blopez-dev 6fce245
Added form to login
blopez-dev bb5ce07
Merge pull request #460 from SkylabCoders/Auth-withh-firebase
blopez-dev 19bf40c
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
9bb6a32
Change png format file to png
blopez-dev 46e0c91
resolve conflict in Navigation.jsx
blopez-dev d8eb967
Change styles in styles.js to Navigation.jsx
blopez-dev 286da4c
Merge pull request #464 from SkylabCoders/feature/01-main-navigation
blopez-dev 1814814
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
69eb8f6
Change img extension from png no svg
116aa01
upadted composer
blopez-dev 4899b8b
Accept incoming changes
2ef7354
Add incoming package-lock.json changes
827e13d
Correct index.jsx from store folder
95abc0b
Add carousel in dashboard
17d9cfe
Add carousel in home page
7dd05ca
Add styles to button carousel
b9be99f
Solve key console error in index.jsx
ad6b8e7
Delete extra comment
ea0b335
Add auth reducer
6732815
Pull remote
HosniMaRu 7a8599a
Implemented Authentication mode
blopez-dev 44b9a40
Added slideShow Home component
blopez-dev bcad7c2
Merge pull request #503 from SkylabCoders/Grupo_6-backup
blopez-dev 95d1464
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
HosniMaRu 3f2d9f9
Delete file from slide-show folder
f498f27
Update slide-show
HosniMaRu 897a390
Change input login
blopez-dev b87f2a1
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
4ce36df
Modified wrapper title slideShow
blopez-dev 85b6b70
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
e00f942
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
HosniMaRu a7cb2b6
Correct button carousel style
60f0cbc
Implemented user image profile in when this is logged
blopez-dev c572694
Remove unnecessary styles in carousel
a225b0c
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
57a36e6
Stylized area user profile in header
blopez-dev 9f67e55
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
b4f7c71
Merge pull request #510 from SkylabCoders/feature/06-carousel-buttons
HosniMaRu 4ae5ee0
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
f3bf0ae
Add the second banner carousel, all from the same films page from URL
65e7604
Feature title up
HosniMaRu 7e1007c
Fixed bugs in title component
HosniMaRu 3a7a771
Fixed title slider most viewed
HosniMaRu 9261b52
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
HosniMaRu d32411e
merged Group 6
HosniMaRu 3a92625
Adding super scss
HosniMaRu e6ec471
Merge pull request #522 from SkylabCoders/Feature/Hosni/Title-component
HosniMaRu 3c76361
pull
HosniMaRu 7a60bcd
Add footer to dashboard
dc21b3c
remote pull
HosniMaRu 889a1d8
Merge pull request #523 from SkylabCoders/feature/06-footer
SantiagoMC52 a7a3f02
Adding lr-title in process
HosniMaRu d306c09
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
HosniMaRu d2f96e6
fixed default
HosniMaRu 617042a
Test header, footer and films components
4feffdf
Test of layout component
caa7551
Test login component
2526f4b
Merge pull request #542 from SkylabCoders/feature/06-testing
blopez-dev 9302c84
upadted carousel component and login
blopez-dev 6f2fd5e
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
blopez-dev cf45271
Second title done
HosniMaRu c6e73eb
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
HosniMaRu 977ce98
merge Group_6
HosniMaRu fadad06
Merge from remote
HosniMaRu 1bb3b44
Merge pull request #543 from SkylabCoders/Feature/Hosni/lr-title
SantiagoMC52 81de806
Repair acces to contain
blopez-dev b36b04a
Feature Most Viewed title
HosniMaRu e0a651a
Merge branch 'Grupo_6' into Feature/Hosni/MV-title
HosniMaRu 67c9d01
Merge pull request #555 from SkylabCoders/Feature/Hosni/MV-title
HosniMaRu 5d49f50
Created new component to render a single Title
blopez-dev 1d5694e
Updated repo
blopez-dev 8450ede
Try to get id to show genres
blopez-dev 78c4e2b
updated repo
blopez-dev e1932d9
Layout of the header of the page of each film
blopez-dev 7d64afc
Added cast action and reducer
blopez-dev 3c8e774
Add the correct buttons styles
c27abc0
Merge pull request #602 from SkylabCoders/Grupo6-new
SantiagoMC52 44f6b68
Fixed import cast on movie details
HosniMaRu 5fa00de
Fixed import cast on movie details
HosniMaRu e56d181
Added Cast element in detail film
blopez-dev ed3b628
Fixed bugs in moviedetails.jsx
blopez-dev f6a1711
clean debugger
HosniMaRu ca44b0b
Fixed bug header
blopez-dev 2bbc18a
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
HosniMaRu 1e546d0
Display shows in tvshows component
500a2bd
Change the URL to obtain the tv shows
4a573f1
Merge pull request #614 from SkylabCoders/feature/06-tv-shows
blopez-dev b4617a9
Show recomended movies in the movie detail
blopez-dev dd0cb69
Updated branch
blopez-dev 4da672b
Fixed problemes
blopez-dev 6dfb90b
Delete a console log in actionCreators
d79a78f
Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-boot…
HosniMaRu f73638b
Merge pull request #632 from SkylabCoders/Feature/Hosni/Movies-grid
HosniMaRu f34d31e
Feature Films show
HosniMaRu 6284626
Merge pull request #634 from SkylabCoders/Feature/Hosni/Movies-grid
HosniMaRu fd7b36a
Path to Detail
HosniMaRu 4f610dd
Fixed some bugs in test
blopez-dev 5419e2a
Merge pull request #638 from SkylabCoders/Test
blopez-dev a56e449
Correct eslint error in eslint file and ad test watchAll in package.json
9b5e8d4
Deleted usseles files, fix magic strings
HosniMaRu dc1463d
Replace actionType for Heading to String
HosniMaRu 0bcb104
Merge pull request #642 from SkylabCoders/Feature/Hosni/Delete-ussele…
SantiagoMC52 b5d1d23
Add detail from tv show
44fe9f6
Merge pull request #644 from SkylabCoders/feature/06-show-details
blopez-dev 737de7e
Added titles in section movies
blopez-dev 94c5e3a
Remplaced in 'Films' and 'Tv-shows' styles.css by style.js and add ma…
blopez-dev 8c035fe
SlideShow prop myMovies.popular fixed
HosniMaRu 72b12fa
Merge branch 'Grupo_6' into Feature/Hosni/Property-errors
HosniMaRu 30790b7
Fixed styles in login butto
blopez-dev b4d267e
Fixed SliderCarusel proptypes
HosniMaRu 0ff9b22
Adjusted styles for tv and movies sections
blopez-dev df48d41
Merge pull request #647 from SkylabCoders/feature/searchbar
blopez-dev 57055ac
Added new feature to show related tv-shows
blopez-dev 7813f0e
Merge pull request #653 from SkylabCoders/show-details-related
blopez-dev 43127b0
Merge branch 'Grupo_6' into Feature/Hosni/Property-errors
HosniMaRu 1126eac
Merge pull request #654 from SkylabCoders/Feature/Hosni/Property-errors
HosniMaRu dd30956
Created Searchbar component and result component
blopez-dev 3de32d7
Implemented new feature: searchbar component
blopez-dev 8348c31
Fixed conflicts files
blopez-dev 01d2a63
Replace extension file in style searchbar
blopez-dev 0d2dbe2
Fixed conflicts
blopez-dev 65d2c9c
Added new dependencie to fetch query
blopez-dev db7f94b
Fixd conflicts
blopez-dev 0a58772
Merge pull request #659 from SkylabCoders/feature/searchbar
blopez-dev 9d5253b
Resolve conflict in films.js inside services folder
e8dba82
Add some tests
b72afd7
Merge pull request #661 from SkylabCoders/feature/06-testing
HosniMaRu 0f637eb
Updated component searchbar and implemented in header
blopez-dev f64aaba
Merge branch 'Grupo_6' into feature/searchbar
blopez-dev aa2f77a
Merge pull request #665 from SkylabCoders/feature/searchbar
blopez-dev 0c84dba
upadted package.json
blopez-dev ea9beeb
Modified styles header
blopez-dev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
redirectUri={window.location.origin} | ||
> | ||
<Provider store={createStore()}> | ||
<HeaderLayout /> | ||
</Provider> | ||
</Auth0Provider> | ||
</GlobalApp> | ||
); | ||
} | ||
|
||
export default App; |
12 changes: 12 additions & 0 deletions
12
00-TEAMS/06-TEAM/src/application/components/layout/Layout.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
24
00-TEAMS/06-TEAM/src/application/components/layout/Layout.test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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(); | ||
}); | ||
}); |
12 changes: 12 additions & 0 deletions
12
00-TEAMS/06-TEAM/src/application/components/layout/assets/BrandLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions
27
00-TEAMS/06-TEAM/src/application/components/layout/footer/Footer.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; |
24 changes: 24 additions & 0 deletions
24
00-TEAMS/06-TEAM/src/application/components/layout/footer/Footer.test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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(); | ||
}); | ||
}); |
23 changes: 23 additions & 0 deletions
23
00-TEAMS/06-TEAM/src/application/components/layout/footer/footer.css
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
21 changes: 21 additions & 0 deletions
21
00-TEAMS/06-TEAM/src/application/components/layout/footer/footer.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | ||
} | ||
} | ||
} |
8 changes: 8 additions & 0 deletions
8
00-TEAMS/06-TEAM/src/application/components/layout/header/Header.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; |
32 changes: 32 additions & 0 deletions
32
00-TEAMS/06-TEAM/src/application/components/layout/header/Header.test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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(); | ||
}); | ||
}); |
25 changes: 25 additions & 0 deletions
25
00-TEAMS/06-TEAM/src/application/components/layout/header/components/DropdownUser/index.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); |
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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