@fernir2/saas-kit-cli 0.1.39 → 0.1.41

package/cli/src/app/f/(not-signed-in)/sign-in/page.tsx

@@ -1,13 +1,13 @@
-import { httpWrapper } from "@server/web/http-wrapper";
-import SignInPage from "@client/pages/sign-in-page/SignInPage";
-
-export const dynamic = "force-dynamic";
-
-const Page = httpWrapper(
-    async () => {
-        return <SignInPage />;
-    },
-    { isAnonymous: true },
-);
-
-export default Page;
+import { httpWrapper } from "@/app/http-wrappers";
+import SignInPage from "@client/pages/sign-in-page/SignInPage";
+
+export const dynamic = "force-dynamic";
+
+const Page = httpWrapper(
+    async () => {
+        return <SignInPage />;
+    },
+    { anonymous: true },
+);
+
+export default Page;

package/cli/src/app/f/(not-signed-in)/sign-up/page.tsx

@@ -1,13 +1,13 @@
-import { httpWrapper } from "@server/web/http-wrapper";
-import SignUpPage from "@client/pages/sign-up-page/SignUpPage";
-
-export const dynamic = "force-dynamic";
-
-const Page = httpWrapper(
-    async ({ searchParams }) => {
-        return <SignUpPage searchParams={searchParams} />;
-    },
-    { isAnonymous: true },
-);
-
-export default Page;
+import { httpWrapper } from "@/app/http-wrappers";
+import SignUpPage from "@client/pages/sign-up-page/SignUpPage";
+
+export const dynamic = "force-dynamic";
+
+const Page = httpWrapper(
+    async ({ searchParams }) => {
+        return <SignUpPage searchParams={searchParams} />;
+    },
+    { anonymous: true },
+);
+
+export default Page;

package/cli/src/app/f/(signed-in)/dashboard/page.tsx

@@ -1,8 +1,8 @@
-import { httpWrapper } from "@server/web/http-wrapper";
-import DashboardPage from "@client/pages/dashboard-page/DashboardPage";
-
-const Page = httpWrapper(async () => {
-    return <DashboardPage />;
-});
-
-export default Page;
+import { httpWrapper } from "@/app/http-wrappers";
+import DashboardPage from "@client/pages/dashboard-page/DashboardPage";
+
+const Page = httpWrapper(async () => {
+    return <DashboardPage />;
+});
+
+export default Page;

package/cli/src/app/f/(signed-in)/dynamiclayout/page.tsx

@@ -1,8 +1,8 @@
-import { httpWrapper } from "@server/web/http-wrapper";
-import DynamicLayoutPage from "@client/pages/dynamic-layout-page/DynamicLayoutPage";
-
-const Page = httpWrapper(async () => {
-    return <DynamicLayoutPage />;
-});
-
-export default Page;
+import { httpWrapper } from "@/app/http-wrappers";
+import DynamicLayoutPage from "@client/pages/dynamic-layout-page/DynamicLayoutPage";
+
+const Page = httpWrapper(async () => {
+    return <DynamicLayoutPage />;
+});
+
+export default Page;

package/cli/src/app/f/(signed-in)/edituser/[id]/page.tsx

@@ -1,8 +1,8 @@
-import { httpWrapper } from "@server/web/http-wrapper";
-import EditUserByIdPage from "@client/pages/edit-user-by-id-page/EditUserByIdPage";
-
-const Page = httpWrapper(async ({ params }) => {
-    return <EditUserByIdPage params={params} />;
-});
-
-export default Page;
+import { httpWrapper } from "@/app/http-wrappers";
+import EditUserByIdPage from "@client/pages/edit-user-by-id-page/EditUserByIdPage";
+
+const Page = httpWrapper(async ({ params }) => {
+    return <EditUserByIdPage params={params} />;
+});
+
+export default Page;

package/cli/src/app/f/(signed-in)/edituser/page.tsx

@@ -1,8 +1,8 @@
-import { httpWrapper } from "@server/web/http-wrapper";
-import EditUserPage from "@client/pages/edit-user-page/EditUserPage";
-
-const Page = httpWrapper(async () => {
-    return <EditUserPage />;
-});
-
-export default Page;
+import { httpWrapper } from "@/app/http-wrappers";
+import EditUserPage from "@client/pages/edit-user-page/EditUserPage";
+
+const Page = httpWrapper(async () => {
+    return <EditUserPage />;
+});
+
+export default Page;

package/cli/src/app/f/(signed-in)/layout.tsx

@@ -1,5 +1,5 @@
-import { SignedInLayout } from "@fd-app-toolbox/server/layout/signed-in-layout/SignedInLayout";
-
-export default async function Layout({ children }: { children: React.ReactNode }) {
-    return <SignedInLayout>{children}</SignedInLayout>;
-}
+import { SignedInLayout } from "@fd-app-toolbox/server/layout/signed-in-layout/SignedInLayout";
+
+export default async function Layout({ children }: { children: React.ReactNode }) {
+    return <SignedInLayout>{children}</SignedInLayout>;
+}

package/cli/src/app/f/(signed-in)/payment-plans/page.tsx

@@ -1,8 +1,8 @@
-import PaymentPlanPage from "@client/pages/payment-plan-page/PaymentPlanPage";
-import { httpWrapper } from "@server/web/http-wrapper";
-
-const Page = httpWrapper(async () => {
-    return <PaymentPlanPage />;
-});
-
-export default Page;
+import PaymentPlanPage from "@client/pages/payment-plan-page/PaymentPlanPage";
+import { httpWrapper } from "@/app/http-wrappers";
+
+const Page = httpWrapper(async () => {
+    return <PaymentPlanPage />;
+});
+
+export default Page;

package/cli/src/app/f/(signed-in)/statusboard/page.tsx

@@ -1,8 +1,8 @@
-import StatusBoardPage from "@client/pages/status-board-page/StatusBoardPage";
-import { httpWrapper } from "@server/web/http-wrapper";
-
-const Page = httpWrapper(async () => {
-    return <StatusBoardPage />;
-});
-
-export default Page;
+import StatusBoardPage from "@client/pages/status-board-page/StatusBoardPage";
+import { httpWrapper } from "@/app/http-wrappers";
+
+const Page = httpWrapper(async () => {
+    return <StatusBoardPage />;
+});
+
+export default Page;

package/cli/src/app/f/(signed-in)/userlist/page.tsx

@@ -1,8 +1,8 @@
-import UserListPage from "@client/pages/user-list-page/UserListPage";
-import { httpWrapper } from "@server/web/http-wrapper";
-
-const Page = httpWrapper(async () => {
-    return <UserListPage />;
-});
-
-export default Page;
+import UserListPage from "@client/pages/user-list-page/UserListPage";
+import { httpWrapper } from "@/app/http-wrappers";
+
+const Page = httpWrapper(async () => {
+    return <UserListPage />;
+});
+
+export default Page;

package/cli/src/app/f/(signed-in)/view/page.tsx

@@ -1,9 +1,27 @@
-import ViewPage from "@client/pages/view-page/ViewPage";
-import { httpWrapper } from "@server/web/http-wrapper";
-
-const Page = httpWrapper(async ({ searchParams }) => {
-    const { id, name, resource } = await searchParams;
-    return <ViewPage id={id} name={name} resource={resource} />;
-});
-
-export default Page;
+import ViewPage from "@client/pages/view-page/ViewPage";
+import { httpWrapper } from "@/app/http-wrappers";
+
+interface ViewPageSearchParams {
+    id?: string;
+    name?: string;
+    resource?: string;
+}
+
+interface PageProps {
+    params: Promise<Record<string, string>>;
+    searchParams: Promise<ViewPageSearchParams>;
+}
+
+const Page = httpWrapper(async ({ searchParams }: PageProps) => {
+    const resolvedSearchParams = await searchParams;
+
+    return (
+        <ViewPage
+            id={resolvedSearchParams.id}
+            name={resolvedSearchParams.name}
+            resource={resolvedSearchParams.resource}
+        />
+    );
+});
+
+export default Page;

package/cli/src/app/f/api-docs/page.tsx

@@ -1,15 +1,15 @@
-import { notFound } from "next/navigation";
-import { httpWrapper } from "@server/web/http-wrapper";
-import ApiDocsPage from "@client/pages/api-docs-page/ApiDocsPage";
-import { isProd } from "@fd-toolbox/lib/environments";
-import "swagger-ui-react/swagger-ui.css";
-
-const Page = httpWrapper(async () => {
-    if (isProd()) {
-        notFound();
-    }
-
-    return <ApiDocsPage />;
-});
-
-export default Page;
+import { fdNotFound } from "@meta/client/framework/index";
+import { httpWrapper } from "@/app/http-wrappers";
+import ApiDocsPage from "@client/pages/api-docs-page/ApiDocsPage";
+import { isProd } from "@fd-toolbox/lib/environments";
+import "swagger-ui-react/swagger-ui.css";
+
+const Page = httpWrapper(async () => {
+    if (isProd()) {
+        fdNotFound();
+    }
+
+    return <ApiDocsPage />;
+});
+
+export default Page;

package/cli/src/app/globals.css

@@ -1 +1 @@
-@import "@fernir2/saas-kit/styles";
+@import "@fernir2/saas-kit/styles";

package/cli/src/app/http-wrappers.ts

@@ -0,0 +1,19 @@
+import { createHttpWrapper } from "@server/web/http-wrapper";
+import {
+    HttpApiWrapperConfig,
+    RequestHandler,
+    createHttpApiWrapper,
+} from "@meta/server/web/http-api-wrapper";
+import { PageProps, HttpWrapperConfig } from "@common/web/page-props";
+import type { ElementNode } from "@fd-toolbox/types/react-types";
+import { initSaasKit } from "@/app/init-saas-kit";
+
+export function httpWrapper(handler: (props: PageProps) => Promise<ElementNode>, config?: HttpWrapperConfig) {
+    initSaasKit();
+    return createHttpWrapper()(handler, config);
+}
+
+export function httpApiWrapper(handler: RequestHandler, config?: HttpApiWrapperConfig) {
+    initSaasKit();
+    return createHttpApiWrapper()(handler, config);
+}

package/cli/src/app/init-saas-kit.ts

@@ -0,0 +1,12 @@
+import { initSaasKitWithConfig, InitSaasKitConfig } from "@meta/server/web/init-saas-kit-config";
+import * as schema from "@schemas/schema";
+import { resourceHandlerDynamicImportMap } from "@schemas/crud-handler-map";
+
+const config: InitSaasKitConfig = {
+    schema,
+    handlerMap: resourceHandlerDynamicImportMap,
+};
+
+export function initSaasKit() {
+    initSaasKitWithConfig(config);
+}

package/cli/src/app/layout.tsx

@@ -1,37 +1,43 @@
-import { HtmlMetadataType } from "@meta/client/framework";
-import { GeistSans } from "geist/font/sans";
-import "@/app/globals.css";
-import { cn } from "@fd-toolbox/lib/utils";
-import Favicon from "src/app/favicon.ico";
-import { Toaster } from "@fd-component-toolbox/toaster/Toaster";
-import { ReactNode } from "react";
-import { Providers } from "@client/components/providers/Providers";
-import { defaultGlobalConfig } from "@meta/providers/global-provider/default-config";
-import { configureDefaultGlobalConfig } from "@client/component-configs/configure-default-config";
-
-export const metadata: HtmlMetadataType = {
-    title: "SaaS Kit",
-    icons: [{ rel: "icon", url: Favicon.src }],
-} as const;
-
-export default async function RootLayout({ children }: { children: ReactNode }) {
-    const sidebarResourceNames: string[] = [];
-    configureDefaultGlobalConfig(sidebarResourceNames);
-
-    return (
-        <html lang="en">
-            <body className={cn(GeistSans.className, "h-screen text-sm")}>
-                <div className="flex h-full flex-col">
-                    <Providers
-                        globalConfig={{
-                            ...defaultGlobalConfig,
-                        }}
-                    >
-                        {children}
-                    </Providers>
-                </div>
-                <Toaster />
-            </body>
-        </html>
-    );
-}
+// Geist must be imported directly in the root layout because next/font
+// requires being used at the App Router entry point and cannot be wrapped.
+// Approved
+// eslint-disable-next-line no-restricted-imports
+import { Geist as createFontGeist } from "next/font/google";
+import { HtmlMetadata } from "@meta/client/framework";
+import "@/app/globals.css";
+import { cn } from "@fd-toolbox/lib/utils";
+import Favicon from "src/app/favicon.ico";
+import { Toaster } from "@fd-component-toolbox/toaster/Toaster";
+import { ReactNode } from "react";
+import { ClientRootLayout } from "@client/components/providers/ClientRootLayout";
+import { themes } from "@fd-app-toolbox/menu/themes";
+import { rootLayoutMetadata } from "@base-repo/app-constants/internal-system-constants";
+import { projectName } from "@base-repo/app-constants/project-paths";
+
+export const metadata: HtmlMetadata = {
+    title: projectName,
+    icons: [{ rel: rootLayoutMetadata.icon, url: Favicon.src }],
+} as const;
+
+/**
+ * Root layout component that wraps the entire application with providers
+ *
+ * @param children - React nodes to render within the layout
+ */
+export default async function RootLayout({ children }: { children: ReactNode }) {
+    return (
+        <html lang="en" className={themes.light} style={{ colorScheme: themes.light }}>
+            <body className={cn(geistFont.className, "h-screen text-sm")}>
+                <div className="flex h-full flex-col">
+                    <ClientRootLayout>{children}</ClientRootLayout>
+                </div>
+                <Toaster />
+            </body>
+        </html>
+    );
+}
+
+const geistFont = createFontGeist({
+    /* string-duplication-disable-next-line */
+    subsets: ["latin"],
+});

package/cli/src/app/page.tsx

@@ -1,9 +1,9 @@
-import { fdRedirect } from "@fd-toolbox/server/framework";
-import { getResourceListUrl } from "@meta/services/meta-navigations";
-import { resourceNames } from "@fd-toolbox/resources/resource-names";
-
-export default function Home() {
-    const afterLoginUrl = getResourceListUrl(resourceNames.contact);
-
-    fdRedirect(afterLoginUrl);
-}
+import { fdRedirect } from "@fd-toolbox/server/framework";
+import { getResourceListUrl } from "@meta/services/meta-navigations";
+import { resourceNames } from "@fd-toolbox/resources/resource-names";
+
+export default function Home() {
+    const afterLoginUrl = getResourceListUrl(resourceNames.contact);
+
+    fdRedirect(afterLoginUrl);
+}

package/cli/src/app/styles/common.css

@@ -1,71 +1,75 @@
-@layer base {
-    * {
-        border-color: var(--color-border);
-    }
-    body {
-        background-color: var(--color-background);
-        color: var(--color-foreground);
-    }
-}
-
-@supports not (-webkit-appearance: none) {
-    * {
-        scrollbar-width: thin;
-        scrollbar-color: hsl(var(--fd-toolbar)) hsl(var(--background));
-    }
-}
-
-@supports (-webkit-appearance: none) {
-    *::-webkit-scrollbar {
-        width: 15px;
-        height: 15px;
-    }
-
-    *::-webkit-scrollbar-track {
-        background: hsl(var(--background));
-    }
-
-    *::-webkit-scrollbar-thumb {
-        width: 9px;
-        height: 9px;
-        background: hsl(var(--fd-toolbar));
-        border-radius: var(--radius);
-        border: 3px solid hsl(var(--background));
-    }
-
-    *::-webkit-scrollbar-thumb:hover {
-        background: hsl(var(--fd-toolbar-hover));
-    }
-
-    *::-webkit-scrollbar-button {
-        display: none;
-    }
-}
-
-.scrollbar-hidden {
-    -ms-overflow-style: none;
-    scrollbar-width: none;
-}
-
-@media (max-width: 426px) {
-    html,
-    body {
-        overflow: auto;
-        -ms-overflow-style: none;
-        scrollbar-width: none;
-    }
-
-    body::-webkit-scrollbar,
-    body *::-webkit-scrollbar {
-        display: none;
-    }
-}
-
-@layer base {
-    input:-webkit-autofill,
-    input:-webkit-autofill:hover,
-    input:-webkit-autofill:focus {
-        -webkit-box-shadow: 0 0 0px 1000px hsl(var(--background)) inset;
-        -webkit-text-fill-color: hsl(var(--foreground));
-    }
-}
+@layer base {
+    * {
+        border-color: var(--color-border);
+    }
+    body {
+        background-color: var(--color-background);
+        color: var(--color-foreground);
+    }
+}
+
+@supports not (-webkit-appearance: none) {
+    * {
+        scrollbar-width: thin;
+        scrollbar-color: hsl(var(--fd-toolbar)) hsl(var(--background));
+    }
+}
+
+@supports (-webkit-appearance: none) {
+    *::-webkit-scrollbar {
+        width: 15px;
+        height: 15px;
+    }
+
+    *::-webkit-scrollbar-track {
+        background: hsl(var(--background));
+    }
+
+    *::-webkit-scrollbar-thumb {
+        width: 9px;
+        height: 9px;
+        background: hsl(var(--fd-toolbar));
+        border-radius: var(--radius);
+        border: 3px solid hsl(var(--background));
+    }
+
+    *::-webkit-scrollbar-thumb:hover {
+        background: hsl(var(--fd-toolbar-hover));
+    }
+
+    *::-webkit-scrollbar-button {
+        display: none;
+    }
+}
+
+.scrollbar-hidden {
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+}
+
+.bg-gradient-accent {
+    background: linear-gradient(135deg, #3b82f6, #8b5cf6);
+}
+
+@media (max-width: 426px) {
+    html,
+    body {
+        overflow: auto;
+        -ms-overflow-style: none;
+        scrollbar-width: none;
+    }
+
+    body::-webkit-scrollbar,
+    body *::-webkit-scrollbar {
+        display: none;
+    }
+}
+
+@layer base {
+    input:-webkit-autofill,
+    input:-webkit-autofill:hover,
+    input:-webkit-autofill:focus {
+        -webkit-box-shadow: 0 0 0px 1000px hsl(var(--background)) inset;
+        -webkit-text-fill-color: hsl(var(--foreground));
+    }
+}