Skip to content
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.

Sign up for GitHub

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

add task solution #1331

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add task solution #1331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ You are given movies loaded from the API and initial markup. Your task is to:
1. Keep all `data-cy` attributes to pass the tests.

## Instructions
- Install Prettier Extention and use this [VSCode settings](https://mate-academy.github.io/fe-program/tools/vscode/settings.json) to enable format on save.
- Install Prettier Extention and use this [VSCode settings](https://DianaKadimbekova.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.
92 changes: 3 additions & 89 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,100 +1,14 @@
/* 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">
Sidebar will be here
</div>
Expand Down
21 changes: 0 additions & 21 deletions src/App.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,7 @@ iframe {
display: none;
}

.page {
display: grid;
grid-template: auto / 1fr 400px;
column-gap: 20px;
min-height: 100vh;
}

.page-content {
padding: 20px;
}

.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;
}
39 changes: 38 additions & 1 deletion src/components/MovieCard/MovieCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,40 @@
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"
// eslint-disable-next-line max-len
src="https://m.media-amazon.com/images/M/MV5BMjAxMzY3NjcxNF5BMl5BanBnXkFtZTcwNTI5OTM0Mw@@._V1_SX300.jpg"
alt={`${movie.title} 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="https://www.imdb.com/title/tt1375666" data-cy="MovieLink">
IMDB
</a>
</div>
</div>
</div>
);
10 changes: 10 additions & 0 deletions src/components/MovieCard/MovieCard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
// add styles here

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

.movies {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
gap: 20px;
}
9 changes: 8 additions & 1 deletion src/components/MovieList/MovieList.jsx
View file
Open in desktop
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 key={movie.imdbId} movie={movie} />
))}
</div>
);
10 changes: 10 additions & 0 deletions src/components/MovieList/MovieList.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
// add styles here
.page {
display: grid;
grid-template: auto / 1fr 400px;
column-gap: 20px;
min-height: 100vh;
}

.page-content {
padding: 20px;
}
Loading