From 2fd7680bbce676ad44ffa8615a7fe1a8e2639357 Mon Sep 17 00:00:00 2001 From: mbaharip <62494292+mbahArip@users.noreply.github.com> Date: Thu, 25 May 2023 20:28:53 +0700 Subject: [PATCH] Sort import --- .../{ => (__components)}/compFileLayout.tsx | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) rename src/app/{ => (__components)}/compFileLayout.tsx (85%) diff --git a/src/app/compFileLayout.tsx b/src/app/(__components)/compFileLayout.tsx similarity index 85% rename from src/app/compFileLayout.tsx rename to src/app/(__components)/compFileLayout.tsx index 84049e8..d500ff4 100644 --- a/src/app/compFileLayout.tsx +++ b/src/app/(__components)/compFileLayout.tsx @@ -1,23 +1,29 @@ "use client"; -import { - LayoutContext, - TLayoutContext, -} from "context/layoutContext"; + import { useCallback, useContext, useEffect, useState, } from "react"; -import GridLayout from "./compGridLayout"; -import { FilesResponse } from "types/api/files"; -import fetch from "utils/generalHelper/fetch"; + +import { + LayoutContext, + TLayoutContext, +} from "context/layoutContext"; + import { API_Response } from "types/api"; +import { FilesResponse } from "types/api/files"; + +import apiConfig from "config/api.config"; + +import GridLayout from "./compGridLayout"; import ListLayout from "./compListLayout"; type Props = { data: FilesResponse; }; + function FileLayout({ data }: Props) { const { layout } = useContext(LayoutContext); @@ -39,21 +45,22 @@ function FileLayout({ data }: Props) { const handleLoadMore = useCallback(async () => { setIsNextPageLoading(true); - const { data: newData } = await fetch< - API_Response - >(`/api/files?pageToken=${nextPageToken}`); + const { data: newData } = await fetch( + `${apiConfig.basePath}/api/files?pageToken=${nextPageToken}`, + ).then( + (res) => + res.json() as Promise>, + ); + setClientData((prev) => ({ ...prev, - files: [ - ...prev.files, - ...(newData.data?.files ?? []), - ], + files: [...prev.files, ...(newData?.files ?? [])], folders: [ ...prev.folders, - ...(newData.data?.folders ?? []), + ...(newData?.folders ?? []), ], })); - setNextPageToken(newData.data?.nextPageToken ?? ""); + setNextPageToken(newData?.nextPageToken ?? ""); setIsNextPageLoading(false); }, [nextPageToken]);