From 9294e1c823b8d53fd868b8b0c81c7e4326363b0f Mon Sep 17 00:00:00 2001
From: gbuomprisco <giancarlopsk@gmail.com>
Date: Fri, 21 Jun 2024 17:58:20 +0800
Subject: [PATCH] Refactor code for readability and order

Made several changes across different files primarily focusing on readability. Arranged CSS classes in a standardized order for easier reading and maintenance. Arranged and formatted import lines, function declarations, and component return statements for legibility. Removed unnecessary React imports in some files.
---
 .../docs/_components/docs-navigation.tsx           |  2 +-
 .../(marketing)/docs/_lib/server/docs.loader.ts    |  2 +-
 .../_components/team-account-layout-sidebar.tsx    |  1 +
 .../services/billing-strategy-provider.service.ts  | 14 +++++++-------
 packages/billing/core/src/types/index.ts           |  2 +-
 .../src/services/stripe-webhook-handler.service.ts |  8 ++------
 .../email-templates/src/components/body-style.tsx  |  2 --
 .../email-templates/src/components/content.tsx     |  3 +--
 .../email-templates/src/components/cta-button.tsx  |  3 +--
 packages/email-templates/src/components/footer.tsx |  3 +--
 packages/email-templates/src/components/header.tsx |  7 +------
 .../email-templates/src/components/heading.tsx     |  3 +--
 .../email-templates/src/components/wrapper.tsx     |  3 +--
 .../auth/src/components/update-password-form.tsx   |  6 +-----
 packages/ui/src/shadcn/form.tsx                    |  8 ++++++--
 15 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/apps/web/app/(marketing)/docs/_components/docs-navigation.tsx b/apps/web/app/(marketing)/docs/_components/docs-navigation.tsx
index 99385ac0b..6fe22b971 100644
--- a/apps/web/app/(marketing)/docs/_components/docs-navigation.tsx
+++ b/apps/web/app/(marketing)/docs/_components/docs-navigation.tsx
@@ -112,7 +112,7 @@ export function DocsNavigation({ pages }: { pages: Cms.ContentItem[] }) {
         style={{
           height: `calc(100vh - 64px)`,
         }}
-        className="sticky top-2 hidden w-80 shrink-0 border-r p-4 lg:flex overflow-y-auto"
+        className="sticky top-2 hidden w-80 shrink-0 overflow-y-auto border-r p-4 lg:flex"
       >
         <Tree pages={pages} level={0} activePath={activePath} />
       </aside>
diff --git a/apps/web/app/(marketing)/docs/_lib/server/docs.loader.ts b/apps/web/app/(marketing)/docs/_lib/server/docs.loader.ts
index 88cec4ced..a0e3f69f2 100644
--- a/apps/web/app/(marketing)/docs/_lib/server/docs.loader.ts
+++ b/apps/web/app/(marketing)/docs/_lib/server/docs.loader.ts
@@ -15,7 +15,7 @@ async function docsLoader(language: string | undefined) {
   const { items: pages } = await cms.getContentItems({
     collection: 'documentation',
     language,
-    limit: 500
+    limit: 500,
   });
 
   return pages;
diff --git a/apps/web/app/home/[account]/_components/team-account-layout-sidebar.tsx b/apps/web/app/home/[account]/_components/team-account-layout-sidebar.tsx
index d431f4fda..b254b4300 100644
--- a/apps/web/app/home/[account]/_components/team-account-layout-sidebar.tsx
+++ b/apps/web/app/home/[account]/_components/team-account-layout-sidebar.tsx
@@ -1,4 +1,5 @@
 import { User } from '@supabase/supabase-js';
+
 import { Sidebar, SidebarContent } from '@kit/ui/sidebar';
 
 import { ProfileAccountDropdownContainer } from '~/components//personal-account-dropdown-container';
diff --git a/packages/billing/core/src/services/billing-strategy-provider.service.ts b/packages/billing/core/src/services/billing-strategy-provider.service.ts
index 1529a174a..792851ca4 100644
--- a/packages/billing/core/src/services/billing-strategy-provider.service.ts
+++ b/packages/billing/core/src/services/billing-strategy-provider.service.ts
@@ -67,11 +67,11 @@ export abstract class BillingStrategyProviderService {
     amount: number;
   }>;
 
-  abstract getSubscription(
-    subscriptionId: string,
-  ): Promise<UpsertSubscriptionParams & {
-    // we can't always guarantee that the target account id will be present
-    // so we need to make it optional and let the consumer handle it
-    target_account_id: string | undefined;
-  }>;
+  abstract getSubscription(subscriptionId: string): Promise<
+    UpsertSubscriptionParams & {
+      // we can't always guarantee that the target account id will be present
+      // so we need to make it optional and let the consumer handle it
+      target_account_id: string | undefined;
+    }
+  >;
 }
diff --git a/packages/billing/core/src/types/index.ts b/packages/billing/core/src/types/index.ts
index f62f12819..91ad00238 100644
--- a/packages/billing/core/src/types/index.ts
+++ b/packages/billing/core/src/types/index.ts
@@ -19,4 +19,4 @@ interface LineItem {
 }
 
 export type UpsertOrderParams =
-  Database['public']['Functions']['upsert_order']['Args'];
\ No newline at end of file
+  Database['public']['Functions']['upsert_order']['Args'];
diff --git a/packages/billing/stripe/src/services/stripe-webhook-handler.service.ts b/packages/billing/stripe/src/services/stripe-webhook-handler.service.ts
index 11c2883b9..86df301f4 100644
--- a/packages/billing/stripe/src/services/stripe-webhook-handler.service.ts
+++ b/packages/billing/stripe/src/services/stripe-webhook-handler.service.ts
@@ -88,9 +88,7 @@ export class StripeWebhookHandlerService
       onSubscriptionDeleted: (subscriptionId: string) => Promise<unknown>;
       onPaymentSucceeded: (sessionId: string) => Promise<unknown>;
       onPaymentFailed: (sessionId: string) => Promise<unknown>;
-      onInvoicePaid: (
-        data: UpsertSubscriptionParams,
-      ) => Promise<unknown>;
+      onInvoicePaid: (data: UpsertSubscriptionParams) => Promise<unknown>;
       onEvent?(event: Stripe.Event): Promise<unknown>;
     },
   ) {
@@ -294,9 +292,7 @@ export class StripeWebhookHandlerService
 
   private async handleInvoicePaid(
     event: Stripe.InvoicePaidEvent,
-    onInvoicePaid: (
-      data: UpsertSubscriptionParams,
-    ) => Promise<unknown>,
+    onInvoicePaid: (data: UpsertSubscriptionParams) => Promise<unknown>,
   ) {
     const stripe = await this.loadStripe();
 
diff --git a/packages/email-templates/src/components/body-style.tsx b/packages/email-templates/src/components/body-style.tsx
index 325cd746a..cdc28633d 100644
--- a/packages/email-templates/src/components/body-style.tsx
+++ b/packages/email-templates/src/components/body-style.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react';
-
 export function BodyStyle() {
   return (
     <style>
diff --git a/packages/email-templates/src/components/content.tsx b/packages/email-templates/src/components/content.tsx
index 3a2e845e5..24c880a05 100644
--- a/packages/email-templates/src/components/content.tsx
+++ b/packages/email-templates/src/components/content.tsx
@@ -1,5 +1,4 @@
 import { Container } from '@react-email/components';
-import * as React from 'react';
 
 export function EmailContent(
   props: React.PropsWithChildren<{
@@ -9,7 +8,7 @@ export function EmailContent(
   return (
     <Container
       className={
-        'rounded-xl my-[8px] px-[24px] py-[12px] mx-auto border border-solid border-[#eeeeee] ' +
+        'mx-auto my-[8px] rounded-xl border border-solid border-[#eeeeee] px-[24px] py-[12px] ' +
           props.className || ''
       }
     >
diff --git a/packages/email-templates/src/components/cta-button.tsx b/packages/email-templates/src/components/cta-button.tsx
index 80c26aab9..706bc29af 100644
--- a/packages/email-templates/src/components/cta-button.tsx
+++ b/packages/email-templates/src/components/cta-button.tsx
@@ -1,5 +1,4 @@
 import { Button } from '@react-email/components';
-import * as React from 'react';
 
 export function CtaButton(
   props: React.PropsWithChildren<{
@@ -8,7 +7,7 @@ export function CtaButton(
 ) {
   return (
     <Button
-      className="w-full bg-[#000000] rounded text-white text-[14px] font-semibold no-underline text-center py-3"
+      className="w-full rounded bg-[#000000] py-3 text-center text-[14px] font-semibold text-white no-underline"
       href={props.href}
     >
       {props.children}
diff --git a/packages/email-templates/src/components/footer.tsx b/packages/email-templates/src/components/footer.tsx
index b8b0581ba..c8f1a7ecd 100644
--- a/packages/email-templates/src/components/footer.tsx
+++ b/packages/email-templates/src/components/footer.tsx
@@ -1,10 +1,9 @@
 import { Container, Text } from '@react-email/components';
-import * as React from 'react';
 
 export function EmailFooter(props: React.PropsWithChildren) {
   return (
     <Container>
-      <Text className="text-[12px] leading-[24px] text-gray-300 px-4">
+      <Text className="px-4 text-[12px] leading-[24px] text-gray-300">
         {props.children}
       </Text>
     </Container>
diff --git a/packages/email-templates/src/components/header.tsx b/packages/email-templates/src/components/header.tsx
index e43b089d8..a45b3059e 100644
--- a/packages/email-templates/src/components/header.tsx
+++ b/packages/email-templates/src/components/header.tsx
@@ -1,10 +1,5 @@
 import { Container } from '@react-email/components';
-import * as React from 'react';
 
 export function EmailHeader(props: React.PropsWithChildren) {
-  return (
-    <Container>
-      {props.children}
-    </Container>
-  );
+  return <Container>{props.children}</Container>;
 }
diff --git a/packages/email-templates/src/components/heading.tsx b/packages/email-templates/src/components/heading.tsx
index 71546cc9b..34cf328a9 100644
--- a/packages/email-templates/src/components/heading.tsx
+++ b/packages/email-templates/src/components/heading.tsx
@@ -1,9 +1,8 @@
-import * as React from 'react';
 import { Heading } from '@react-email/components';
 
 export function EmailHeading(props: React.PropsWithChildren) {
   return (
-    <Heading className="text-black font-sans tracking-tight text-[20px] font-normal p-0 mx-0">
+    <Heading className="mx-0 p-0 font-sans text-[20px] font-normal tracking-tight text-black">
       {props.children}
     </Heading>
   );
diff --git a/packages/email-templates/src/components/wrapper.tsx b/packages/email-templates/src/components/wrapper.tsx
index c051cb7aa..49cfc951b 100644
--- a/packages/email-templates/src/components/wrapper.tsx
+++ b/packages/email-templates/src/components/wrapper.tsx
@@ -1,5 +1,4 @@
 import { Container } from '@react-email/components';
-import * as React from 'react';
 
 export function EmailWrapper(
   props: React.PropsWithChildren<{
@@ -21,7 +20,7 @@ export function EmailWrapper(
           backgroundColor: '#fff',
           margin: 'auto',
         }}
-        className={'my-[36px] mx-auto px-4 ' + props.className || ''}
+        className={'mx-auto my-[36px] px-4 ' + props.className || ''}
       >
         {props.children}
       </Container>
diff --git a/packages/features/auth/src/components/update-password-form.tsx b/packages/features/auth/src/components/update-password-form.tsx
index fb1091c88..73f7843c6 100644
--- a/packages/features/auth/src/components/update-password-form.tsx
+++ b/packages/features/auth/src/components/update-password-form.tsx
@@ -3,11 +3,7 @@
 import Link from 'next/link';
 
 import { zodResolver } from '@hookform/resolvers/zod';
-import {
-  CheckIcon,
-  ExclamationTriangleIcon,
-} from '@radix-ui/react-icons';
-
+import { CheckIcon, ExclamationTriangleIcon } from '@radix-ui/react-icons';
 import { ArrowRightIcon } from 'lucide-react';
 import { useForm } from 'react-hook-form';
 import type { z } from 'zod';
diff --git a/packages/ui/src/shadcn/form.tsx b/packages/ui/src/shadcn/form.tsx
index 298da78a2..9e74f1c7c 100644
--- a/packages/ui/src/shadcn/form.tsx
+++ b/packages/ui/src/shadcn/form.tsx
@@ -7,9 +7,9 @@ import { Slot } from '@radix-ui/react-slot';
 import type { ControllerProps, FieldPath, FieldValues } from 'react-hook-form';
 import { Controller, FormProvider, useFormContext } from 'react-hook-form';
 
+import { Trans } from '../makerkit/trans';
 import { cn } from '../utils';
 import { Label } from './label';
-import {Trans} from "../makerkit/trans";
 
 const Form = FormProvider;
 
@@ -157,7 +157,11 @@ const FormMessage = React.forwardRef<
       className={cn('text-[0.8rem] font-medium text-destructive', className)}
       {...props}
     >
-      {typeof body === 'string' ? <Trans i18nKey={body} defaults={body} /> : body}
+      {typeof body === 'string' ? (
+        <Trans i18nKey={body} defaults={body} />
+      ) : (
+        body
+      )}
     </p>
   );
 });