feat: initial routing (#15)

mfaux · Oct 9, 2024 · c6bfdf6 · c6bfdf6
1 parent ebd7f0b
commit c6bfdf6
Show file tree

Hide file tree

Showing 29 changed files with 431 additions and 93 deletions.
diff --git a/apps/web/app/fonts/GeistMonoVF.woff → apps/web/app/_fonts/GeistMonoVF.woff b/apps/web/app/fonts/GeistMonoVF.woff → apps/web/app/_fonts/GeistMonoVF.woff
diff --git a/apps/web/app/fonts/GeistVF.woff → apps/web/app/_fonts/GeistVF.woff b/apps/web/app/fonts/GeistVF.woff → apps/web/app/_fonts/GeistVF.woff
diff --git a/apps/web/app/inbox/page.tsx b/apps/web/app/inbox/page.tsx
@@ -0,0 +1,3 @@
+export default function Inbox() {
+  return <div>Inbox</div>;
+}
diff --git a/apps/web/app/layout.tsx b/apps/web/app/layout.tsx
@@ -1,31 +1,37 @@
-import type { Metadata } from "next";
+"use client";
+
+import { useRouter } from "next/navigation";
 import localFont from "next/font/local";
 import "./globals.css";
 import "@repo/ui/styles.css";
+import { Shell } from "@repo/ui/shell/shell";
+import { ActionBar } from "@repo/ui/shell/action-bar";
+import { HeaderBar } from "@repo/ui/shell/header-bar";
+import { Main } from "@repo/ui/shell/main";
 
 const geistSans = localFont({
-  src: "./fonts/GeistVF.woff",
+  src: "./_fonts/GeistVF.woff",
   variable: "--font-geist-sans",
 });
 const geistMono = localFont({
-  src: "./fonts/GeistMonoVF.woff",
+  src: "./_fonts/GeistMonoVF.woff",
   variable: "--font-geist-mono",
 });
 
-export const metadata: Metadata = {
-  title: "Create Next App",
-  description: "Generated by create next app",
-};
-
 export default function RootLayout({
   children,
 }: Readonly<{
   children: React.ReactNode;
 }>) {
+  const router = useRouter();
   return (
     <html lang="en">
       <body className={`${geistSans.variable} ${geistMono.variable}`}>
-        {children}
+        <Shell>
+          <HeaderBar>Header</HeaderBar>
+          <ActionBar onNavigate={(path) => router.push(path)}></ActionBar>
+          <Main>{children}</Main>
+        </Shell>
       </body>
     </html>
   );

diff --git a/apps/web/app/page.tsx b/apps/web/app/page.tsx
@@ -1,13 +1,3 @@
-import { ActionBar } from "@repo/ui/shell/action-bar";
-import { HeaderBar } from "@repo/ui/shell/header-bar";
-import { Main } from "@repo/ui/shell/main";
-
 export default function Home() {
-  return (
-    <div>
-      <ActionBar></ActionBar>
-      <HeaderBar></HeaderBar>
-      <Main>Swolo</Main>
-    </div>
-  );
+  return <div>Home</div>;
 }
diff --git a/apps/web/app/pages/page.tsx b/apps/web/app/pages/page.tsx
@@ -0,0 +1,3 @@
+export default function Pages() {
+  return <div>Pages</div>;
+}
diff --git a/apps/web/app/projects/page.tsx b/apps/web/app/projects/page.tsx
@@ -0,0 +1,3 @@
+export default function Projects() {
+  return <div>Projects</div>;
+}
diff --git a/apps/web/app/settings/page.tsx b/apps/web/app/settings/page.tsx
@@ -0,0 +1,3 @@
+export default function Settings() {
+  return <div>Settings</div>;
+}
diff --git a/apps/web/app/tasks/page.tsx b/apps/web/app/tasks/page.tsx
@@ -0,0 +1,3 @@
+export default function Tasks() {
+  return <div>Tasks</div>;
+}
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -9,6 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
+    "@repo/core": "workspace:*",
     "@repo/ui": "workspace:*",
     "clsx": "^2.1.1",
     "next": "14.2.6",

diff --git a/apps/web/tailwind.config.ts b/apps/web/tailwind.config.ts
@@ -4,7 +4,7 @@ import type { Config } from "tailwindcss";
 import sharedConfig from "@repo/tailwind-config";
 
 const config: Pick<Config, "content" | "presets"> = {
-  content: ["./app/**/*.tsx", "../../packages/ui/**/*{.js,.ts,.jsx,.tsx}"],
+  content: ["./app/**/*.tsx", "../../packages/ui/src/**/*{.js,.ts,.jsx,.tsx}"],
   presets: [sharedConfig],
 };
 

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "@repo/core",
+  "version": "0.0.0",
+  "private": true,
+  "exports": {
+    "./routes": {
+      "types": "./src/routes.ts",
+      "default": "./dist/routes.js"
+    }
+  },
+  "scripts": {
+    "dev": "tsc --watch",
+    "build": "tsc",
+    "lint": "eslint . --max-warnings 0",
+    "type-check": "tsc --noEmit"
+  },
+  "devDependencies": {
+    "@repo/eslint-config": "workspace:*",
+    "@repo/typescript-config": "workspace:*",
+    "@types/eslint": "^8.56.5",
+    "@types/node": "^20.11.24",
+    "eslint": "^8.57.0",
+    "typescript": "^5.6.2"
+  },
+  "dependencies": {
+    "lucide-react": "^0.451.0"
+  }
+}
diff --git a/packages/core/src/routes.ts b/packages/core/src/routes.ts
@@ -0,0 +1,8 @@
+export type Route =
+  | "/"
+  | "/inbox"
+  | "/projects"
+  | "/project:id"
+  | "/tasks"
+  | "/pages"
+  | "/settings";
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "@repo/typescript-config/base.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "src"
+  },
+  "include": ["src"],
+  "exclude": ["node_modules", "dist"]
+}
diff --git a/packages/tailwind-config/package.json b/packages/tailwind-config/package.json
@@ -7,6 +7,7 @@
   },
   "devDependencies": {
     "@repo/typescript-config": "workspace:*",
+    "@types/node": "^22.7.5",
     "tailwindcss": "^3.4.1"
   }
 }
diff --git a/packages/tailwind-config/tailwind.config.ts b/packages/tailwind-config/tailwind.config.ts
@@ -21,7 +21,6 @@ const config: Omit<Config, "content"> = {
         },
       },
     },
-    plugins: [],
   },
 };
 

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -4,12 +4,12 @@
   "private": true,
   "exports": {
     "./styles.css": "./dist/index.css",
+    "./shell/shell": "./src/shell/shell.tsx",
     "./shell/action-bar": "./src/shell/action-bar.tsx",
     "./shell/header-bar": "./src/shell/header-bar.tsx",
     "./shell/main": "./src/shell/main.tsx",
     "./button": "./src/button.tsx",
-    "./card": "./src/card.tsx",
-    "./code": "./src/code.tsx"
+    "./lib/utils": "./src/lib/utils.ts"
   },
   "scripts": {
     "build": "tailwindcss -i ./src/styles.css -o ./dist/index.css",
@@ -35,7 +35,11 @@
     "typescript-plugin-css-modules": "^5.1.0"
   },
   "dependencies": {
+    "@radix-ui/react-slot": "^1.1.0",
+    "@repo/core": "workspace:*",
+    "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
+    "lucide-react": "^0.451.0",
     "react": "^18.2.0",
     "tailwind-merge": "^2.5.3"
   }

diff --git a/packages/ui/src/button.tsx b/packages/ui/src/button.tsx
@@ -1,20 +1,60 @@
 "use client";
 
-import type { ReactNode } from "react";
+// https://github.com/shadcn-ui/ui/blob/main/apps/www/registry/default/ui/button.tsx
 
-interface ButtonProps {
-  children: ReactNode;
-  className?: string;
-  appName: string;
+import * as React from "react";
+import { Slot } from "@radix-ui/react-slot";
+import { cva, type VariantProps } from "class-variance-authority";
+
+import { cn } from "@repo/ui/lib/utils";
+
+const buttonVariants = cva(
+  "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
+  {
+    variants: {
+      variant: {
+        default: "bg-primary text-primary-foreground hover:bg-primary/90",
+        destructive:
+          "bg-destructive text-destructive-foreground hover:bg-destructive/90",
+        outline:
+          "border border-input bg-background hover:bg-accent hover:text-accent-foreground",
+        secondary:
+          "bg-secondary text-secondary-foreground hover:bg-secondary/80",
+        ghost: "hover:bg-accent hover:text-accent-foreground",
+        link: "text-primary underline-offset-4 hover:underline",
+      },
+      size: {
+        default: "h-10 px-4 py-2",
+        sm: "h-9 rounded-md px-3",
+        lg: "h-11 rounded-md px-8",
+        icon: "h-10 w-10",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+      size: "default",
+    },
+  }
+);
+
+export interface ButtonProps
+  extends React.ButtonHTMLAttributes<HTMLButtonElement>,
+    VariantProps<typeof buttonVariants> {
+  asChild?: boolean;
 }
 
-export const Button = ({ children, className, appName }: ButtonProps) => {
-  return (
-    <button
-      className={className}
-      onClick={() => alert(`Hello from your ${appName} app!`)}
-    >
-      {children}
-    </button>
-  );
-};
+const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
+  ({ className, variant, size, asChild = false, ...props }, ref) => {
+    const Comp = asChild ? Slot : "button";
+    return (
+      <Comp
+        className={cn(buttonVariants({ variant, size, className }))}
+        ref={ref}
+        {...props}
+      />
+    );
+  }
+);
+Button.displayName = "Button";
+
+export { Button, buttonVariants };
diff --git a/packages/ui/src/card.tsx b/packages/ui/src/card.tsx
diff --git a/packages/ui/src/code.tsx b/packages/ui/src/code.tsx
diff --git a/packages/ui/src/utls/lib.ts → packages/ui/src/lib/utils.ts b/packages/ui/src/utls/lib.ts → packages/ui/src/lib/utils.ts
diff --git a/packages/ui/src/shell/action-bar.module.css b/packages/ui/src/shell/action-bar.module.css
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,6 @@ const config: Omit<Config, "content"> = { @@
             },
           },
         },
-        plugins: [],
       },
     };
@@ Expand Down @@