Skip to content

Commit

Permalink
Merge branch 'master' into module4-task1
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nawwar14
Nawwar14 authored Oct 23, 2024
2 parents 9facc36 + 371385c commit 4693dbd
Show file tree
Hide file tree
Showing 5 changed files with 351 additions and 1 deletion.
229 changes: 229 additions & 0 deletions src/components/Favorites/Favorite.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,232 @@ const Favorite = ({ offers }: FavoriteProps) => (
);

export default Favorite;
=======

Check failure on line 33 in src/components/Favorites/Favorite.tsx

View workflow job for this annotation

GitHub Actions / build 

Merge conflict marker encountered.
export const Favorite = () => (
<div className="page">
<header className="header">
<div className="container">
<div className="header__wrapper">
<div className="header__left">
<a className="header__logo-link" href="main.html">
<img
className="header__logo"
src="img/logo.svg"
alt="6 cities logo"
width="81"
height="41"
/>
</a>
</div>
<nav className="header__nav">
<ul className="header__nav-list">
<li className="header__nav-item user">
<a
className="header__nav-link header__nav-link--profile"
href="#"
>
<div className="header__avatar-wrapper user__avatar-wrapper"></div>
<span className="header__user-name user__name">
[email protected]
</span>
<span className="header__favorite-count">3</span>
</a>
</li>
<li className="header__nav-item">
<a className="header__nav-link" href="#">
<span className="header__signout">Sign out</span>
</a>
</li>
</ul>
</nav>
</div>
</div>
</header>

<main className="page__main page__main--favorites">
<div className="page__favorites-container container">
<section className="favorites">
<h1 className="favorites__title">Saved listing</h1>
<ul className="favorites__list">
<li className="favorites__locations-items">
<div className="favorites__locations locations locations--current">
<div className="locations__item">
<a className="locations__item-link" href="#">
<span>Amsterdam</span>
</a>
</div>
</div>
<div className="favorites__places">
<article className="favorites__card place-card">
<div className="place-card__mark">
<span>Premium</span>
</div>
<div className="favorites__image-wrapper place-card__image-wrapper">
<a href="#">
<img
className="place-card__image"
src="img/apartment-small-03.jpg"
width="150"
height="110"
alt="Place image"
/>
</a>
</div>
<div className="favorites__card-info place-card__info">
<div className="place-card__price-wrapper">
<div className="place-card__price">
<b className="place-card__price-value">&euro;180</b>
<span className="place-card__price-text">
&#47;&nbsp;night
</span>
</div>
<button
className="place-card__bookmark-button place-card__bookmark-button--active button"
type="button"
>
<svg
className="place-card__bookmark-icon"
width="18"
height="19"
>
<use xlinkHref="#icon-bookmark"></use>
</svg>
<span className="visually-hidden">In bookmarks</span>
</button>
</div>
<div className="place-card__rating rating">
<div className="place-card__stars rating__stars">
<span style={{ width: '100%' }}></span>
<span className="visually-hidden">Rating</span>
</div>
</div>
<h2 className="place-card__name">
<a href="#">Nice, cozy, warm big bed apartment</a>
</h2>
<p className="place-card__type">Apartment</p>
</div>
</article>

<article className="favorites__card place-card">
<div className="favorites__image-wrapper place-card__image-wrapper">
<a href="#">
<img
className="place-card__image"
src="img/room-small.jpg"
width="150"
height="110"
alt="Place image"
/>
</a>
</div>
<div className="favorites__card-info place-card__info">
<div className="place-card__price-wrapper">
<div className="place-card__price">
<b className="place-card__price-value">&euro;80</b>
<span className="place-card__price-text">
&#47;&nbsp;night
</span>
</div>
<button
className="place-card__bookmark-button place-card__bookmark-button--active button"
type="button"
>
<svg
className="place-card__bookmark-icon"
width="18"
height="19"
>
<use xlinkHref="#icon-bookmark"></use>
</svg>
<span className="visually-hidden">In bookmarks</span>
</button>
</div>
<div className="place-card__rating rating">
<div className="place-card__stars rating__stars">
<span style={{ width: '80%' }}></span>
<span className="visually-hidden">Rating</span>
</div>
</div>
<h2 className="place-card__name">
<a href="#">Wood and stone place</a>
</h2>
<p className="place-card__type">Room</p>
</div>
</article>
</div>
</li>

<li className="favorites__locations-items">
<div className="favorites__locations locations locations--current">
<div className="locations__item">
<a className="locations__item-link" href="#">
<span>Cologne</span>
</a>
</div>
</div>
<div className="favorites__places">
<article className="favorites__card place-card">
<div className="favorites__image-wrapper place-card__image-wrapper">
<a href="#">
<img
className="place-card__image"
src="img/apartment-small-04.jpg"
width="150"
height="110"
alt="Place image"
/>
</a>
</div>
<div className="favorites__card-info place-card__info">
<div className="place-card__price-wrapper">
<div className="place-card__price">
<b className="place-card__price-value">&euro;180</b>
<span className="place-card__price-text">
&#47;&nbsp;night
</span>
</div>
<button
className="place-card__bookmark-button place-card__bookmark-button--active button"
type="button"
>
<svg
className="place-card__bookmark-icon"
width="18"
height="19"
>
<use xlinkHref="#icon-bookmark"></use>
</svg>
<span className="visually-hidden">In bookmarks</span>
</button>
</div>
<div className="place-card__rating rating">
<div className="place-card__stars rating__stars">
<span style={{ width: '100%' }}></span>
<span className="visually-hidden">Rating</span>
</div>
</div>
<h2 className="place-card__name">
<a href="#">White castle</a>
</h2>
<p className="place-card__type">Apartment</p>
</div>
</article>
</div>
</li>
</ul>
</section>
</div>
</main>
<footer className="footer container">
<a className="footer__logo-link" href="main.html">
<img
className="footer__logo"
src="img/logo.svg"
alt="6 cities logo"
width="64"
height="33"
/>
</a>
</footer>
</div>
);
62 changes: 62 additions & 0 deletions src/components/Login/LoginPage.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,65 @@ export default function LoginPage () {
</div>
);
}
=======

Check failure on line 64 in src/components/Login/LoginPage.tsx

View workflow job for this annotation

GitHub Actions / build 

Merge conflict marker encountered.
export const LoginPage = () => (
<div className="page page--gray page--login">
<header className="header">
<div className="container">
<div className="header__wrapper">
<div className="header__left">
<a className="header__logo-link" href="main.html">
<img
className="header__logo"
src="img/logo.svg"
alt="6 cities logo"
width="81"
height="41"
/>
</a>
</div>
</div>
</div>
</header>

<main className="page__main page__main--login">
<div className="page__login-container container">
<section className="login">
<h1 className="login__title">Sign in</h1>
<form className="login__form form" action="#" method="post">
<div className="login__input-wrapper form__input-wrapper">
<label className="visually-hidden">E-mail</label>
<input
className="login__input form__input"
type="email"
name="email"
placeholder="Email"
required
/>
</div>
<div className="login__input-wrapper form__input-wrapper">
<label className="visually-hidden">Password</label>
<input
className="login__input form__input"
type="password"
name="password"
placeholder="Password"
required
/>
</div>
<button className="login__submit form__submit button" type="submit">
Sign in
</button>
</form>
</section>
<section className="locations locations--login locations--current">
<div className="locations__item">
<a className="locations__item-link" href="#">
<span>Amsterdam</span>
</a>
</div>
</section>
</div>
</main>
</div>
);
2 changes: 1 addition & 1 deletion src/components/MainPage/MainPage.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,4 @@ export const MainPage : FC<MainPageProps> = ({ offers }) =>
</main>
</div>
);
export default MainPage;
export default MainPage;

Check failure on line 120 in src/components/MainPage/MainPage.tsx

View workflow job for this annotation

GitHub Actions / Check 

Newline required at end of file but not found
56 changes: 56 additions & 0 deletions src/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,62 @@ const root = ReactDOM.createRoot(
document.getElementById('root') as HTMLElement
);

type cardProperties={
Premium:boolean;
Price:number;
Img:string;
ApartsmentType:string;
Description:string;
NumberOfPlaces:number;
};
export type {cardProperties};

const mainPageCardInfo:cardProperties[] = [
{
Premium:true,
Price:120,
Img:'../markup/Img/apartment-01.jpg',
ApartsmentType:'Apartment',
Description:'Beautiful &amp; luxurious apartment at great location',
NumberOfPlaces:132
},
{
Premium:false,
Price:80,
Img:'../markup/Img/room.jpg',
ApartsmentType:'Room',
Description:'Wood and stone place',
NumberOfPlaces:0
},

{
Premium:false,
Price:132,
Img:'../markup/Img/apartment-02.jpg',
ApartsmentType:'Apartment',
Description:'Canal View Prinsengracht',
NumberOfPlaces:0
},

{
Premium:true,
Price:180,
Img:'../markup/Img/apartment-03.jpg',
ApartsmentType:'Apartment',
Description:'Nice, cozy, warm big bed apartment',
NumberOfPlaces:0
},

{
Premium:false,
Price:80,
Img:'../markup/Img/room.jpg',
ApartsmentType:'Room',
Description:'Wood and stone place',
NumberOfPlaces:0
}];
export default {mainPageCardInfo} ;

root.render(
<React.StrictMode>
<App offers={offers} />
Expand Down
3 changes: 3 additions & 0 deletions src/shared/interfaces.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export type WithChildren = {
children: JSX.Element;
};

0 comments on commit 4693dbd

Please sign in to comment.