Skip to content

Commit

Permalink
Solution
Browse files Browse the repository at this point in the history
  • Loading branch information
LinaDo1609 committed Dec 27, 2024
1 parent 0b857a7 commit 8ed89c2
Show file tree
Hide file tree
Showing 8 changed files with 4,185 additions and 2,761 deletions.
6,783 changes: 4,121 additions & 2,662 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"devDependencies": {
"@cypress/react18": "^2.0.1",
"@mate-academy/scripts": "^1.8.5",
"@mate-academy/scripts": "^1.9.12",
"@mate-academy/stylelint-config": "*",
"@vitejs/plugin-react": "^4.3.1",
"cypress": "^13.13.0",
Expand Down
91 changes: 3 additions & 88 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,98 +1,13 @@
/* eslint-disable max-len */

import './App.scss';
// import moviesFromServer from './api/movies.json';
import moviesFromServer from './api/movies.json';
import { MovieList } from './components/MovieList/MovieList';

export const App = () => (
<div className="page">
<div className="page-content">
<div className="movies">
<div className="card" data-cy="Movie">
<div className="card-image">
<figure className="image is-4by3">
<img
data-cy="MovieImage"
src="https://m.media-amazon.com/images/M/MV5BMjAxMzY3NjcxNF5BMl5BanBnXkFtZTcwNTI5OTM0Mw@@._V1_SX300.jpg"
alt="Film logo"
/>
</figure>
</div>

<div className="card-content">
<div className="media">
<div className="media-left">
<figure className="image is-48x48">
<img src="images/imdb-logo.jpeg" alt="imdb" />
</figure>
</div>

<div className="media-content">
<p className="title is-8" data-cy="MovieTitle">
Inception
</p>
</div>
</div>

<div className="content">
<p data-cy="MovieDescription">
Follows the lives of eight very different couples in dealing
with their love lives in various loosely interrelated tales all
set during a frantic month before Christmas in London, England.
</p>

<a
href="https://www.imdb.com/title/tt1375666"
data-cy="MovieLink"
>
IMDB
</a>
</div>
</div>
</div>

<div className="card" data-cy="Movie">
<div className="card-image">
<figure className="image is-4by3">
<img
data-cy="MovieImage"
src="https://m.media-amazon.com/images/M/MV5BMTY4NjQ5NDc0Nl5BMl5BanBnXkFtZTYwNjk5NDM3._V1_.jpg"
alt="Film logo"
/>
</figure>
</div>

<div className="card-content">
<div className="media">
<div className="media-left">
<figure className="image is-48x48">
<img src="images/imdb-logo.jpeg" alt="imdb" />
</figure>
</div>

<div className="media-content">
<p className="title is-8" data-cy="MovieTitle">
Love Actually
</p>
</div>
</div>

<div className="content">
<p data-cy="MovieDescription">
A thief who steals corporate secrets through the use of
dream-sharing technology is given the inverse task of planting
an idea into the mind of a C.E.O.
</p>

<a
href="https://www.imdb.com/title/tt0314331"
data-cy="MovieLink"
>
IMDB
</a>
</div>
</div>
</div>
</div>
<MovieList movies={moviesFromServer} />
</div>

<div className="sidebar" data-cy="Sidebar">
Expand Down
10 changes: 2 additions & 8 deletions src/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ iframe {
border-left: 1px solid lightgray;
}

.movies {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
gap: 20px;
}

.card-image img {
object-fit: contain;
}


43 changes: 42 additions & 1 deletion src/components/MovieCard/MovieCard.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,44 @@
import './MovieCard.scss';

export const MovieCard = () => <>Put the card here</>;
export const MovieCard = ({ movies }) => (
<div className="card" data-cy="Movie">
<div className="card-image">
<figure className="image is-4by3">
<img
data-cy="MovieImage"
src={movies.imgUrl}
alt="Film logo"
/>
</figure>
</div>

<div className="card-content">
<div className="media">
<div className="media-left">
<figure className="image is-48x48">
<img src="images/imdb-logo.jpeg" alt="imdb" />
</figure>
</div>

<div className="media-content">
<p className="title is-8" data-cy="MovieTitle">
{movies.title}
</p>
</div>
</div>

<div className="content">
<p data-cy="MovieDescription">
{movies.description}
</p>

<a
href={movies.imdbUrl}
data-cy="MovieLink"
>
IMDB
</a>
</div>
</div>
</div>
)
3 changes: 3 additions & 0 deletions src/components/MovieCard/MovieCard.scss
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
// add styles here
.card-image img {
object-fit: contain;
}
9 changes: 8 additions & 1 deletion src/components/MovieList/MovieList.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
import './MovieList.scss';
import { MovieCard } from '../MovieCard/MovieCard';

export const MovieList = () => <>Put the list here</>;
export const MovieList = ({movies}) => (
<div className="movies">
{movies.map((movie) =>
<MovieCard movies={movie} key={movie.imdbId} />
)}
</div>
);
5 changes: 5 additions & 0 deletions src/components/MovieList/MovieList.scss
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
// add styles here
.movies {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
gap: 20px;
}

0 comments on commit 8ed89c2

Please sign in to comment.