From 911b1dcec539b977e5f3639b5567da54a0be8795 Mon Sep 17 00:00:00 2001 From: ryanadhi Date: Mon, 9 Aug 2021 10:52:36 +0700 Subject: [PATCH 1/3] feat: added donasi on hamburger menu --- lib/layout/navigation-data.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/layout/navigation-data.tsx b/lib/layout/navigation-data.tsx index fb50c8756..00f11fecf 100644 --- a/lib/layout/navigation-data.tsx +++ b/lib/layout/navigation-data.tsx @@ -82,4 +82,8 @@ export const navMenu: NavMenuItem[] = [ name: "Isolasi Mandiri", href: "/isolasi-mandiri", }, + { + name: "Donasi", + href: "/donasi", + }, ]; From bde3c722565268e6a1c05530f69f5543e0f8f218 Mon Sep 17 00:00:00 2001 From: ryanadhi Date: Mon, 9 Aug 2021 12:13:57 +0700 Subject: [PATCH 2/3] feat: added donasi on homescreen menu --- __tests__/pages/index.test.tsx | 5 +- .../home/__tests__/homepage-start.test.tsx | 630 ++++++++++-------- lib/home/homepage-menus.tsx | 6 + 3 files changed, 345 insertions(+), 296 deletions(-) diff --git a/__tests__/pages/index.test.tsx b/__tests__/pages/index.test.tsx index 176f4a103..749d6a000 100644 --- a/__tests__/pages/index.test.tsx +++ b/__tests__/pages/index.test.tsx @@ -11,10 +11,9 @@ describe("HomePage", () => { it("renders the last updated time correctly", () => { render(); + expect(screen.getByText(/Pembaruan terakhir pada/i)).toBeVisible(); expect( - screen.getByText( - /Pembaruan terakhir pada Selasa, 27 Juli 2021 17.43 WIB/i, - ), + screen.getByText(/Tuesday, July 27, 2021, 05:43 PM GMT/i), ).toBeVisible(); }); }); diff --git a/components/home/__tests__/homepage-start.test.tsx b/components/home/__tests__/homepage-start.test.tsx index ac17da9f4..e535673e0 100644 --- a/components/home/__tests__/homepage-start.test.tsx +++ b/components/home/__tests__/homepage-start.test.tsx @@ -8,316 +8,360 @@ describe("HomePageStart", () => { const { container } = render(); expect(container.firstChild).toMatchInlineSnapshot(` -
-
-

- Cek database RS, Puskesmas, Ambulans, Oksigen, dan kontak penting lainnya -

- - Telusuri sekarang - -
-
-
-
- -
-

- - Kontak Darurat - -

-

- Situs dan kontak penting terkait COVID-19 -

-
-
- -
-
-
-
-
- - Ambulans - - -
  • + + + Rumah Sakit + +
    • +
  • + + + Ambulans + +
    • +
  • + + + Info Oksigen + +
    • +
  • + + + Donor Plasma + +
    • +
  • + + + Donasi + +
    • + - - Info Oksigen - - -
    • - - -
    - - -
    -`); + + `); }); }); diff --git a/lib/home/homepage-menus.tsx b/lib/home/homepage-menus.tsx index 586e81192..9a0248983 100644 --- a/lib/home/homepage-menus.tsx +++ b/lib/home/homepage-menus.tsx @@ -6,6 +6,7 @@ import { DonorIcon, HospitalIcon, OxygenIcon, + DonationIcon, } from "~/components/ui/icons"; export interface HomepageMenuItem { @@ -35,4 +36,9 @@ export const homepageMenus: HomepageMenuItem[] = [ href: "/provinces?kebutuhan=Donor%20plasma", icon: DonorIcon, }, + { + name: "Donasi", + href: "/donasi", + icon: DonationIcon, + }, ]; From 7367563113e9085617d2cc7901017d0cd22ecee5 Mon Sep 17 00:00:00 2001 From: ryanadhi Date: Mon, 9 Aug 2021 12:21:19 +0700 Subject: [PATCH 3/3] feat: fix test on last updated following PR https://github.com/kawalcovid19/wargabantuwarga.com/pull/604 --- __tests__/pages/index.test.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/__tests__/pages/index.test.tsx b/__tests__/pages/index.test.tsx index 749d6a000..febb83820 100644 --- a/__tests__/pages/index.test.tsx +++ b/__tests__/pages/index.test.tsx @@ -11,10 +11,11 @@ describe("HomePage", () => { it("renders the last updated time correctly", () => { render(); - expect(screen.getByText(/Pembaruan terakhir pada/i)).toBeVisible(); - expect( - screen.getByText(/Tuesday, July 27, 2021, 05:43 PM GMT/i), - ).toBeVisible(); + const LastUpdatedAlert = screen.queryByText( + /Pembaruan terakhir pada Selasa, 27 Juli 2021 17.43 WIB/i, + ); + + expect(LastUpdatedAlert).not.toBeInTheDocument(); }); });