From 1b9de34387c95d0c89189f8b8bded9896d230bd8 Mon Sep 17 00:00:00 2001 From: m5r Date: Sun, 22 May 2022 13:06:43 +0200 Subject: [PATCH] extract keypad loader --- app/features/keypad/loaders/keypad.ts | 31 +++++++++++++++++++++++++++ app/routes/__app/keypad.tsx | 31 ++++----------------------- 2 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 app/features/keypad/loaders/keypad.ts diff --git a/app/features/keypad/loaders/keypad.ts b/app/features/keypad/loaders/keypad.ts new file mode 100644 index 0000000..401b93a --- /dev/null +++ b/app/features/keypad/loaders/keypad.ts @@ -0,0 +1,31 @@ +import type { LoaderFunction } from "@remix-run/node"; +import { json } from "superjson-remix"; +import { Prisma } from "@prisma/client"; + +import { requireLoggedIn } from "~/utils/auth.server"; +import db from "~/utils/db.server"; + +export type KeypadLoaderData = { + hasOngoingSubscription: boolean; + hasPhoneNumber: boolean; + lastRecipientCalled?: string; +}; + +const loader: LoaderFunction = async ({ request }) => { + const { phoneNumber } = await requireLoggedIn(request); + const hasOngoingSubscription = true; // TODO + const hasPhoneNumber = Boolean(phoneNumber); + const lastCall = + phoneNumber && + (await db.phoneCall.findFirst({ + where: { phoneNumberId: phoneNumber.id }, + orderBy: { createdAt: Prisma.SortOrder.desc }, + })); + return json({ + hasOngoingSubscription, + hasPhoneNumber, + lastRecipientCalled: lastCall?.recipient, + }); +}; + +export default loader; diff --git a/app/routes/__app/keypad.tsx b/app/routes/__app/keypad.tsx index 1d53b5a..289b183 100644 --- a/app/routes/__app/keypad.tsx +++ b/app/routes/__app/keypad.tsx @@ -1,11 +1,11 @@ import { Fragment } from "react"; -import type { LoaderFunction, MetaFunction } from "@remix-run/node"; +import type { MetaFunction } from "@remix-run/node"; import { useNavigate } from "@remix-run/react"; -import { json, useLoaderData } from "superjson-remix"; +import { useLoaderData } from "superjson-remix"; import { Transition } from "@headlessui/react"; import { IoBackspace, IoCall } from "react-icons/io5"; -import { Prisma } from "@prisma/client"; +import keypadLoader, { type KeypadLoaderData } from "~/features/keypad/loaders/keypad"; import useKeyPress from "~/features/keypad/hooks/use-key-press"; import useOnBackspacePress from "~/features/keypad/hooks/use-on-backspace-press"; import Keypad from "~/features/keypad/components/keypad"; @@ -13,36 +13,13 @@ import BlurredKeypad from "~/features/keypad/components/blurred-keypad"; import MissingTwilioCredentials from "~/features/core/components/missing-twilio-credentials"; import InactiveSubscription from "~/features/core/components/inactive-subscription"; import { getSeoMeta } from "~/utils/seo"; -import db from "~/utils/db.server"; -import { requireLoggedIn } from "~/utils/auth.server"; import { usePhoneNumber, usePressDigit, useRemoveDigit } from "~/features/keypad/hooks/atoms"; export const meta: MetaFunction = () => ({ ...getSeoMeta({ title: "Keypad" }), }); -type KeypadLoaderData = { - hasOngoingSubscription: boolean; - hasPhoneNumber: boolean; - lastRecipientCalled?: string; -}; - -export const loader: LoaderFunction = async ({ request }) => { - const { phoneNumber } = await requireLoggedIn(request); - const hasOngoingSubscription = true; // TODO - const hasPhoneNumber = Boolean(phoneNumber); - const lastCall = - phoneNumber && - (await db.phoneCall.findFirst({ - where: { phoneNumberId: phoneNumber.id }, - orderBy: { createdAt: Prisma.SortOrder.desc }, - })); - return json({ - hasOngoingSubscription, - hasPhoneNumber, - lastRecipientCalled: lastCall?.recipient, - }); -}; +export const loader = keypadLoader; export default function KeypadPage() { const { hasOngoingSubscription, hasPhoneNumber, lastRecipientCalled } = useLoaderData();