create-m5kdev 0.25.3 → 0.26.2

package/templates/minimal-app/apps/webapp/src/Router.tsx.tpl

@@ -1,18 +1,16 @@
 import { syncI18nLocale } from "@m5kdev/frontend/modules/app/utils/locale";
-import { useSession } from "@m5kdev/frontend/modules/auth/hooks/useSession";
 import { AuthAdminRouter } from "@m5kdev/web-ui/modules/auth/components/AuthAdminRouter";
+import { AuthOrganizationAcceptInvitationRoute } from "@m5kdev/web-ui/modules/auth/components/AuthOrganizationAcceptInvitationRoute";
 import { AuthOrganizationRouter } from "@m5kdev/web-ui/modules/auth/components/AuthOrganizationRouter";
 import { AuthPublicRouter } from "@m5kdev/web-ui/modules/auth/components/AuthPublicRouter";
 import { AuthUserRouter } from "@m5kdev/web-ui/modules/auth/components/AuthUserRouter";
-import { BillingBetaPage } from "@m5kdev/web-ui/modules/billing/components/BillingBetaPage";
+import { AuthUtilityProtectedRoutes as ProtectedRoutes } from "@m5kdev/web-ui/modules/auth/components/AuthUtilityProtectedRoutes";
 import { APP_NAME } from "{{PACKAGE_SCOPE}}/shared/modules/app/app.constants";
-import type { ReactNode } from "react";
 import { useTranslation } from "react-i18next";
-import { Navigate, Outlet, Route, Routes } from "react-router";
+import { Route, Routes } from "react-router";
 import { z } from "zod";
 import { PostsRoute } from "@/modules/posts/PostsRoute";
 import { Layout } from "./Layout";
-import { APP_ROUTES } from "./navigation/navigation.config";
 
 const preferenceSchema = z.object({
   compactMode: z.boolean().optional(),
@@ -33,20 +31,8 @@ const preferenceControls = {
   },
 } as const;
 
-const toRelativePath = (path: string): string => path.replace(/^\//, "");
-
-function ProtectedRoutes({ children }: { children?: ReactNode }) {
-  const { data: session } = useSession();
-
-  if (!session) {
-    return <Navigate to="/login" replace />;
-  }
-
-  return children ?? <Outlet />;
-}
-
 function AuthHeader() {
-  const { t } = useTranslation("blog{{PACKAGE_SCOPE}}");
+  const { t } = useTranslation("{{APP_SLUG}}");
 
   return (
     <div className="text-center">
@@ -72,28 +58,35 @@ export function Router() {
         onLocaleChange: syncI18nLocale,
       })}
 
-      <Route element={<ProtectedRoutes />}>
-        <Route path={APP_ROUTES.home} element={<Layout />}>
-          <Route index element={<Navigate to={APP_ROUTES.posts} replace />} />
-          <Route path={toRelativePath(APP_ROUTES.posts)} element={<PostsRoute />} />
-          <Route
-            path={toRelativePath(APP_ROUTES.billing)}
-            element={<BillingBetaPage appName={APP_NAME} />}
-          />
-          {AuthOrganizationRouter({
-            schema: preferenceSchema,
-            controls: preferenceControls,
-          })}
-          {AuthUserRouter({
-            schema: preferenceSchema,
-            controls: preferenceControls,
-            onLocaleChange: syncI18nLocale,
-          })}
-          {AuthAdminRouter({
-            enableWaitlist: true,
-            enableAccountClaimActions: true,
-          })}
-        </Route>
+      {/* public: a logged-out invitee must reach this route so it can send
+          them to signup — inside ProtectedRoutes they'd bounce to /login */}
+      <Route
+        path="/organization/accept-invitation"
+        element={<AuthOrganizationAcceptInvitationRoute />}
+      />
+
+      <Route
+        element={
+          <ProtectedRoutes>
+            <Layout />
+          </ProtectedRoutes>
+        }
+      >
+        <Route index element={<PostsRoute />} />
+
+        {AuthUserRouter({
+          schema: preferenceSchema,
+          controls: preferenceControls,
+          onLocaleChange: syncI18nLocale,
+        })}
+        {AuthOrganizationRouter({
+          schema: preferenceSchema,
+          controls: preferenceControls,
+        })}
+        {AuthAdminRouter({
+          enableWaitlist: true,
+          enableAccountClaimActions: true,
+        })}
       </Route>
     </Routes>
   );

package/templates/minimal-app/apps/webapp/src/index.css.tpl

@@ -1,75 +1,15 @@
-/* biome-ignore-all lint/suspicious/noUnknownAtRules: Tailwind v4 */
-
-@import url("https://fonts.googleapis.com/css2?family=Cormorant+Garamond:wght@500;600;700&family=Manrope:wght@400;500;600;700;800&display=swap");
-@import "tailwindcss";
-@import "tw-animate-css";
-@import "@heroui/styles";
-
-@source "./src/**/*.{ts,tsx}";
-@source "../../node_modules/@heroui/react/dist/**/*.{js,mjs}";
-@source "../../node_modules/@heroui/styles/dist/**/*.{js,mjs}";
-@source "../../node_modules/@m5kdev/web-ui/dist/src/**/*.{js,ts,jsx,tsx}";
-
-@custom-variant dark (&:is(.dark *));
-
-:root {
-  --canvas: #f4ede2;
-  --ink: #171314;
-  --muted-ink: #6f635c;
-  --panel: #fffaf1;
-  --panel-strong: #f8efdf;
-  --line: rgba(124, 93, 55, 0.18);
-  --halo: rgba(231, 182, 100, 0.28);
-}
-
-.dark {
-  --canvas: #12100f;
-  --ink: #f7f1e8;
-  --muted-ink: #b9aba0;
-  --panel: #1d1917;
-  --panel-strong: #26211f;
-  --line: rgba(255, 240, 219, 0.12);
-  --halo: rgba(77, 162, 143, 0.22);
-}
-
-@theme inline {
-  --color-canvas: var(--canvas);
-  --color-ink: var(--ink);
-  --color-muted-ink: var(--muted-ink);
-  --color-panel: var(--panel);
-  --color-panel-strong: var(--panel-strong);
-  --color-line: var(--line);
-  --color-halo: var(--halo);
-}
-
-@layer base {
-  * {
-    @apply border-line;
-  }
-
-  html,
-  body,
-  #root {
-    min-height: 100%;
-  }
-
-  body {
-    @apply bg-canvas text-ink;
-    background-image:
-      radial-gradient(circle at top left, rgba(246, 189, 96, 0.16), transparent 28%),
-      radial-gradient(circle at 80% 10%, rgba(31, 79, 70, 0.14), transparent 22%),
-      linear-gradient(180deg, rgba(255, 250, 241, 0.36), rgba(244, 237, 226, 0.1));
-    font-family: "Manrope", "Helvetica Neue", Arial, sans-serif;
-  }
-
-  button,
-  input,
-  textarea,
-  select {
-    font: inherit;
-  }
-}
-
-.font-editorial {
-  font-family: "Cormorant Garamond", Georgia, serif;
-}
+/* biome-ignore-all lint/suspicious/noUnknownAtRules: Tailwind v4 */
+
+@import "tailwindcss";
+@import "@heroui/styles";
+@import "tw-animate-css";
+
+@source "./node_modules/@m5kdev/web-ui/dist/src/**/*.{mjs}";
+@source "../node_modules/@m5kdev/web-ui/dist/src/**/*.{mjs}";
+@source "../../node_modules/@m5kdev/web-ui/dist/src/**/*.{mjs}";
+@source "../../../node_modules/@m5kdev/web-ui/dist/src/**/*.{mjs}";
+@source "../../../../node_modules/@m5kdev/web-ui/dist/src/**/*.{mjs}";
+
+:root {
+  --accent: oklch(0.6204 0.195 253.83);
+}

package/templates/minimal-app/apps/webapp/src/main.tsx.tpl

@@ -1,26 +1,26 @@
-import type { PostHogConfig } from "posthog-js";
-import { PostHogProvider } from "posthog-js/react";
-import { StrictMode } from "react";
-import { createRoot } from "react-dom/client";
-import { App } from "./App";
-import "./index.css";
-import "./utils/i18n";
-
-const options = {
-  api_host: import.meta.env.VITE_PUBLIC_POSTHOG_HOST,
-  defaults: "2025-05-24",
-} satisfies Partial<PostHogConfig>;
-
-const rootElement = document.getElementById("root");
-
-if (!rootElement) {
-  throw new Error("Root element #root not found.");
-}
-
-createRoot(rootElement).render(
-  <StrictMode>
-    <PostHogProvider apiKey={import.meta.env.VITE_PUBLIC_POSTHOG_KEY ?? "demo"} options={options}>
-      <App />
-    </PostHogProvider>
-  </StrictMode>
-);
+import type { PostHogConfig } from "posthog-js";
+import { PostHogProvider } from "posthog-js/react";
+import { StrictMode } from "react";
+import { createRoot } from "react-dom/client";
+import { App } from "./App";
+import "./index.css";
+import "./utils/i18n";
+
+const options = {
+  api_host: import.meta.env.VITE_PUBLIC_POSTHOG_HOST,
+  defaults: "2025-05-24",
+} satisfies Partial<PostHogConfig>;
+
+const rootElement = document.getElementById("root");
+
+if (!rootElement) {
+  throw new Error("Root element #root not found.");
+}
+
+createRoot(rootElement).render(
+  <StrictMode>
+    <PostHogProvider apiKey={import.meta.env.VITE_PUBLIC_POSTHOG_KEY ?? "demo"} options={options}>
+      <App />
+    </PostHogProvider>
+  </StrictMode>
+);