Skip to content

Commit

Permalink
Updated package dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
VyacheslavKokayko committed May 22, 2024
1 parent 45b9728 commit 3ceace6
Show file tree
Hide file tree
Showing 9 changed files with 14,325 additions and 7,551 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ You are given movies loaded from the API and initial markup. Your task is to:
- Install Prettier Extention and use this [VSCode settings](https://mate-academy.github.io/fe-program/tools/vscode/settings.json) to enable format on save.
- Implement a solution following the [React task guideline](https://github.com/mate-academy/react_task-guideline#react-tasks-guideline).
- Open one more terminal and run tests with `npm test` to ensure your solution is correct.
- Replace `<your_account>` with your Github username in the [DEMO LINK](https://<your_account>.github.io/react_movies-list-js/) and add it to the PR description.
- Replace `<your_account>` with your Github username in the [DEMO LINK](https://VyacheslavKokayko.github.io/react_movies-list-js/) and add it to the PR description.
21,716 changes: 14,270 additions & 7,446 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 @@ -17,7 +17,7 @@
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@mate-academy/eslint-config-react": "latest",
"@mate-academy/scripts": "^1.7.9",
"@mate-academy/scripts": "^1.8.1",
"@mate-academy/stylelint-config": "latest",
"cypress": "^12.17.4",
"eslint": "^7.32.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
12 changes: 1 addition & 11 deletions src/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,4 @@ iframe {
.sidebar {
padding: 20px;
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;
}
};
34 changes: 33 additions & 1 deletion src/components/MovieCard/MovieCard.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,35 @@
import './MovieCard.scss';

export const MovieCard = () => <>Put the card here</>;
export const MovieCard = ({ movie }) => (
<div className="card" data-cy="Movie">
<div className="card-image">
<figure className="image is-4by3">
<img data-cy="MovieImage" src={movie.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">
{movie.title}
</p>
</div>
</div>

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

<a href={movie.imdbUrl} data-cy="MovieLink">
IMDB
</a>
</div>
</div>
</div>
);
4 changes: 3 additions & 1 deletion src/components/MovieCard/MovieCard.scss
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
// 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 { MovieCard } from '../MovieCard/MovieCard';
import './MovieList.scss';

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

0 comments on commit 3ceace6

Please sign in to comment.