Merge branch 'develop' into data-catalog-term-definition

outerbase · Feb 1, 2025 · 32e38d4 · 32e38d4
2 parents 971d14d + fcfc443
commit 32e38d4
Show file tree

Hide file tree

Showing 47 changed files with 2,534 additions and 356 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,7 +21,8 @@
     "format:fix": "prettier --write .",
     "lint": "next lint",
     "lint:fix": "next lint --fix .",
-    "dialect": "node build-dialect.js"
+    "dialect": "node build-dialect.js",
+    "remove-branch": "npx git-removed-branches --prune -f"
   },
   "overrides": {
     "@libsql/client": "^0.5.3"
@@ -68,6 +69,7 @@
     "@tiptap/core": "^2.3.0",
     "@tiptap/react": "^2.3.0",
     "@types/mdx": "^2.0.13",
+    "@types/react-grid-layout": "^1.3.5",
     "@uiw/codemirror-extensions-langs": "^4.21.24",
     "@uiw/codemirror-themes": "^4.21.21",
     "@uiw/react-codemirror": "^4.21.21",
@@ -82,6 +84,7 @@
     "dexie": "^4.0.8",
     "dotenv": "^16.4.5",
     "drizzle-orm": "^0.30.1",
+    "echarts": "^5.6.0",
     "eslint-plugin-jest": "^27.6.3",
     "file-saver": "^2.0.5",
     "html-to-image": "^1.11.11",
@@ -91,12 +94,15 @@
     "lucia": "^3.2.0",
     "lucide-react": "^0.474.0",
     "next": "15.1.4",
+    "next-themes": "^0.4.4",
     "oslo": "^1.1.3",
     "react": "19.0.0",
     "react-dom": "19.0.0",
+    "react-grid-layout": "^1.5.0",
     "react-resizable-panels": "^2.1.7",
     "sonner": "^1.4.41",
     "sql-formatter": "^15.3.2",
+    "swr": "^2.3.0",
     "tailwind-merge": "^2.2.2",
     "tailwindcss-animate": "^1.0.7",
     "use-immer": "^0.11.0",

diff --git a/public/assets/login-planet.png b/public/assets/login-planet.png
diff --git a/public/assets/login-portal.png b/public/assets/login-portal.png
diff --git a/public/assets/login-stars.png b/public/assets/login-stars.png
diff --git a/src/app/(public)/layout.tsx b/src/app/(public)/layout.tsx
@@ -1,25 +1,14 @@
-import { Analytics } from "@vercel/analytics/react";
-import { Inter } from "next/font/google";
-import { Toaster } from "@/components/ui/sonner";
 import { Fragment } from "react";
-import Script from "next/script";
-import { cn } from "@/lib/utils";
-import PageTracker from "@/components/page-tracker";
-
-const inter = Inter({ subsets: ["latin"] });
+import ThemeLayout from "../(theme)/theme_layout";
 
 export default async function RootLayout({
   children,
 }: {
   children: React.ReactNode;
 }) {
   return (
-    <body className={cn(inter.className, "dark")}>
+    <ThemeLayout overrideTheme="dark">
       <Fragment>{children}</Fragment>
-      <Toaster />
-      <Analytics />
-      <PageTracker />
-      <Script async defer src="https://buttons.github.io/buttons.js" />
-    </body>
+    </ThemeLayout>
   );
 }
diff --git a/src/app/(theme)/connect/page-client.tsx b/src/app/(theme)/connect/page-client.tsx
@@ -1,37 +1,28 @@
 "use client";
+import ThemeToggle from "@/components/theme-toggle";
 import { Button } from "@/components/ui/button";
-import ConnectionList from "./connection-list";
-import Link from "next/link";
-import { LucideMoon, LucideSun } from "lucide-react";
 import { User } from "lucia";
-import { useTheme } from "@/context/theme-provider";
+import Link from "next/link";
+import ConnectionList from "./connection-list";
 
 export default function ConnectBody({ user }: Readonly<{ user: User | null }>) {
-  const { theme, toggleTheme } = useTheme();
-
   return (
-    <div className="min-h-screen w-screen bg-zinc-50 dark:bg-background">
-      <div className="sticky top-0 border-b p-2 bg-background flex">
-        <Link className="h-12 w-12 flex justify-center items-center" href="/">
+    <div className="dark:bg-background min-h-screen w-screen bg-zinc-50">
+      <div className="bg-background sticky top-0 flex border-b p-2">
+        <Link className="flex h-12 w-12 items-center justify-center" href="/">
           <svg
             fill="currentColor"
             viewBox="75 75 350 350"
-            className="cursor-pointer text-black dark:text-white h-10 w-10"
+            className="h-10 w-10 cursor-pointer text-black dark:text-white"
           >
             <path d="M249.51,146.58c-58.7,0-106.45,49.37-106.45,110.04c0,60.68,47.76,110.04,106.45,110.04 c58.7,0,106.46-49.37,106.46-110.04C355.97,195.95,308.21,146.58,249.51,146.58z M289.08,332.41l-0.02,0.04l-0.51,0.65 c-5.55,7.06-12.37,9.35-17.11,10.02c-1.23,0.17-2.5,0.26-3.78,0.26c-12.94,0-25.96-9.09-37.67-26.29 c-9.56-14.05-17.84-32.77-23.32-52.71c-9.78-35.61-8.67-68.08,2.83-82.74c5.56-7.07,12.37-9.35,17.11-10.02 c13.46-1.88,27.16,6.2,39.64,23.41c10.29,14.19,19.22,33.83,25.12,55.32C301,285.35,300.08,317.46,289.08,332.41z"></path>
           </svg>
         </Link>
 
         <div className="flex-1" />
 
-        <div className="flex gap-2 items-center mr-2">
-          <Button size={"icon"} variant={"ghost"} onClick={() => toggleTheme()}>
-            {theme === "dark" ? (
-              <LucideMoon className="w-4 h-4" />
-            ) : (
-              <LucideSun className="w-4 h-4" />
-            )}
-          </Button>
+        <div className="mr-2 flex items-center gap-2">
+          <ThemeToggle />
 
           {user ? (
             <Link prefetch={false} href="/logout">