Add new UI

scalar-dev · Mar 11, 2024 · d032576 · d032576
1 parent d9cf8f0
commit d032576
Show file tree

Hide file tree

Showing 22 changed files with 764 additions and 140 deletions.
diff --git a/metadata/gql/facet.go b/metadata/gql/facet.go
@@ -82,7 +82,7 @@ func (f DatasetSchema) UpdatedAt() time.Time {
 func CreateDatasetSchema(facetData *ent.Facet) (*DatasetSchema, error) {
 	var datasetSchema facet.DatasetSchema
 
-	err := decodeJson(facetData, &datasetSchema)
+	err := decodeJson(facetData.Data, &datasetSchema)
 
 	if err != nil {
 		return nil, errors.Join(err, errors.New("failed decoding"))

diff --git a/metadata/trawler.resolvers.go b/metadata/trawler.resolvers.go
diff --git a/ui/index.html b/ui/index.html
@@ -1,12 +1,14 @@
 <!doctype html>
-<html lang="en">
+<html class="h-full bg-gray-100" lang="en">
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/trawler.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>trawler</title>
   </head>
-  <body class="dark:bg-gray-900">
+
+
+  <body class="h-full">
     <div id="root"></div>
     <script type="module" src="/src/main.tsx"></script>
   </body>

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -11,6 +11,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@headlessui/react": "^1.7.18",
     "@heroicons/react": "^2.1.1",
     "graphql": "^16.8.1",
     "luxon": "^3.4.4",
@@ -26,6 +27,7 @@
     "@graphql-codegen/near-operation-file-preset": "^3.0.0",
     "@graphql-codegen/typed-document-node": "^5.0.6",
     "@parcel/watcher": "^2.4.1",
+    "@tailwindcss/forms": "^0.5.7",
     "@types/luxon": "^3.4.2",
     "@types/react": "^18.2.56",
     "@types/react-dom": "^18.2.19",

diff --git a/ui/src/App.css b/ui/src/App.css
@@ -1,6 +1,6 @@
 .logo {
-  height: 6em;
-  padding: 1.5em;
+  /* height: 6em;
+  padding: 1.5em; */
   will-change: filter;
   transition: filter 300ms;
 }

diff --git a/ui/src/App.tsx b/ui/src/App.tsx
@@ -1,23 +1,20 @@
 import "./App.css";
 import { UrqlProvider } from "./graphql";
-import logo from "./assets//trawler.svg";
-import Datasets from "./Datasets";
-import { NavLink, Route, Routes } from "react-router-dom";
-import { Dataset } from "./Dataset";
+import Entities from "./pages/Dashboard";
+import { Route, Routes } from "react-router-dom";
+import { Entity } from "./pages/Entity";
+import Layout from "./components/layout/Layout";
 
 function App() {
   return (
     <UrqlProvider url="/graphql">
-      <div className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">
-        <NavLink to="/">
-          <img src={logo} className="logo react" alt="logo" />
-        </NavLink>
-
+      <Layout>
         <Routes>
-          <Route path="/" element={<Datasets />} />
-          <Route path="/dataset/:datasetId" element={<Dataset />} />
+          <Route path="/" element={<Entities />} />
+          <Route path="/entity/:id" element={<Entity />} />
+          <Route path="/entity/:id/:tab" element={<Entity />} />
         </Routes>
-      </div>
+      </Layout>
     </UrqlProvider>
   );
 }

diff --git a/ui/src/Dataset.graphql b/ui/src/Dataset.graphql
diff --git a/ui/src/Dataset.tsx b/ui/src/Dataset.tsx
diff --git a/ui/src/Datasets.tsx b/ui/src/Datasets.tsx