Skip to content

Commit

Permalink
Merge pull request #75 from IvanAmoros/aitor-film-festival
Browse files Browse the repository at this point in the history
Aitor film festival
  • Loading branch information
IvanAmoros authored Oct 11, 2024
2 parents ce2d40f + 9459a09 commit 40295d2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
6 changes: 3 additions & 3 deletions src/components/FilmsWatched.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ const FilmsWatched = () => {
{filmsWatched.map((film) => (
<Grid item xs={6} sm={4} md={3} key={film.id}>
<Card>
<CardActionArea onClick={() => handleExpandClick(film.id)}>
<CardActionArea sx={{ backgroundColor: '#e7f0fe' }} onClick={() => handleExpandClick(film.id)}>
<Box sx={{ position: 'relative', paddingTop: '150%' }}>
<CardMedia
component="img"
Expand Down Expand Up @@ -200,7 +200,7 @@ const FilmsWatched = () => {
/>
</CardContent>
</CardActionArea>
<Collapse in={expanded[film.id]} timeout="auto" unmountOnExit>
<Collapse sx={{ backgroundColor: '#e7f0fe' }} in={expanded[film.id]} timeout="auto" unmountOnExit>
<CardContent>
<Typography variant="subtitle1">
Vista: {film.watched_date}
Expand Down Expand Up @@ -286,7 +286,7 @@ const FilmsWatched = () => {
)}
</CardContent>
</Collapse>
<CardActions sx={{ justifyContent: 'center', padding: 1 }}>
<CardActions sx={{ justifyContent: 'center', padding: 1, backgroundColor: '#e7f0fe' }}>
<Button
sx={{ backgroundColor: userRatedFilms.has(film.id) ? 'secondary' : '#5CB6FF', borderRadius: 4 }}
fullWidth
Expand Down
6 changes: 3 additions & 3 deletions src/components/MovieSearch.js
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ const MovieSearch = () => {
{movies.map((movie) => (
<Grid item xs={6} sm={4} md={3} key={movie.imdbID}>
<Card>
<CardActionArea onClick={() => handleExpandClick(movie.imdbID)}>
<CardActionArea sx={{ backgroundColor: '#e7f0fe' }} onClick={() => handleExpandClick(movie.imdbID)}>
<Box sx={{ position: 'relative', paddingTop: '150%' }}>
{movie.Poster !== 'N/A' && (
<CardMedia
Expand Down Expand Up @@ -286,7 +286,7 @@ const MovieSearch = () => {
</CardContent>
</CardActionArea>
{movie.details && (
<Collapse in={expanded[movie.imdbID]} timeout="auto" unmountOnExit>
<Collapse sx={{ backgroundColor: '#e7f0fe' }} in={expanded[movie.imdbID]} timeout="auto" unmountOnExit>
<CardContent>
<Typography variant="body2" color="textSecondary" sx={{ textAlign: 'justify', mb: 1 }}>
{movie.details.Plot}
Expand Down Expand Up @@ -331,7 +331,7 @@ const MovieSearch = () => {
</CardContent>
</Collapse>
)}
<CardActions>
<CardActions sx={{ backgroundColor: '#e7f0fe' }}>
<Button
sx={{ backgroundColor: '#5CB6FF', borderRadius: 4 }}
fullWidth
Expand Down
8 changes: 3 additions & 5 deletions src/components/MoviesToWatch.js
Original file line number Diff line number Diff line change
Expand Up @@ -281,12 +281,10 @@ const MoviesToWatch = () => {
}}
/>
</Box>
<CardContent sx={{ padding: 0, paddingTop: 1 }}>
<Typography variant="h6">{movie.tittle}</Typography>
</CardContent>
</CardActionArea>
<Collapse in={expanded[movie.id]} timeout="auto" unmountOnExit>
<Collapse sx={{ backgroundColor: '#e7f0fe' }} in={expanded[movie.id]} timeout="auto" unmountOnExit>
<CardContent>
<Typography variant="h6">{movie.tittle}</Typography>
<Typography variant="body2" color="textSecondary" sx={{ textAlign: 'left' }}>
Votos:
</Typography>
Expand Down Expand Up @@ -372,7 +370,7 @@ const MoviesToWatch = () => {
)}
</CardContent>
</Collapse>
<CardActions>
<CardActions sx={{ backgroundColor: '#e7f0fe' }}>
<Grid container spacing={1} sx={{ justifyContent: 'center' }}>
<Grid item xs={user && user.is_superuser ? 6 : 10}>
{movie.proposed_by === user?.username ? (
Expand Down

0 comments on commit 40295d2

Please sign in to comment.