From 253752000fac8bd498389080c578c0020f2f93b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ml=C3=A1dek?= <t@mldk.cz>
Date: Tue, 21 Dec 2021 20:02:47 +0100
Subject: [PATCH] reorganize ui components

---
 ui/src/App.svelte                             |  4 ++--
 ui/src/components/AttributeView.svelte        |  2 +-
 ui/src/components/Inspect.svelte              |  4 ++--
 .../{ => display}/BlobPreview.svelte          |  2 +-
 .../components/{ => display}/HashBadge.svelte |  0
 ui/src/components/{ => display}/UpLink.svelte |  0
 .../components/{ => display}/UpObject.svelte  |  7 +++----
 ui/src/components/{ => layout}/Footer.svelte  |  0
 ui/src/{ => components}/layout/Header.svelte  |  0
 ui/src/components/{ => layout}/Jobs.svelte    |  0
 .../{ => layout}/Notifications.svelte         |  4 ++--
 ui/src/components/{ => utils}/Ellipsis.svelte |  0
 ui/src/components/widgets/List.svelte         | 20 -------------------
 ui/src/components/widgets/Table.svelte        |  4 ++--
 14 files changed, 13 insertions(+), 34 deletions(-)
 rename ui/src/components/{ => display}/BlobPreview.svelte (94%)
 rename ui/src/components/{ => display}/HashBadge.svelte (100%)
 rename ui/src/components/{ => display}/UpLink.svelte (100%)
 rename ui/src/components/{ => display}/UpObject.svelte (93%)
 rename ui/src/components/{ => layout}/Footer.svelte (100%)
 rename ui/src/{ => components}/layout/Header.svelte (100%)
 rename ui/src/components/{ => layout}/Jobs.svelte (100%)
 rename ui/src/components/{ => layout}/Notifications.svelte (88%)
 rename ui/src/components/{ => utils}/Ellipsis.svelte (100%)
 delete mode 100644 ui/src/components/widgets/List.svelte

diff --git a/ui/src/App.svelte b/ui/src/App.svelte
index 4d85fa0..9fcfc5a 100644
--- a/ui/src/App.svelte
+++ b/ui/src/App.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { Router, Route, createHistory } from "svelte-navigator";
   import createHashSource from "./util/history";
-  import Header from "./layout/Header.svelte";
-  import Footer from "./components/Footer.svelte";
+  import Header from "./components/layout/Header.svelte";
+  import Footer from "./components/layout/Footer.svelte";
   import { setBasePath } from "@shoelace-style/shoelace/dist/utilities/base-path.js";
   import "@shoelace-style/shoelace/dist/components/input/input.js";
   import "@shoelace-style/shoelace/dist/components/icon-button/icon-button.js";
diff --git a/ui/src/components/AttributeView.svelte b/ui/src/components/AttributeView.svelte
index a04dfec..491921e 100644
--- a/ui/src/components/AttributeView.svelte
+++ b/ui/src/components/AttributeView.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { createEventDispatcher } from "svelte";
-  import UpLink from "./UpLink.svelte";
+  import UpLink from "./display/UpLink.svelte";
   import { Component, UNTYPED, UpType, Widget } from "../lib/types";
   import Table from "./widgets/Table.svelte";
   import TableComponent from "./widgets/Table.svelte"; // silence false svelte(reactive-component) warnings
diff --git a/ui/src/components/Inspect.svelte b/ui/src/components/Inspect.svelte
index 37b59c5..dc37a69 100644
--- a/ui/src/components/Inspect.svelte
+++ b/ui/src/components/Inspect.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import AttributeView from "./AttributeView.svelte";
   import { query, useEntity } from "../lib/entity";
-  import UpObject from "./UpObject.svelte";
+  import UpObject from "./display/UpObject.svelte";
   import { UpType } from "../lib/types";
-  import BlobPreview from "./BlobPreview.svelte";
+  import BlobPreview from "./display/BlobPreview.svelte";
   import { setContext } from "svelte";
   import { writable } from "svelte/store";
   import type { UpEntry } from "upend";
diff --git a/ui/src/components/BlobPreview.svelte b/ui/src/components/display/BlobPreview.svelte
similarity index 94%
rename from ui/src/components/BlobPreview.svelte
rename to ui/src/components/display/BlobPreview.svelte
index a7529e4..a417050 100644
--- a/ui/src/components/BlobPreview.svelte
+++ b/ui/src/components/display/BlobPreview.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { useEntity } from "../lib/entity";
+  import { useEntity } from "../../lib/entity";
   export let address: string;
 
   $: ({ entity } = useEntity(address));
diff --git a/ui/src/components/HashBadge.svelte b/ui/src/components/display/HashBadge.svelte
similarity index 100%
rename from ui/src/components/HashBadge.svelte
rename to ui/src/components/display/HashBadge.svelte
diff --git a/ui/src/components/UpLink.svelte b/ui/src/components/display/UpLink.svelte
similarity index 100%
rename from ui/src/components/UpLink.svelte
rename to ui/src/components/display/UpLink.svelte
diff --git a/ui/src/components/UpObject.svelte b/ui/src/components/display/UpObject.svelte
similarity index 93%
rename from ui/src/components/UpObject.svelte
rename to ui/src/components/display/UpObject.svelte
index 7220a19..e058e21 100644
--- a/ui/src/components/UpObject.svelte
+++ b/ui/src/components/display/UpObject.svelte
@@ -2,12 +2,11 @@
   import { createEventDispatcher } from "svelte";
   import { BLOB_TYPE_ADDR } from "upend/constants";
   import HashBadge from "./HashBadge.svelte";
-  import Ellipsis from "./Ellipsis.svelte";
+  import Ellipsis from "../utils/Ellipsis.svelte";
   import UpLink from "./UpLink.svelte";
-  import { useEntity } from "../lib/entity";
-  import type { UpObject } from "upend";
+  import { useEntity } from "../../lib/entity";
   import { readable } from "svelte/store";
-  import { notify, UpNotification } from "../notifications";
+  import { notify, UpNotification } from "../../notifications";
   const dispatch = createEventDispatcher();
 
   export let address: string;
diff --git a/ui/src/components/Footer.svelte b/ui/src/components/layout/Footer.svelte
similarity index 100%
rename from ui/src/components/Footer.svelte
rename to ui/src/components/layout/Footer.svelte
diff --git a/ui/src/layout/Header.svelte b/ui/src/components/layout/Header.svelte
similarity index 100%
rename from ui/src/layout/Header.svelte
rename to ui/src/components/layout/Header.svelte
diff --git a/ui/src/components/Jobs.svelte b/ui/src/components/layout/Jobs.svelte
similarity index 100%
rename from ui/src/components/Jobs.svelte
rename to ui/src/components/layout/Jobs.svelte
diff --git a/ui/src/components/Notifications.svelte b/ui/src/components/layout/Notifications.svelte
similarity index 88%
rename from ui/src/components/Notifications.svelte
rename to ui/src/components/layout/Notifications.svelte
index 88de91a..88451b0 100644
--- a/ui/src/components/Notifications.svelte
+++ b/ui/src/components/layout/Notifications.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import { notify } from "../notifications";
+  import { notify } from "../../notifications";
   import { fade } from "svelte/transition";
-  import type { UpNotification } from "../notifications";
+  import type { UpNotification } from "../../notifications";
 
   let notifications: UpNotification[] = [];
 
diff --git a/ui/src/components/Ellipsis.svelte b/ui/src/components/utils/Ellipsis.svelte
similarity index 100%
rename from ui/src/components/Ellipsis.svelte
rename to ui/src/components/utils/Ellipsis.svelte
diff --git a/ui/src/components/widgets/List.svelte b/ui/src/components/widgets/List.svelte
deleted file mode 100644
index 3b6aaed..0000000
--- a/ui/src/components/widgets/List.svelte
+++ /dev/null
@@ -1,20 +0,0 @@
-<script lang="ts">
-import type { UpEntry } from "upend";
-
-  import Table from "./Table.svelte";
-
-  export let attributes: UpEntry[];
-  export let attribute: string;
-  export let editable = false;
-
-  $: filteredAttributes = attributes.filter(
-    (entry) => entry.attribute === attribute
-  );
-</script>
-
-<Table
-  columns="value"
-  header={false}
-  attributes={filteredAttributes}
-  {editable}
-/>
diff --git a/ui/src/components/widgets/Table.svelte b/ui/src/components/widgets/Table.svelte
index 0599bae..1b6cb68 100644
--- a/ui/src/components/widgets/Table.svelte
+++ b/ui/src/components/widgets/Table.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import filesize from "filesize";
   import { format, fromUnixTime } from "date-fns";
-  import Ellipsis from "../Ellipsis.svelte";
-  import UpObject from "../UpObject.svelte";
+  import Ellipsis from "../utils/Ellipsis.svelte";
+  import UpObject from "../display/UpObject.svelte";
   import { createEventDispatcher, getContext } from "svelte";
   import type { AttributeChange } from "../../types/base";
   import { useParams } from "svelte-navigator";