From a4f6b00a1cd81456ec0d145752e6ed7f9df603cd Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Sun, 28 May 2023 09:56:16 +0100 Subject: [PATCH] Adding in dynamic api routing --- src/app/addresses/api.tsx | 22 ----- src/app/addresses/page.tsx | 91 ------------------- src/app/api/addresses/route.ts | 19 ++++ src/app/components/search/SubmitButton.tsx | 6 +- src/app/layout.tsx | 4 + src/app/portfolio/[slug]/page.tsx | 4 - src/app/search/page.tsx | 19 +++- src/middleware.ts | 9 +- src/{app/addresses/types.tsx => types/epc.ts} | 0 9 files changed, 51 insertions(+), 123 deletions(-) delete mode 100644 src/app/addresses/api.tsx delete mode 100644 src/app/addresses/page.tsx create mode 100644 src/app/api/addresses/route.ts rename src/{app/addresses/types.tsx => types/epc.ts} (100%) diff --git a/src/app/addresses/api.tsx b/src/app/addresses/api.tsx deleted file mode 100644 index e25df57..0000000 --- a/src/app/addresses/api.tsx +++ /dev/null @@ -1,22 +0,0 @@ -"use server"; - -import type { SearchData } from "./types"; - -export async function fetchAddresses(postcode: string) { - let url: string; - url = `https://epc.opendatacommunities.org/api/v1/domestic/search?postcode=${postcode}&size=1000`; - - const headers = new Headers({ - Accept: "application/json", - Authorization: `Basic ${process.env.EPC_AUTH_TOKEN ?? ""}`, - }); - - const request = await fetch(url, { - headers: headers, - next: { revalidate: 60 }, - }); - // Explicitly assert typing of the response - const data = (await request.json()) as SearchData; - - return data; -} diff --git a/src/app/addresses/page.tsx b/src/app/addresses/page.tsx deleted file mode 100644 index 571fcb2..0000000 --- a/src/app/addresses/page.tsx +++ /dev/null @@ -1,91 +0,0 @@ -"use client"; - -import { ReactElement } from "react"; -import { useRouter, useSearchParams } from "next/navigation"; -import type { SearchData, SearchResult } from "./types"; -import SubmitButton from "../components/search/SubmitButton"; -import { fetchAddresses } from "./api"; - -interface ToggleAddressButtonProps { - rowKey: string; - setButtonDisabled: (value: boolean) => void; - setAddress: (value: string) => void; - setCurrentlyToggled: (value: string) => void; - toggleClassName: string; - address: string; -} - -const defaultToggleClass = - "mb-1 block max-w-sm rounded-lg border border-gray-200 bg-white p-6 shadow hover:bg-gray-100 dark:border-gray-700 dark:bg-gray-800 dark:hover:bg-gray-700"; - -const toggledButtonClass = - "text-white mb-1 block max-w-sm rounded-lg border border-gray-200 bg-purple-500 p-6 shadow hover:bg-purple-500 dark:border-gray-700 dark:bg-gray-800 dark:hover:bg-gray-700"; - -const ToggleAddressButton = ({ - rowKey, - setButtonDisabled, - setAddress, - setCurrentlyToggled, - toggleClassName, - address, -}: ToggleAddressButtonProps) => { - const handleOnClick = () => { - setCurrentlyToggled(rowKey); - setAddress(address); - setButtonDisabled(false); - }; - - return ( -
  • - - {address} - -
    • - ); -}; - -export default async function Addresses() { - const searchParams = useSearchParams(); - // console.log("HELLo"); - // console.log(searchParams); - - // const postcode = searchParams.get("postcode") ?? ""; - - // const addresses = await fetchAddresses(postcode); - - // function redirectToEpc() { - // const res = data.rows.find( - // (row: SearchResult) => row["lmk-key"] === currentlyToggled - // ); - - // // router - // // .push({ - // // pathname: "/epc", - // // query: { - // // address: address, - // // res: encodeURIComponent(JSON.stringify(res)), - // // }, - // // }) - // // .catch((error) => console.log(error)); - // } - - function buttonDisabled() { - return true; - } - function redirectToEpc() { - return; - } - - return ( - <> -
    -

    Select your address

    - - {/* */} -
    - - ); -} diff --git a/src/app/api/addresses/route.ts b/src/app/api/addresses/route.ts new file mode 100644 index 0000000..a0864d7 --- /dev/null +++ b/src/app/api/addresses/route.ts @@ -0,0 +1,19 @@ +export async function getEPCData(postcode: string) { + const url = `https://epc.opendatacommunities.org/api/v1/domestic/search?postcode=${postcode}&size=1000`; + + const headers = { + Accept: "application/json", + Authorization: `Basic ${process.env.EPC_AUTH_TOKEN ?? ""}`, + }; + + try { + const response = await fetch(url, { headers }); + if (!response.ok) { + throw new Error(`HTTP error! status: ${response.status}`); + } + return await response.json(); + } catch (error) { + console.error("Failed to fetch EPC data:", error); + throw error; + } +} diff --git a/src/app/components/search/SubmitButton.tsx b/src/app/components/search/SubmitButton.tsx index a64541c..e2e0428 100644 --- a/src/app/components/search/SubmitButton.tsx +++ b/src/app/components/search/SubmitButton.tsx @@ -1,14 +1,14 @@ interface SubmitButtonProps { buttonDisabled: boolean; - redirectFunc: () => void; + onClickFunc: () => void; } -const SubmitButton = ({ buttonDisabled, redirectFunc }: SubmitButtonProps) => { +const SubmitButton = ({ buttonDisabled, onClickFunc }: SubmitButtonProps) => { return (