Code

Grupo 6_SkylabFilms#696

Code

Open

blopez-dev wants to merge 140 commits intomainSkylabCoders/skylab-bootcamp-202104-bcn:mainfrom Grupo_6SkylabCoders/skylab-bootcamp-202104-bcn:Grupo_6Copy head branch name to clipboard

+3,696-22,831

Commits

Commits on May 3, 2021

• Solve chokidar error when doing npm start

  

  Santiago.Martinez

  committed
  ad2f868

• Delete unnecessary/updated files

  

  Santiago.Martinez

  committed
  e4a78d2

• Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-bootcamp-202104-bcn into Grupo_6

  

  Santiago.Martinez

  committed
  ea52a27

• Merge branch 'main' into Grupo_6

  

  Santiago.Martinez

  committed
  ebba3db

• Created routed and main navigation routes

  blopez-dev

  committed
  4c2fdba

Commits on May 4, 2021

• Main carusel functional, slider buttons

  HosniMaRu

  committed
  96a6166

• Clean comments

  HosniMaRu

  committed
  b8cb1e5

• Completed double routing to show user options

  blopez-dev

  committed
  a85732a

• Added form to login

  blopez-dev

  committed
  6fce245

• Merge pull request #460 from SkylabCoders/Auth-withh-firebase

  Show description for bb5ce07
  blopez-dev

  authored
  bb5ce07

• Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-bootcamp-202104-bcn into Grupo_6

  

  Santiago.Martinez

  committed
  19bf40c

• Change png format file to png

  blopez-dev

  committed
  9bb6a32

• resolve conflict in Navigation.jsx

  blopez-dev

  committed
  46e0c91

• Change styles in styles.js to Navigation.jsx

  blopez-dev

  committed
  d8eb967

• Merge pull request #464 from SkylabCoders/feature/01-main-navigation

  Show description for 286da4c
  blopez-dev

  authored
  286da4c

• Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-bootcamp-202104-bcn into Grupo_6

  

  Santiago.Martinez

  committed
  1814814

• Change img extension from png no svg

  

  Santiago.Martinez

  committed
  69eb8f6

• upadted composer

  blopez-dev

  committed
  116aa01

• Accept incoming changes

  

  Santiago.Martinez

  committed
  4899b8b

• Add incoming package-lock.json changes

  

  Santiago.Martinez

  committed
  2ef7354

• Correct index.jsx from store folder

  

  Santiago.Martinez

  committed
  827e13d

• Add carousel in dashboard

  

  Santiago.Martinez

  committed
  95abc0b

• Add carousel in home page

  

  Santiago.Martinez

  committed
  17d9cfe

• Add styles to button carousel

  

  Santiago.Martinez

  committed
  7dd05ca

• Solve key console error in index.jsx

  

  Santiago.Martinez

  committed
  b9be99f

• Delete extra comment

  

  Santiago.Martinez

  committed
  ad6b8e7

• Add auth reducer

  

  Santiago.Martinez

  committed
  ea0b335

• Pull remote

  HosniMaRu

  committed
  6732815

Commits on May 5, 2021

• Implemented Authentication mode

  blopez-dev

  committed
  7a8599a

• Added slideShow Home component

  blopez-dev

  committed
  44b9a40

• Merge pull request #503 from SkylabCoders/Grupo_6-backup

  Show description for bcad7c2
  blopez-dev

  authored
  bcad7c2

• Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-bootcamp-202104-bcn into Grupo_6

  HosniMaRu

  committed
  95d1464

• Delete file from slide-show folder

  

  Santiago.Martinez

  committed
  3f2d9f9

• Update slide-show

  HosniMaRu

  committed
  f498f27

• Change input login

  blopez-dev

  committed
  897a390

• Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-bootcamp-202104-bcn into Grupo_6

  

  Santiago.Martinez

  committed
  b87f2a1

• Modified wrapper title slideShow

  blopez-dev

  committed
  4ce36df

• Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-bootcamp-202104-bcn into Grupo_6

  

  Santiago.Martinez

  committed
  85b6b70

• Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-bootcamp-202104-bcn into Grupo_6

  HosniMaRu

  committed
  e00f942

• Correct button carousel style

  

  Santiago.Martinez

  committed
  a7cb2b6

• Implemented user image profile in when this is logged

  blopez-dev

  committed
  60f0cbc

• Remove unnecessary styles in carousel

  

  Santiago.Martinez

  committed
  c572694

• Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-bootcamp-202104-bcn into Grupo_6

  

  Santiago.Martinez

  committed
  a225b0c

• Stylized area user profile in header

  blopez-dev

  committed
  57a36e6

• Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-bootcamp-202104-bcn into Grupo_6

  

  Santiago.Martinez

  committed
  9f67e55

• Merge pull request #510 from SkylabCoders/feature/06-carousel-buttons

  Show description for b4f7c71
  HosniMaRu

  authored
  b4f7c71

• Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-bootcamp-202104-bcn into Grupo_6

  

  Santiago.Martinez

  committed
  4ae5ee0

• Add the second banner carousel, all from the same films page from URL

  

  Santiago.Martinez

  committed
  f3bf0ae

• Feature title up

  HosniMaRu

  committed
  65e7604

• Fixed bugs in title component

  HosniMaRu

  committed
  7e1007c

• Fixed title slider most viewed

  HosniMaRu

  committed
  3a7a771

• Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-bootcamp-202104-bcn into Grupo_6

  HosniMaRu

  committed
  9261b52

• merged Group 6

  HosniMaRu

  committed
  d32411e

• Adding super scss

  HosniMaRu

  committed
  3a92625

• Merge pull request #522 from SkylabCoders/Feature/Hosni/Title-component

  Show description for e6ec471
  HosniMaRu

  authored
  e6ec471

• pull

  HosniMaRu

  committed
  3c76361

• Add footer to dashboard

  

  Santiago.Martinez

  committed
  7a60bcd

• remote pull

  HosniMaRu

  committed
  dc21b3c

• Merge pull request #523 from SkylabCoders/feature/06-footer

  Show description for 889a1d8
  SantiagoMC52

  authored
  889a1d8

• Adding lr-title in process

  HosniMaRu

  committed
  a7a3f02

• Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-bootcamp-202104-bcn into Grupo_6

  HosniMaRu

  committed
  d306c09

• fixed default

  HosniMaRu

  committed
  d2f96e6

• Test header, footer and films components

  

  Santiago.Martinez

  committed
  617042a

• Test of layout component

  

  Santiago.Martinez

  committed
  4feffdf

• Test login component

  

  Santiago.Martinez

  committed
  caa7551

• Merge pull request #542 from SkylabCoders/feature/06-testing

  Show description for 2526f4b
  blopez-dev

  authored
  2526f4b

• upadted carousel component and login

  blopez-dev

  committed
  9302c84

• Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-bootcamp-202104-bcn into Grupo_6

  blopez-dev

  committed
  6f2fd5e

• Second title done

  HosniMaRu

  committed
  cf45271

• Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-bootcamp-202104-bcn into Grupo_6

  HosniMaRu

  committed
  c6e73eb

• merge Group_6

  HosniMaRu

  committed
  977ce98

• Merge from remote

  HosniMaRu

  committed
  fadad06

Commits on May 6, 2021

• Merge pull request #543 from SkylabCoders/Feature/Hosni/lr-title

  Show description for 1bb3b44
  SantiagoMC52

  authored
  1bb3b44

• Repair acces to contain

  blopez-dev

  committed
  81de806

• Feature Most Viewed title

  HosniMaRu

  committed
  b36b04a

• Merge branch 'Grupo_6' into Feature/Hosni/MV-title

  HosniMaRu

  committed
  e0a651a

• Merge pull request #555 from SkylabCoders/Feature/Hosni/MV-title

  Show description for 67c9d01
  HosniMaRu

  authored
  67c9d01

• Created new component to render a single Title

  blopez-dev

  committed
  5d49f50

• Updated repo

  blopez-dev

  committed
  1d5694e

• Try to get id to show genres

  blopez-dev

  committed
  8450ede

• updated repo

  blopez-dev

  committed
  78c4e2b

• Layout of the header of the page of each film

  blopez-dev

  committed
  e1932d9

Commits on May 7, 2021

• Added cast action and reducer

  blopez-dev

  committed
  7d64afc

• Add the correct buttons styles

  

  Santiago.Martinez

  committed
  3c8e774

• Merge pull request #602 from SkylabCoders/Grupo6-new

  Show description for c27abc0
  SantiagoMC52

  authored
  c27abc0

• Fixed import cast on movie details

  HosniMaRu

  committed
  44f6b68

• Fixed import cast on movie details

  HosniMaRu

  committed
  5fa00de

• Added Cast element in detail film

  blopez-dev

  committed
  e56d181

• Fixed bugs in moviedetails.jsx

  blopez-dev

  committed
  ed3b628

• clean debugger

  HosniMaRu

  committed
  f6a1711

• Fixed bug header

  blopez-dev

  committed
  ca44b0b

• Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-bootcamp-202104-bcn into Grupo_6

  HosniMaRu

  committed
  2bbc18a

• Display shows in tvshows component

  

  Santiago.Martinez

  committed
  1e546d0

• Change the URL to obtain the tv shows

  

  Santiago.Martinez

  committed
  500a2bd

• Merge pull request #614 from SkylabCoders/feature/06-tv-shows

  Show description for 4a573f1
  blopez-dev

  authored
  4a573f1

• Show recomended movies in the movie detail

  blopez-dev

  committed
  b4617a9

• Updated branch

  blopez-dev

  committed
  dd0cb69

• Fixed problemes

  blopez-dev

  committed
  4da672b

• Delete a console log in actionCreators

  

  Santiago.Martinez

  committed
  6dfb90b

• Merge branch 'Grupo_6' of https://github.com/SkylabCoders/skylab-bootcamp-202104-bcn into Grupo_6

  HosniMaRu

  committed
  d79a78f

• Merge pull request #632 from SkylabCoders/Feature/Hosni/Movies-grid

  Show description for f73638b
  HosniMaRu

  authored
  f73638b

• Feature Films show

  HosniMaRu

  committed
  f34d31e

• Merge pull request #634 from SkylabCoders/Feature/Hosni/Movies-grid

  Show description for 6284626
  HosniMaRu

  authored
  6284626

• Path to Detail

  HosniMaRu

  committed
  fd7b36a

• Fixed some bugs in test

  blopez-dev

  committed
  4f610dd

• Merge pull request #638 from SkylabCoders/Test

  Show description for 5419e2a
  blopez-dev

  authored
  5419e2a

• Correct eslint error in eslint file and ad test watchAll in package.json

  

  Santiago.Martinez

  committed
  a56e449

Commits on May 8, 2021

• Deleted usseles files, fix magic strings

  HosniMaRu

  committed
  9b5e8d4

• Replace actionType for Heading to String

  HosniMaRu

  committed
  dc1463d

• Merge pull request #642 from SkylabCoders/Feature/Hosni/Delete-usseles-files/folders

  Show description for 0bcb104
  SantiagoMC52

  authored
  0bcb104

• Add detail from tv show

  

  Santiago.Martinez

  committed
  b5d1d23

• Merge pull request #644 from SkylabCoders/feature/06-show-details

  Show description for 44fe9f6
  blopez-dev

  authored
  44fe9f6

• Added titles in section movies

  blopez-dev

  committed
  737de7e

• Remplaced in 'Films' and 'Tv-shows' styles.css by style.js and add max-width to wrapper container

  blopez-dev

  committed
  94c5e3a

• SlideShow prop myMovies.popular fixed

  HosniMaRu

  committed
  8c035fe

• Merge branch 'Grupo_6' into Feature/Hosni/Property-errors

  HosniMaRu

  committed
  72b12fa

• Fixed styles in login butto

  blopez-dev

  committed
  30790b7

• Fixed SliderCarusel proptypes

  HosniMaRu

  committed
  b4d267e

• Adjusted styles for tv and movies sections

  blopez-dev

  committed
  0ff9b22

• Merge pull request #647 from SkylabCoders/feature/searchbar

  Show description for df48d41
  blopez-dev

  authored
  df48d41

• Added new feature to show related tv-shows

  blopez-dev

  committed
  57055ac

• Merge pull request #653 from SkylabCoders/show-details-related

  Show description for 7813f0e
  blopez-dev

  authored
  7813f0e

• Merge branch 'Grupo_6' into Feature/Hosni/Property-errors

  HosniMaRu

  committed
  43127b0

• Merge pull request #654 from SkylabCoders/Feature/Hosni/Property-errors

  Show description for 1126eac
  HosniMaRu

  authored
  1126eac

• Created Searchbar component and result component

  blopez-dev

  committed
  dd30956

Commits on May 9, 2021

• Implemented new feature: searchbar component

  blopez-dev

  committed
  3de32d7

• Fixed conflicts files

  blopez-dev

  committed
  8348c31

• Replace extension file in style searchbar

  blopez-dev

  committed
  01d2a63

• Fixed conflicts

  blopez-dev

  committed
  0d2dbe2

• Added new dependencie to fetch query

  blopez-dev

  committed
  65d2c9c

• Fixd conflicts

  blopez-dev

  committed
  db7f94b

• Merge pull request #659 from SkylabCoders/feature/searchbar

  Show description for 0a58772
  blopez-dev

  authored
  0a58772

• Resolve conflict in films.js inside services folder

  

  Santiago.Martinez

  committed
  9d5253b

• Add some tests

  

  Santiago.Martinez

  committed
  e8dba82

• Merge pull request #661 from SkylabCoders/feature/06-testing

  Show description for b72afd7
  HosniMaRu

  authored
  b72afd7

• Updated component searchbar and implemented in header

  blopez-dev

  committed
  0f637eb

• Merge branch 'Grupo_6' into feature/searchbar

  blopez-dev

  committed
  f64aaba

• Merge pull request #665 from SkylabCoders/feature/searchbar

  Show description for aa2f77a
  blopez-dev

  authored
  aa2f77a

Commits on May 10, 2021

• upadted package.json

  blopez-dev

  committed
  0c84dba

Commits on May 12, 2021

• Modified styles header

  blopez-dev

  committed
  ea9beeb