diff --git a/package-lock.json b/package-lock.json index 13cd997..ff6b3fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -42,7 +42,7 @@ "eslint-plugin-react-refresh": "0.4.3", "faker": "5.5.3", "jsdom": "22.1.0", - "typescript": "^5.6.3", + "typescript": "5.6.3", "vite": "4.4.11", "vitest": "0.34.6" } diff --git a/src/Pages/favorites-page.tsx b/src/Pages/favorites-page.tsx index efab44e..f8a3e67 100644 --- a/src/Pages/favorites-page.tsx +++ b/src/Pages/favorites-page.tsx @@ -11,30 +11,32 @@ export function FavoritesPage({ offers, }: FavoritesPageProps): React.JSX.Element { return ( - -
- - 6 cities - favorites - -
-
-

Saved listing

-
    - {Map.groupBy(offers, (o) => o.city.name) - .entries() - .map(([cityName, offersInCity]) => ( - - )) - .toArray()} - ; -
-
-
-
-
+
+ +
+ + 6 cities - favorites + +
+
+

Saved listing

+
    + {Map.groupBy(offers, (o) => o.city.name) + .entries() + .map(([cityName, offersInCity]) => ( + + )) + .toArray()} + ; +
+
+
+
+
+
); } diff --git a/src/Pages/main-page.tsx b/src/Pages/main-page.tsx index d1397c1..d744642 100644 --- a/src/Pages/main-page.tsx +++ b/src/Pages/main-page.tsx @@ -13,108 +13,110 @@ interface MainPageProps { export function MainPage({ offers }: MainPageProps): React.JSX.Element { const [activeOffer, setActiveOffer] = useState>(null); return ( - -
- 6 cities -

Cities

-
-
- -
-
-
-
-
-

Places

- - {offers.length} places to stay in Amsterdam - -
- Sort by - - Popular - - - - -
    -
  • - Popular -
  • -
  • - Price: low to high -
  • -
  • - Price: high to low -
  • -
  • - Top rated first -
  • -
-
- ) => - setActiveOffer(offer) - } - isOnMainPage - /> +
+ +
+ 6 cities +

Cities

+
+
+
-
- ({ - location: x.location, - id: x.id, - }))} - selectedPoint={ - activeOffer - ? { - location: activeOffer?.location, - id: activeOffer?.id, - } - : undefined - } - isOnMainPage - /> +
+
+
+
+

Places

+ + {offers.length} places to stay in Amsterdam + +
+ Sort by + + Popular + + + + +
    +
  • + Popular +
  • +
  • + Price: low to high +
  • +
  • + Price: high to low +
  • +
  • + Top rated first +
  • +
+
+ ) => + setActiveOffer(offer) + } + isOnMainPage + /> +
+
+ ({ + location: x.location, + id: x.id, + }))} + selectedPoint={ + activeOffer + ? { + location: activeOffer?.location, + id: activeOffer?.id, + } + : undefined + } + isOnMainPage + /> +
-
-
-
+
+
+ ); } diff --git a/src/Pages/offer-page.tsx b/src/Pages/offer-page.tsx index 2974dca..037a747 100644 --- a/src/Pages/offer-page.tsx +++ b/src/Pages/offer-page.tsx @@ -13,170 +13,180 @@ export function OfferPage(): React.JSX.Element { const [activeOffer, setActiveOffer] = useState>(null); const offers = offerMocks.slice(0, 3); return ( - -
- 6 cities - offer -
-
-
-
- Photo studio -
-
- Photo studio -
-
- Photo studio -
-
- Photo studio -
-
- Photo studio -
-
- Photo studio +
+ +
+ 6 cities - offer +
+
+
+
+ Photo studio +
+
+ Photo studio +
+
+ Photo studio +
+
+ Photo studio +
+
+ Photo studio +
+
+ Photo studio +
-
-
-
-
- Premium -
-
-

- Beautiful & luxurious studio at great location -

- -
-
-
- - Rating +
+
+
+ Premium
- 4.8 -
-
    -
  • - Apartment -
  • -
  • - 3 Bedrooms -
  • -
  • - Max 4 adults -
  • -
-
- €120 -  night -
-
-

What's inside

-
    -
  • Wi-Fi
  • -
  • Washing machine
  • -
  • Towels
  • -
  • Heating
  • -
  • Coffee machine
  • -
  • Baby seat
  • -
  • Kitchen
  • -
  • Dishwasher
  • -
  • Cabel TV
  • -
  • Fridge
  • -
-
-
-

Meet the host

-
-
- Host avatar +
+

+ Beautiful & luxurious studio at great location +

+ +
+
+
+ + Rating
- Angelina - Pro + 4.8 +
+
    +
  • + Apartment +
  • +
  • + 3 Bedrooms +
  • +
  • + Max 4 adults +
  • +
+
+ €120 +  night
-
-

- A quiet cozy and picturesque that hides behind a a river by - the unique lightness of Amsterdam. The building is green and - from 18th century. -

-

- An independent House, strategically located between Rembrand - Square and National Opera, but where the bustle of the city - comes to rest in this alley flowery and colorful. -

+
+

What's inside

+
    +
  • Wi-Fi
  • +
  • Washing machine
  • +
  • Towels
  • +
  • Heating
  • +
  • Coffee machine
  • +
  • Baby seat
  • +
  • Kitchen
  • +
  • Dishwasher
  • +
  • Cabel TV
  • +
  • Fridge
  • +
+
+

Meet the host

+
+
+ Host avatar +
+ Angelina + Pro +
+
+

+ A quiet cozy and picturesque that hides behind a a river + by the unique lightness of Amsterdam. The building is + green and from 18th century. +

+

+ An independent House, strategically located between + Rembrand Square and National Opera, but where the bustle + of the city comes to rest in this alley flowery and + colorful. +

+
+
+
- -
-
- ({ - location: x.location, - id: x.id, - }))} - selectedPoint={ - activeOffer - ? { - location: activeOffer?.location, - id: activeOffer?.id, - } - : undefined - } - /> -
-
-
-

- Other places in the neighbourhood -

-
-
+ ({ + location: x.location, + id: x.id, + }))} + selectedPoint={ + activeOffer + ? { + location: activeOffer?.location, + id: activeOffer?.id, + } + : undefined + } + />
-
-
-
+
+
+

+ Other places in the neighbourhood +

+
+ +
+
+
+ + + ); } diff --git a/src/components/layout.tsx b/src/components/layout.tsx index 21bdb6d..5c492ea 100644 --- a/src/components/layout.tsx +++ b/src/components/layout.tsx @@ -11,7 +11,7 @@ export function Layout({ showFooter, }: LayoutProps): React.JSX.Element { return ( -
+ <>
@@ -64,6 +64,6 @@ export function Layout({ )} -
+ ); }