From de0f78b0d2250ef1b3b3f46be34fee66225fda69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 15 May 2025 14:29:46 +0200 Subject: [PATCH] clan-ui: remove intermediate app directory --- .gitignore | 12 +-- docs/nix/default.nix | 2 +- pkgs/clan-app/README.md | 8 +- .../{webview-ui => }/bin/reload-python-api.sh | 11 ++- pkgs/clan-app/clan-app.code-workspace | 4 +- pkgs/clan-app/default.nix | 4 +- pkgs/clan-app/flake-module.nix | 15 +-- pkgs/clan-app/fonts.nix | 24 +++++ pkgs/clan-app/process-compose.yaml | 11 +-- pkgs/clan-app/shell.nix | 8 +- pkgs/clan-app/ui.nix | 25 +++++ pkgs/clan-app/{webview-ui => ui}/.envrc | 0 pkgs/clan-app/{webview-ui => ui}/.gitignore | 0 .../{webview-ui => ui}/.vscode/settings.json | 0 .../clan-app/{webview-ui/app => ui}/README.md | 0 .../{webview-ui => ui}/app/app/api/API.json | 0 .../{webview-ui => ui}/app/app/api/API.ts | 0 .../app/app/api/Inventory.ts | 0 .../app/app/api/modules_schemas.json | 0 .../app/app/api/schema.json | 0 .../{webview-ui/app => ui}/eslint.config.mjs | 0 .../{webview-ui/app => ui}/gtk.webview.js | 0 .../app => ui}/icons/arrow-bottom.svg | 0 .../app => ui}/icons/arrow-left.svg | 0 .../app => ui}/icons/arrow-right.svg | 0 .../app => ui}/icons/arrow-top.svg | 0 .../app => ui}/icons/attention.svg | 0 .../app => ui}/icons/caret-down.svg | 0 .../app => ui}/icons/caret-left.svg | 0 .../app => ui}/icons/caret-right.svg | 0 .../{webview-ui/app => ui}/icons/caret-up.svg | 0 .../app => ui}/icons/checkmark.svg | 0 .../app => ui}/icons/clan-icon.svg | 0 .../app => ui}/icons/clan-logo.svg | 0 .../{webview-ui/app => ui}/icons/close.svg | 0 .../{webview-ui/app => ui}/icons/download.svg | 0 .../{webview-ui/app => ui}/icons/edit.svg | 0 .../{webview-ui/app => ui}/icons/expand.svg | 0 .../app => ui}/icons/eye-close.svg | 0 .../{webview-ui/app => ui}/icons/eye-open.svg | 0 .../{webview-ui/app => ui}/icons/filter.svg | 0 .../{webview-ui/app => ui}/icons/flash.svg | 0 .../{webview-ui/app => ui}/icons/folder.svg | 0 .../{webview-ui/app => ui}/icons/grid.svg | 0 .../{webview-ui/app => ui}/icons/info.svg | 0 .../{webview-ui/app => ui}/icons/list.svg | 0 .../{webview-ui/app => ui}/icons/load.svg | 0 .../{webview-ui/app => ui}/icons/more.svg | 0 .../app => ui}/icons/paperclip.svg | 0 .../{webview-ui/app => ui}/icons/plus.svg | 0 .../{webview-ui/app => ui}/icons/reload.svg | 0 .../{webview-ui/app => ui}/icons/report.svg | 0 .../{webview-ui/app => ui}/icons/search.svg | 0 .../{webview-ui/app => ui}/icons/settings.svg | 0 .../{webview-ui/app => ui}/icons/trash.svg | 0 .../{webview-ui/app => ui}/icons/update.svg | 0 .../{webview-ui/app => ui}/icons/warning.svg | 0 .../{webview-ui/app => ui}/index.html | 0 .../{webview-ui/app => ui}/package-lock.json | 4 +- .../{webview-ui/app => ui}/package.json | 2 +- .../{webview-ui/app => ui}/postcss.config.js | 0 .../{webview-ui/app => ui}/prettier.config.js | 0 .../{webview-ui/app => ui}/src/App.tsx | 0 .../app => ui}/src/Form/base/index.tsx | 0 .../app => ui}/src/Form/base/label.tsx | 0 .../src/Form/fields/FormSection.tsx | 0 .../app => ui}/src/Form/fields/Select.tsx | 0 .../app => ui}/src/Form/fields/TextInput.tsx | 0 .../app => ui}/src/Form/fields/index.ts | 0 .../app => ui}/src/Form/fields/layout.tsx | 0 .../app => ui}/src/Form/fieldset/index.tsx | 0 .../app => ui}/src/Form/form/index.tsx | 0 .../{webview-ui/app => ui}/src/api/index.tsx | 0 .../app => ui}/src/api/inventory.ts | 0 .../{webview-ui/app => ui}/src/api/wifi.ts | 0 .../{webview-ui/app => ui}/src/api_test.tsx | 0 .../app => ui}/src/components/BackButton.tsx | 0 .../app => ui}/src/components/FileInput.tsx | 0 .../src/components/Helpers/List.tsx | 0 .../src/components/Helpers/index.tsx | 0 .../app => ui}/src/components/Menu.tsx | 0 .../app => ui}/src/components/SelectInput.tsx | 0 .../Sidebar/SidebarFlyout/index.tsx | 0 .../src/components/Sidebar/SidebarHeader.tsx | 0 .../components/Sidebar/SidebarListItem.tsx | 0 .../components/Sidebar/css/sidebar-flyout.css | 0 .../components/Sidebar/css/sidebar-header.css | 0 .../Sidebar/css/sidebar-list-item.css | 0 .../Sidebar/css/sidebar-profile.css | 0 .../src/components/Sidebar/css/sidebar.css | 0 .../src/components/Sidebar/index.tsx | 0 .../Typography/css/typography-color.css | 0 .../css/typography-hierarchy/index.css | 0 .../typography-hierarchy/typography-body.css | 0 .../typography-headline.css | 0 .../typography-hierarchy/typography-label.css | 0 .../typography-hierarchy/typography-title.css | 0 .../components/Typography/css/typography.css | 0 .../src/components/Typography/index.tsx | 0 .../src/components/accordion/accordion.css | 0 .../src/components/accordion/index.tsx | 0 .../app => ui}/src/components/badge/index.tsx | 0 .../src/components/button/button.examples.tsx | 0 .../src/components/button/css/button-dark.css | 0 .../components/button/css/button-ghost.css | 0 .../components/button/css/button-light.css | 0 .../src/components/button/css/index.css | 0 .../src/components/button/index.tsx | 0 .../src/components/fileSelect/index.tsx | 0 .../app => ui}/src/components/group/index.tsx | 0 .../app => ui}/src/components/icon/index.tsx | 0 .../src/components/inputBase/index.tsx | 0 .../machine-list-item/css/index.css | 0 .../components/machine-list-item/index.tsx | 0 .../app => ui}/src/components/modal/index.tsx | 0 .../src/components/noiseThumbnail/index.tsx | 0 .../app => ui}/src/components/toast/index.tsx | 0 .../app => ui}/src/floating/index.tsx | 0 .../{webview-ui/app => ui}/src/hooks/index.ts | 0 .../{webview-ui/app => ui}/src/index.css | 0 .../{webview-ui/app => ui}/src/index.tsx | 0 .../app => ui}/src/layout/header.tsx | 0 .../app => ui}/src/layout/layout.tsx | 0 .../app => ui}/src/queries/index.ts | 0 .../app => ui}/src/routes/clans/create.tsx | 0 .../app => ui}/src/routes/clans/details.tsx | 0 .../app => ui}/src/routes/clans/index.ts | 0 .../app => ui}/src/routes/clans/list.tsx | 0 .../app => ui}/src/routes/colors/view.tsx | 0 .../src/routes/components/index.tsx | 0 .../app => ui}/src/routes/deploy/index.tsx | 0 .../app => ui}/src/routes/disk/view.tsx | 0 .../app => ui}/src/routes/flash/view.tsx | 0 .../app => ui}/src/routes/hosts/view.tsx | 0 .../app => ui}/src/routes/machines/avatar.tsx | 0 .../app => ui}/src/routes/machines/create.tsx | 0 .../src/routes/machines/details.tsx | 0 .../app => ui}/src/routes/machines/index.ts | 0 .../src/routes/machines/install/disk-step.tsx | 0 .../routes/machines/install/hardware-step.tsx | 0 .../routes/machines/install/summary-step.tsx | 0 .../src/routes/machines/install/vars-step.tsx | 0 .../app => ui}/src/routes/machines/list.tsx | 0 .../app => ui}/src/routes/modules/add.tsx | 0 .../app => ui}/src/routes/modules/details.tsx | 0 .../app => ui}/src/routes/modules/list.tsx | 0 .../app => ui}/src/routes/welcome/index.tsx | 0 .../{webview-ui/app => ui}/src/three.tsx | 0 .../app => ui}/stylelint.config.js | 0 .../{webview-ui/app => ui}/tailwind.config.ts | 0 .../app => ui}/tailwind/core-plugin.ts | 0 .../app => ui}/tailwind/typography.ts | 0 .../app => ui}/tests/types.test.ts | 0 .../{webview-ui/app => ui}/tsconfig.json | 0 pkgs/clan-app/{webview-ui/app => ui}/util.ts | 0 .../{webview-ui/app => ui}/vite.config.ts | 0 pkgs/clan-app/webview-ui/flake-module.nix | 94 ------------------- pkgs/icon-update/default.nix | 2 +- renovate.json | 2 +- 159 files changed, 93 insertions(+), 135 deletions(-) rename pkgs/clan-app/{webview-ui => }/bin/reload-python-api.sh (61%) create mode 100644 pkgs/clan-app/fonts.nix create mode 100644 pkgs/clan-app/ui.nix rename pkgs/clan-app/{webview-ui => ui}/.envrc (100%) rename pkgs/clan-app/{webview-ui => ui}/.gitignore (100%) rename pkgs/clan-app/{webview-ui => ui}/.vscode/settings.json (100%) rename pkgs/clan-app/{webview-ui/app => ui}/README.md (100%) rename pkgs/clan-app/{webview-ui => ui}/app/app/api/API.json (100%) rename pkgs/clan-app/{webview-ui => ui}/app/app/api/API.ts (100%) rename pkgs/clan-app/{webview-ui => ui}/app/app/api/Inventory.ts (100%) rename pkgs/clan-app/{webview-ui => ui}/app/app/api/modules_schemas.json (100%) rename pkgs/clan-app/{webview-ui => ui}/app/app/api/schema.json (100%) rename pkgs/clan-app/{webview-ui/app => ui}/eslint.config.mjs (100%) rename pkgs/clan-app/{webview-ui/app => ui}/gtk.webview.js (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/arrow-bottom.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/arrow-left.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/arrow-right.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/arrow-top.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/attention.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/caret-down.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/caret-left.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/caret-right.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/caret-up.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/checkmark.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/clan-icon.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/clan-logo.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/close.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/download.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/edit.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/expand.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/eye-close.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/eye-open.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/filter.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/flash.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/folder.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/grid.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/info.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/list.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/load.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/more.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/paperclip.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/plus.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/reload.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/report.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/search.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/settings.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/trash.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/update.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/icons/warning.svg (100%) rename pkgs/clan-app/{webview-ui/app => ui}/index.html (100%) rename pkgs/clan-app/{webview-ui/app => ui}/package-lock.json (99%) rename pkgs/clan-app/{webview-ui/app => ui}/package.json (98%) rename pkgs/clan-app/{webview-ui/app => ui}/postcss.config.js (100%) rename pkgs/clan-app/{webview-ui/app => ui}/prettier.config.js (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/App.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/Form/base/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/Form/base/label.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/Form/fields/FormSection.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/Form/fields/Select.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/Form/fields/TextInput.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/Form/fields/index.ts (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/Form/fields/layout.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/Form/fieldset/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/Form/form/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/api/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/api/inventory.ts (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/api/wifi.ts (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/api_test.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/BackButton.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/FileInput.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Helpers/List.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Helpers/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Menu.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/SelectInput.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Sidebar/SidebarFlyout/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Sidebar/SidebarHeader.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Sidebar/SidebarListItem.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Sidebar/css/sidebar-flyout.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Sidebar/css/sidebar-header.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Sidebar/css/sidebar-list-item.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Sidebar/css/sidebar-profile.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Sidebar/css/sidebar.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Sidebar/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Typography/css/typography-color.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Typography/css/typography-hierarchy/index.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Typography/css/typography-hierarchy/typography-body.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Typography/css/typography-hierarchy/typography-headline.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Typography/css/typography-hierarchy/typography-label.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Typography/css/typography-hierarchy/typography-title.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Typography/css/typography.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/Typography/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/accordion/accordion.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/accordion/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/badge/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/button/button.examples.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/button/css/button-dark.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/button/css/button-ghost.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/button/css/button-light.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/button/css/index.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/button/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/fileSelect/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/group/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/icon/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/inputBase/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/machine-list-item/css/index.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/machine-list-item/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/modal/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/noiseThumbnail/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/components/toast/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/floating/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/hooks/index.ts (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/index.css (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/layout/header.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/layout/layout.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/queries/index.ts (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/clans/create.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/clans/details.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/clans/index.ts (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/clans/list.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/colors/view.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/components/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/deploy/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/disk/view.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/flash/view.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/hosts/view.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/machines/avatar.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/machines/create.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/machines/details.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/machines/index.ts (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/machines/install/disk-step.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/machines/install/hardware-step.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/machines/install/summary-step.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/machines/install/vars-step.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/machines/list.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/modules/add.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/modules/details.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/modules/list.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/routes/welcome/index.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/src/three.tsx (100%) rename pkgs/clan-app/{webview-ui/app => ui}/stylelint.config.js (100%) rename pkgs/clan-app/{webview-ui/app => ui}/tailwind.config.ts (100%) rename pkgs/clan-app/{webview-ui/app => ui}/tailwind/core-plugin.ts (100%) rename pkgs/clan-app/{webview-ui/app => ui}/tailwind/typography.ts (100%) rename pkgs/clan-app/{webview-ui/app => ui}/tests/types.test.ts (100%) rename pkgs/clan-app/{webview-ui/app => ui}/tsconfig.json (100%) rename pkgs/clan-app/{webview-ui/app => ui}/util.ts (100%) rename pkgs/clan-app/{webview-ui/app => ui}/vite.config.ts (100%) delete mode 100644 pkgs/clan-app/webview-ui/flake-module.nix diff --git a/.gitignore b/.gitignore index d99eb4dfc..cff25ac93 100644 --- a/.gitignore +++ b/.gitignore @@ -48,9 +48,9 @@ dist select # Generated files -pkgs/ui/webview-ui/app/api/API.json -pkgs/ui/webview-ui/app/api/API.ts -pkgs/ui/webview-ui/app/api/Inventory.ts -pkgs/ui/webview-ui/app/api/modules_schemas.json -pkgs/ui/webview-ui/app/api/schema.json -pkgs/ui/webview-ui/app/.fonts +pkgs/clan-app/ui/api/API.json +pkgs/clan-app/ui/api/API.ts +pkgs/clan-app/ui/api/Inventory.ts +pkgs/clan-app/ui/api/modules_schemas.json +pkgs/clan-app/ui/api/schema.json +pkgs/clan-app/ui/.fonts diff --git a/docs/nix/default.nix b/docs/nix/default.nix index a973ffe49..d59b8b1ea 100644 --- a/docs/nix/default.nix +++ b/docs/nix/default.nix @@ -45,7 +45,7 @@ pkgs.stdenv.mkDerivation { ln -snf ${fira-code}/share/fonts/truetype/FiraCode-VF.ttf ./site/static/ # Copy icons into place - cp -af ../pkgs/clan-app/webview-ui/app/icons ./site/static/ + cp -af ../pkgs/clan-app/ui/icons ./site/static/ ''; buildPhase = '' diff --git a/pkgs/clan-app/README.md b/pkgs/clan-app/README.md index 16cf041d6..7bcb0faa1 100644 --- a/pkgs/clan-app/README.md +++ b/pkgs/clan-app/README.md @@ -4,7 +4,7 @@ A powerful application that allows users to create and manage their own Clans. ## Getting Started -Enter the `pkgs/ui` directory and allow [direnv] to load the `ui` devshell with `direnv allow`: +Enter the `pkgs/clan-app` directory and allow [direnv] to load the `clan-app` devshell with `direnv allow`: ```console ❯ direnv allow @@ -27,11 +27,11 @@ Once that has loaded, you can run the local dev environment by running `process- This will start a [process-compose] instance containing two processes: -* `webview-ui` which is a background process running a [vite] server for `./webview-ui` in a hot-reload fashion +* `clan-app-ui` which is a background process running a [vite] server for `./ui` in a hot-reload fashion * `clan-app` which is a [foreground process](https://f1bonacc1.github.io/process-compose/launcher/?h=foreground#foreground-processes), that is started on demand and provides the [webview] wrapper for the UI. -Wait for the `webview-ui` process to enter the `Running` state, then navigate to the `clan-app` process and press `F7`. +Wait for the `clan-app-ui` process to enter the `Running` state, then navigate to the `clan-app` process and press `F7`. This will start the [webview] window and bring `clan-app`'s terminal into the foreground, allowing for interaction with the debugger if required. @@ -52,7 +52,7 @@ Follow the instructions below to set up your development environment and start t 1. **Navigate to the Webview UI Directory** - Go to the `clan-core/pkgs/clan-app/webview-ui/app` directory and start the web server by executing: + Go to the `clan-core/pkgs/clan-app/ui` directory and start the web server by executing: ```bash npm install diff --git a/pkgs/clan-app/webview-ui/bin/reload-python-api.sh b/pkgs/clan-app/bin/reload-python-api.sh similarity index 61% rename from pkgs/clan-app/webview-ui/bin/reload-python-api.sh rename to pkgs/clan-app/bin/reload-python-api.sh index 90618d1c7..cc242e282 100755 --- a/pkgs/clan-app/webview-ui/bin/reload-python-api.sh +++ b/pkgs/clan-app/bin/reload-python-api.sh @@ -1,20 +1,21 @@ #!/usr/bin/env bash +set -eux -o pipefail + script_dir=$(dirname "$(readlink -f "$0")") -clan_cli="$script_dir/../../clan-cli" +clan_cli="$script_dir/../clan-cli" trap 'rm -rf "$tmpdir"' EXIT tmpdir=$(mktemp -d) -set -x python "$clan_cli/api.py" > "$tmpdir/API.json" json2ts --input "$tmpdir/API.json" > "$tmpdir/API.ts" # compare sha256 sums of old and new API.ts -old_api_hash=$(sha256sum "$script_dir/../app/api/API.ts" | cut -d ' ' -f 1) +old_api_hash=$(sha256sum "$script_dir/../api/API.ts" | cut -d ' ' -f 1) new_api_hash=$(sha256sum "$tmpdir/API.ts" | cut -d ' ' -f 1) if [ "$old_api_hash" != "$new_api_hash" ]; then - cp "$tmpdir/API.json" "$script_dir/../app/api/API.json" - cp "$tmpdir/API.ts" "$script_dir/../app/api/API.ts" + cp "$tmpdir/API.json" "$script_dir/../api/API.json" + cp "$tmpdir/API.ts" "$script_dir/../api/API.ts" fi diff --git a/pkgs/clan-app/clan-app.code-workspace b/pkgs/clan-app/clan-app.code-workspace index 2e3fbfd6a..d2696c0e6 100644 --- a/pkgs/clan-app/clan-app.code-workspace +++ b/pkgs/clan-app/clan-app.code-workspace @@ -16,10 +16,10 @@ "path": "../../lib/build-clan" }, { - "path": "../webview-ui" + "path": "./ui" }, { - "path": "../webview-lib" + "path": "./webview-lib" }, { "path": "../clan-cli/clan_lib" diff --git a/pkgs/clan-app/default.nix b/pkgs/clan-app/default.nix index efc61afb0..ba25a00f2 100644 --- a/pkgs/clan-app/default.nix +++ b/pkgs/clan-app/default.nix @@ -3,7 +3,7 @@ copyDesktopItems, clan-cli, makeDesktopItem, - webview-ui, + clan-app-ui, webview-lib, fontconfig, pythonRuntime, @@ -146,7 +146,7 @@ pythonRuntime.pkgs.buildPythonApplication { postInstall = '' mkdir -p $out/${pythonRuntime.sitePackages}/clan_app/.webui - cp -r ${webview-ui}/lib/node_modules/@clan/webview-ui/dist/* $out/${pythonRuntime.sitePackages}/clan_app/.webui + cp -r ${clan-app-ui}/lib/node_modules/@clan/ui/dist/* $out/${pythonRuntime.sitePackages}/clan_app/.webui mkdir -p $out/share/icons/hicolor cp -r ./clan_app/assets/white-favicons/* $out/share/icons/hicolor ''; diff --git a/pkgs/clan-app/flake-module.nix b/pkgs/clan-app/flake-module.nix index 3675f8e40..a23698a87 100644 --- a/pkgs/clan-app/flake-module.nix +++ b/pkgs/clan-app/flake-module.nix @@ -1,8 +1,4 @@ { - imports = [ - ./webview-ui/flake-module.nix - ]; - perSystem = { self', @@ -17,15 +13,22 @@ devShells.clan-app = pkgs.callPackage ./shell.nix { inherit self'; - inherit (self'.packages) clan-app webview-lib webview-ui; + inherit (self'.packages) clan-app webview-lib clan-app-ui; inherit (config.packages) clan-ts-api; }; packages.clan-app = pkgs.callPackage ./default.nix { - inherit (config.packages) clan-cli webview-ui webview-lib; + inherit (config.packages) clan-cli clan-app-ui webview-lib; pythonRuntime = pkgs.python3; }; + packages.fonts = pkgs.callPackage ./fonts.nix { }; + + packages.clan-app-ui = pkgs.callPackage ./ui.nix { + clan-ts-api = config.packages.clan-ts-api; + fonts = config.packages.fonts; + }; + checks = config.packages.clan-app.tests; }; } diff --git a/pkgs/clan-app/fonts.nix b/pkgs/clan-app/fonts.nix new file mode 100644 index 000000000..93d4f6676 --- /dev/null +++ b/pkgs/clan-app/fonts.nix @@ -0,0 +1,24 @@ +{ fetchurl, runCommand }: +let + # 400 -> Regular + archivoRegular = fetchurl { + url = "https://github.com/Omnibus-Type/Archivo/raw/b5d63988ce19d044d3e10362de730af00526b672/fonts/webfonts/ArchivoSemiCondensed-Regular.woff2"; + hash = "sha256-3PeB6tMpbYxR9JFyQ+yjpM7bAvZIjcJ4eBiHr9iV5p4="; + }; + # 500 -> Medium + archivoMedium = fetchurl { + url = "https://github.com/Omnibus-Type/Archivo/raw/b5d63988ce19d044d3e10362de730af00526b672/fonts/webfonts/ArchivoSemiCondensed-Medium.woff2"; + hash = "sha256-IKaY3YhpmjMaIVUpwKRLd6eFiIihBoAP99I/pwmyll8="; + }; + # 600 -> SemiBold + archivoSemiBold = fetchurl { + url = "https://github.com/Omnibus-Type/Archivo/raw/b5d63988ce19d044d3e10362de730af00526b672/fonts/webfonts/ArchivoSemiCondensed-SemiBold.woff2"; + hash = "sha256-fOE+b+UeTRoj+sDdUWR1pPCZVn0ABy6FEDDmXrOA4LY="; + }; +in +runCommand "" { } '' + mkdir -p $out + cp ${archivoRegular} $out/ArchivoSemiCondensed-Regular.woff2 + cp ${archivoMedium} $out/ArchivoSemiCondensed-Medium.woff2 + cp ${archivoSemiBold} $out/ArchivoSemiCondensed-SemiBold.woff2 +'' diff --git a/pkgs/clan-app/process-compose.yaml b/pkgs/clan-app/process-compose.yaml index 8833a13a7..4a230f7fe 100644 --- a/pkgs/clan-app/process-compose.yaml +++ b/pkgs/clan-app/process-compose.yaml @@ -1,12 +1,11 @@ version: "0.5" processes: - webview-ui: + clan-app-ui: command: | - cd $(git rev-parse --show-toplevel)/pkgs/clan-app/webview-ui/app - direnv allow - direnv exec . npm install - direnv exec . vite + cd $(git rev-parse --show-toplevel)/pkgs/clan-app/ui + npm install + vite ready_log_line: "VITE" clan-app: @@ -14,7 +13,7 @@ processes: cd $(git rev-parse --show-toplevel)/pkgs/clan-app ./bin/clan-app --debug --content-uri http://localhost:3000 depends_on: - webview-ui: + clan-app-ui: condition: "process_log_ready" is_foreground: true ready_log_line: "Debug mode enabled" diff --git a/pkgs/clan-app/shell.nix b/pkgs/clan-app/shell.nix index b68a7b8e6..044e3172a 100644 --- a/pkgs/clan-app/shell.nix +++ b/pkgs/clan-app/shell.nix @@ -3,7 +3,7 @@ mkShell, ruff, webview-lib, - webview-ui, + clan-app-ui, clan-ts-api, process-compose, python3, @@ -16,7 +16,7 @@ mkShell { inputsFrom = [ self'.devShells.default - webview-ui + clan-app-ui ]; packages = [ @@ -59,8 +59,8 @@ mkShell { popd ## Webview UI - # Add webview-ui scripts to PATH - pushd "$CLAN_CORE_PATH/pkgs/clan-app/webview-ui/app" + # Add clan-app-ui scripts to PATH + pushd "$CLAN_CORE_PATH/pkgs/clan-app/ui" export NODE_PATH="$(pwd)/node_modules" export PATH="$NODE_PATH/.bin:$(pwd)/bin:$PATH" cp -r ${self'.packages.fonts} .fonts diff --git a/pkgs/clan-app/ui.nix b/pkgs/clan-app/ui.nix new file mode 100644 index 000000000..b0713f8f8 --- /dev/null +++ b/pkgs/clan-app/ui.nix @@ -0,0 +1,25 @@ +{ + buildNpmPackage, + nodejs_20, + importNpmLock, + + clan-ts-api, + fonts, +}: +buildNpmPackage { + pname = "clan-app-ui"; + version = "0.0.1"; + nodejs = nodejs_20; + src = ./ui; + + npmDeps = importNpmLock { + npmRoot = ./ui; + }; + npmConfigHook = importNpmLock.npmConfigHook; + + preBuild = '' + mkdir -p api + cp -r ${clan-ts-api}/* api + cp -r ${fonts} ".fonts" + ''; +} diff --git a/pkgs/clan-app/webview-ui/.envrc b/pkgs/clan-app/ui/.envrc similarity index 100% rename from pkgs/clan-app/webview-ui/.envrc rename to pkgs/clan-app/ui/.envrc diff --git a/pkgs/clan-app/webview-ui/.gitignore b/pkgs/clan-app/ui/.gitignore similarity index 100% rename from pkgs/clan-app/webview-ui/.gitignore rename to pkgs/clan-app/ui/.gitignore diff --git a/pkgs/clan-app/webview-ui/.vscode/settings.json b/pkgs/clan-app/ui/.vscode/settings.json similarity index 100% rename from pkgs/clan-app/webview-ui/.vscode/settings.json rename to pkgs/clan-app/ui/.vscode/settings.json diff --git a/pkgs/clan-app/webview-ui/app/README.md b/pkgs/clan-app/ui/README.md similarity index 100% rename from pkgs/clan-app/webview-ui/app/README.md rename to pkgs/clan-app/ui/README.md diff --git a/pkgs/clan-app/webview-ui/app/app/api/API.json b/pkgs/clan-app/ui/app/app/api/API.json similarity index 100% rename from pkgs/clan-app/webview-ui/app/app/api/API.json rename to pkgs/clan-app/ui/app/app/api/API.json diff --git a/pkgs/clan-app/webview-ui/app/app/api/API.ts b/pkgs/clan-app/ui/app/app/api/API.ts similarity index 100% rename from pkgs/clan-app/webview-ui/app/app/api/API.ts rename to pkgs/clan-app/ui/app/app/api/API.ts diff --git a/pkgs/clan-app/webview-ui/app/app/api/Inventory.ts b/pkgs/clan-app/ui/app/app/api/Inventory.ts similarity index 100% rename from pkgs/clan-app/webview-ui/app/app/api/Inventory.ts rename to pkgs/clan-app/ui/app/app/api/Inventory.ts diff --git a/pkgs/clan-app/webview-ui/app/app/api/modules_schemas.json b/pkgs/clan-app/ui/app/app/api/modules_schemas.json similarity index 100% rename from pkgs/clan-app/webview-ui/app/app/api/modules_schemas.json rename to pkgs/clan-app/ui/app/app/api/modules_schemas.json diff --git a/pkgs/clan-app/webview-ui/app/app/api/schema.json b/pkgs/clan-app/ui/app/app/api/schema.json similarity index 100% rename from pkgs/clan-app/webview-ui/app/app/api/schema.json rename to pkgs/clan-app/ui/app/app/api/schema.json diff --git a/pkgs/clan-app/webview-ui/app/eslint.config.mjs b/pkgs/clan-app/ui/eslint.config.mjs similarity index 100% rename from pkgs/clan-app/webview-ui/app/eslint.config.mjs rename to pkgs/clan-app/ui/eslint.config.mjs diff --git a/pkgs/clan-app/webview-ui/app/gtk.webview.js b/pkgs/clan-app/ui/gtk.webview.js similarity index 100% rename from pkgs/clan-app/webview-ui/app/gtk.webview.js rename to pkgs/clan-app/ui/gtk.webview.js diff --git a/pkgs/clan-app/webview-ui/app/icons/arrow-bottom.svg b/pkgs/clan-app/ui/icons/arrow-bottom.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/arrow-bottom.svg rename to pkgs/clan-app/ui/icons/arrow-bottom.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/arrow-left.svg b/pkgs/clan-app/ui/icons/arrow-left.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/arrow-left.svg rename to pkgs/clan-app/ui/icons/arrow-left.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/arrow-right.svg b/pkgs/clan-app/ui/icons/arrow-right.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/arrow-right.svg rename to pkgs/clan-app/ui/icons/arrow-right.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/arrow-top.svg b/pkgs/clan-app/ui/icons/arrow-top.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/arrow-top.svg rename to pkgs/clan-app/ui/icons/arrow-top.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/attention.svg b/pkgs/clan-app/ui/icons/attention.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/attention.svg rename to pkgs/clan-app/ui/icons/attention.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/caret-down.svg b/pkgs/clan-app/ui/icons/caret-down.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/caret-down.svg rename to pkgs/clan-app/ui/icons/caret-down.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/caret-left.svg b/pkgs/clan-app/ui/icons/caret-left.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/caret-left.svg rename to pkgs/clan-app/ui/icons/caret-left.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/caret-right.svg b/pkgs/clan-app/ui/icons/caret-right.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/caret-right.svg rename to pkgs/clan-app/ui/icons/caret-right.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/caret-up.svg b/pkgs/clan-app/ui/icons/caret-up.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/caret-up.svg rename to pkgs/clan-app/ui/icons/caret-up.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/checkmark.svg b/pkgs/clan-app/ui/icons/checkmark.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/checkmark.svg rename to pkgs/clan-app/ui/icons/checkmark.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/clan-icon.svg b/pkgs/clan-app/ui/icons/clan-icon.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/clan-icon.svg rename to pkgs/clan-app/ui/icons/clan-icon.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/clan-logo.svg b/pkgs/clan-app/ui/icons/clan-logo.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/clan-logo.svg rename to pkgs/clan-app/ui/icons/clan-logo.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/close.svg b/pkgs/clan-app/ui/icons/close.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/close.svg rename to pkgs/clan-app/ui/icons/close.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/download.svg b/pkgs/clan-app/ui/icons/download.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/download.svg rename to pkgs/clan-app/ui/icons/download.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/edit.svg b/pkgs/clan-app/ui/icons/edit.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/edit.svg rename to pkgs/clan-app/ui/icons/edit.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/expand.svg b/pkgs/clan-app/ui/icons/expand.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/expand.svg rename to pkgs/clan-app/ui/icons/expand.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/eye-close.svg b/pkgs/clan-app/ui/icons/eye-close.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/eye-close.svg rename to pkgs/clan-app/ui/icons/eye-close.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/eye-open.svg b/pkgs/clan-app/ui/icons/eye-open.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/eye-open.svg rename to pkgs/clan-app/ui/icons/eye-open.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/filter.svg b/pkgs/clan-app/ui/icons/filter.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/filter.svg rename to pkgs/clan-app/ui/icons/filter.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/flash.svg b/pkgs/clan-app/ui/icons/flash.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/flash.svg rename to pkgs/clan-app/ui/icons/flash.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/folder.svg b/pkgs/clan-app/ui/icons/folder.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/folder.svg rename to pkgs/clan-app/ui/icons/folder.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/grid.svg b/pkgs/clan-app/ui/icons/grid.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/grid.svg rename to pkgs/clan-app/ui/icons/grid.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/info.svg b/pkgs/clan-app/ui/icons/info.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/info.svg rename to pkgs/clan-app/ui/icons/info.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/list.svg b/pkgs/clan-app/ui/icons/list.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/list.svg rename to pkgs/clan-app/ui/icons/list.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/load.svg b/pkgs/clan-app/ui/icons/load.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/load.svg rename to pkgs/clan-app/ui/icons/load.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/more.svg b/pkgs/clan-app/ui/icons/more.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/more.svg rename to pkgs/clan-app/ui/icons/more.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/paperclip.svg b/pkgs/clan-app/ui/icons/paperclip.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/paperclip.svg rename to pkgs/clan-app/ui/icons/paperclip.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/plus.svg b/pkgs/clan-app/ui/icons/plus.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/plus.svg rename to pkgs/clan-app/ui/icons/plus.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/reload.svg b/pkgs/clan-app/ui/icons/reload.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/reload.svg rename to pkgs/clan-app/ui/icons/reload.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/report.svg b/pkgs/clan-app/ui/icons/report.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/report.svg rename to pkgs/clan-app/ui/icons/report.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/search.svg b/pkgs/clan-app/ui/icons/search.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/search.svg rename to pkgs/clan-app/ui/icons/search.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/settings.svg b/pkgs/clan-app/ui/icons/settings.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/settings.svg rename to pkgs/clan-app/ui/icons/settings.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/trash.svg b/pkgs/clan-app/ui/icons/trash.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/trash.svg rename to pkgs/clan-app/ui/icons/trash.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/update.svg b/pkgs/clan-app/ui/icons/update.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/update.svg rename to pkgs/clan-app/ui/icons/update.svg diff --git a/pkgs/clan-app/webview-ui/app/icons/warning.svg b/pkgs/clan-app/ui/icons/warning.svg similarity index 100% rename from pkgs/clan-app/webview-ui/app/icons/warning.svg rename to pkgs/clan-app/ui/icons/warning.svg diff --git a/pkgs/clan-app/webview-ui/app/index.html b/pkgs/clan-app/ui/index.html similarity index 100% rename from pkgs/clan-app/webview-ui/app/index.html rename to pkgs/clan-app/ui/index.html diff --git a/pkgs/clan-app/webview-ui/app/package-lock.json b/pkgs/clan-app/ui/package-lock.json similarity index 99% rename from pkgs/clan-app/webview-ui/app/package-lock.json rename to pkgs/clan-app/ui/package-lock.json index afc72e456..3bc7e1443 100644 --- a/pkgs/clan-app/webview-ui/app/package-lock.json +++ b/pkgs/clan-app/ui/package-lock.json @@ -1,11 +1,11 @@ { - "name": "@clan/webview-ui", + "name": "@clan/ui", "version": "0.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "@clan/webview-ui", + "name": "@clan/ui", "version": "0.0.1", "license": "MIT", "dependencies": { diff --git a/pkgs/clan-app/webview-ui/app/package.json b/pkgs/clan-app/ui/package.json similarity index 98% rename from pkgs/clan-app/webview-ui/app/package.json rename to pkgs/clan-app/ui/package.json index f7f561603..689bb2fd5 100644 --- a/pkgs/clan-app/webview-ui/app/package.json +++ b/pkgs/clan-app/ui/package.json @@ -1,5 +1,5 @@ { - "name": "@clan/webview-ui", + "name": "@clan/ui", "version": "0.0.1", "description": "", "type": "module", diff --git a/pkgs/clan-app/webview-ui/app/postcss.config.js b/pkgs/clan-app/ui/postcss.config.js similarity index 100% rename from pkgs/clan-app/webview-ui/app/postcss.config.js rename to pkgs/clan-app/ui/postcss.config.js diff --git a/pkgs/clan-app/webview-ui/app/prettier.config.js b/pkgs/clan-app/ui/prettier.config.js similarity index 100% rename from pkgs/clan-app/webview-ui/app/prettier.config.js rename to pkgs/clan-app/ui/prettier.config.js diff --git a/pkgs/clan-app/webview-ui/app/src/App.tsx b/pkgs/clan-app/ui/src/App.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/App.tsx rename to pkgs/clan-app/ui/src/App.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/Form/base/index.tsx b/pkgs/clan-app/ui/src/Form/base/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/Form/base/index.tsx rename to pkgs/clan-app/ui/src/Form/base/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/Form/base/label.tsx b/pkgs/clan-app/ui/src/Form/base/label.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/Form/base/label.tsx rename to pkgs/clan-app/ui/src/Form/base/label.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/Form/fields/FormSection.tsx b/pkgs/clan-app/ui/src/Form/fields/FormSection.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/Form/fields/FormSection.tsx rename to pkgs/clan-app/ui/src/Form/fields/FormSection.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/Form/fields/Select.tsx b/pkgs/clan-app/ui/src/Form/fields/Select.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/Form/fields/Select.tsx rename to pkgs/clan-app/ui/src/Form/fields/Select.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/Form/fields/TextInput.tsx b/pkgs/clan-app/ui/src/Form/fields/TextInput.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/Form/fields/TextInput.tsx rename to pkgs/clan-app/ui/src/Form/fields/TextInput.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/Form/fields/index.ts b/pkgs/clan-app/ui/src/Form/fields/index.ts similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/Form/fields/index.ts rename to pkgs/clan-app/ui/src/Form/fields/index.ts diff --git a/pkgs/clan-app/webview-ui/app/src/Form/fields/layout.tsx b/pkgs/clan-app/ui/src/Form/fields/layout.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/Form/fields/layout.tsx rename to pkgs/clan-app/ui/src/Form/fields/layout.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/Form/fieldset/index.tsx b/pkgs/clan-app/ui/src/Form/fieldset/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/Form/fieldset/index.tsx rename to pkgs/clan-app/ui/src/Form/fieldset/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/Form/form/index.tsx b/pkgs/clan-app/ui/src/Form/form/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/Form/form/index.tsx rename to pkgs/clan-app/ui/src/Form/form/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/api/index.tsx b/pkgs/clan-app/ui/src/api/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/api/index.tsx rename to pkgs/clan-app/ui/src/api/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/api/inventory.ts b/pkgs/clan-app/ui/src/api/inventory.ts similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/api/inventory.ts rename to pkgs/clan-app/ui/src/api/inventory.ts diff --git a/pkgs/clan-app/webview-ui/app/src/api/wifi.ts b/pkgs/clan-app/ui/src/api/wifi.ts similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/api/wifi.ts rename to pkgs/clan-app/ui/src/api/wifi.ts diff --git a/pkgs/clan-app/webview-ui/app/src/api_test.tsx b/pkgs/clan-app/ui/src/api_test.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/api_test.tsx rename to pkgs/clan-app/ui/src/api_test.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/BackButton.tsx b/pkgs/clan-app/ui/src/components/BackButton.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/BackButton.tsx rename to pkgs/clan-app/ui/src/components/BackButton.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/FileInput.tsx b/pkgs/clan-app/ui/src/components/FileInput.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/FileInput.tsx rename to pkgs/clan-app/ui/src/components/FileInput.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/Helpers/List.tsx b/pkgs/clan-app/ui/src/components/Helpers/List.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Helpers/List.tsx rename to pkgs/clan-app/ui/src/components/Helpers/List.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/Helpers/index.tsx b/pkgs/clan-app/ui/src/components/Helpers/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Helpers/index.tsx rename to pkgs/clan-app/ui/src/components/Helpers/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/Menu.tsx b/pkgs/clan-app/ui/src/components/Menu.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Menu.tsx rename to pkgs/clan-app/ui/src/components/Menu.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/SelectInput.tsx b/pkgs/clan-app/ui/src/components/SelectInput.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/SelectInput.tsx rename to pkgs/clan-app/ui/src/components/SelectInput.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/Sidebar/SidebarFlyout/index.tsx b/pkgs/clan-app/ui/src/components/Sidebar/SidebarFlyout/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Sidebar/SidebarFlyout/index.tsx rename to pkgs/clan-app/ui/src/components/Sidebar/SidebarFlyout/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/Sidebar/SidebarHeader.tsx b/pkgs/clan-app/ui/src/components/Sidebar/SidebarHeader.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Sidebar/SidebarHeader.tsx rename to pkgs/clan-app/ui/src/components/Sidebar/SidebarHeader.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/Sidebar/SidebarListItem.tsx b/pkgs/clan-app/ui/src/components/Sidebar/SidebarListItem.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Sidebar/SidebarListItem.tsx rename to pkgs/clan-app/ui/src/components/Sidebar/SidebarListItem.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/Sidebar/css/sidebar-flyout.css b/pkgs/clan-app/ui/src/components/Sidebar/css/sidebar-flyout.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Sidebar/css/sidebar-flyout.css rename to pkgs/clan-app/ui/src/components/Sidebar/css/sidebar-flyout.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/Sidebar/css/sidebar-header.css b/pkgs/clan-app/ui/src/components/Sidebar/css/sidebar-header.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Sidebar/css/sidebar-header.css rename to pkgs/clan-app/ui/src/components/Sidebar/css/sidebar-header.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/Sidebar/css/sidebar-list-item.css b/pkgs/clan-app/ui/src/components/Sidebar/css/sidebar-list-item.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Sidebar/css/sidebar-list-item.css rename to pkgs/clan-app/ui/src/components/Sidebar/css/sidebar-list-item.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/Sidebar/css/sidebar-profile.css b/pkgs/clan-app/ui/src/components/Sidebar/css/sidebar-profile.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Sidebar/css/sidebar-profile.css rename to pkgs/clan-app/ui/src/components/Sidebar/css/sidebar-profile.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/Sidebar/css/sidebar.css b/pkgs/clan-app/ui/src/components/Sidebar/css/sidebar.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Sidebar/css/sidebar.css rename to pkgs/clan-app/ui/src/components/Sidebar/css/sidebar.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/Sidebar/index.tsx b/pkgs/clan-app/ui/src/components/Sidebar/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Sidebar/index.tsx rename to pkgs/clan-app/ui/src/components/Sidebar/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/Typography/css/typography-color.css b/pkgs/clan-app/ui/src/components/Typography/css/typography-color.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Typography/css/typography-color.css rename to pkgs/clan-app/ui/src/components/Typography/css/typography-color.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/Typography/css/typography-hierarchy/index.css b/pkgs/clan-app/ui/src/components/Typography/css/typography-hierarchy/index.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Typography/css/typography-hierarchy/index.css rename to pkgs/clan-app/ui/src/components/Typography/css/typography-hierarchy/index.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/Typography/css/typography-hierarchy/typography-body.css b/pkgs/clan-app/ui/src/components/Typography/css/typography-hierarchy/typography-body.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Typography/css/typography-hierarchy/typography-body.css rename to pkgs/clan-app/ui/src/components/Typography/css/typography-hierarchy/typography-body.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/Typography/css/typography-hierarchy/typography-headline.css b/pkgs/clan-app/ui/src/components/Typography/css/typography-hierarchy/typography-headline.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Typography/css/typography-hierarchy/typography-headline.css rename to pkgs/clan-app/ui/src/components/Typography/css/typography-hierarchy/typography-headline.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/Typography/css/typography-hierarchy/typography-label.css b/pkgs/clan-app/ui/src/components/Typography/css/typography-hierarchy/typography-label.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Typography/css/typography-hierarchy/typography-label.css rename to pkgs/clan-app/ui/src/components/Typography/css/typography-hierarchy/typography-label.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/Typography/css/typography-hierarchy/typography-title.css b/pkgs/clan-app/ui/src/components/Typography/css/typography-hierarchy/typography-title.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Typography/css/typography-hierarchy/typography-title.css rename to pkgs/clan-app/ui/src/components/Typography/css/typography-hierarchy/typography-title.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/Typography/css/typography.css b/pkgs/clan-app/ui/src/components/Typography/css/typography.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Typography/css/typography.css rename to pkgs/clan-app/ui/src/components/Typography/css/typography.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/Typography/index.tsx b/pkgs/clan-app/ui/src/components/Typography/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/Typography/index.tsx rename to pkgs/clan-app/ui/src/components/Typography/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/accordion/accordion.css b/pkgs/clan-app/ui/src/components/accordion/accordion.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/accordion/accordion.css rename to pkgs/clan-app/ui/src/components/accordion/accordion.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/accordion/index.tsx b/pkgs/clan-app/ui/src/components/accordion/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/accordion/index.tsx rename to pkgs/clan-app/ui/src/components/accordion/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/badge/index.tsx b/pkgs/clan-app/ui/src/components/badge/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/badge/index.tsx rename to pkgs/clan-app/ui/src/components/badge/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/button/button.examples.tsx b/pkgs/clan-app/ui/src/components/button/button.examples.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/button/button.examples.tsx rename to pkgs/clan-app/ui/src/components/button/button.examples.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/button/css/button-dark.css b/pkgs/clan-app/ui/src/components/button/css/button-dark.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/button/css/button-dark.css rename to pkgs/clan-app/ui/src/components/button/css/button-dark.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/button/css/button-ghost.css b/pkgs/clan-app/ui/src/components/button/css/button-ghost.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/button/css/button-ghost.css rename to pkgs/clan-app/ui/src/components/button/css/button-ghost.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/button/css/button-light.css b/pkgs/clan-app/ui/src/components/button/css/button-light.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/button/css/button-light.css rename to pkgs/clan-app/ui/src/components/button/css/button-light.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/button/css/index.css b/pkgs/clan-app/ui/src/components/button/css/index.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/button/css/index.css rename to pkgs/clan-app/ui/src/components/button/css/index.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/button/index.tsx b/pkgs/clan-app/ui/src/components/button/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/button/index.tsx rename to pkgs/clan-app/ui/src/components/button/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/fileSelect/index.tsx b/pkgs/clan-app/ui/src/components/fileSelect/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/fileSelect/index.tsx rename to pkgs/clan-app/ui/src/components/fileSelect/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/group/index.tsx b/pkgs/clan-app/ui/src/components/group/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/group/index.tsx rename to pkgs/clan-app/ui/src/components/group/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/icon/index.tsx b/pkgs/clan-app/ui/src/components/icon/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/icon/index.tsx rename to pkgs/clan-app/ui/src/components/icon/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/inputBase/index.tsx b/pkgs/clan-app/ui/src/components/inputBase/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/inputBase/index.tsx rename to pkgs/clan-app/ui/src/components/inputBase/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/machine-list-item/css/index.css b/pkgs/clan-app/ui/src/components/machine-list-item/css/index.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/machine-list-item/css/index.css rename to pkgs/clan-app/ui/src/components/machine-list-item/css/index.css diff --git a/pkgs/clan-app/webview-ui/app/src/components/machine-list-item/index.tsx b/pkgs/clan-app/ui/src/components/machine-list-item/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/machine-list-item/index.tsx rename to pkgs/clan-app/ui/src/components/machine-list-item/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/modal/index.tsx b/pkgs/clan-app/ui/src/components/modal/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/modal/index.tsx rename to pkgs/clan-app/ui/src/components/modal/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/noiseThumbnail/index.tsx b/pkgs/clan-app/ui/src/components/noiseThumbnail/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/noiseThumbnail/index.tsx rename to pkgs/clan-app/ui/src/components/noiseThumbnail/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/components/toast/index.tsx b/pkgs/clan-app/ui/src/components/toast/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/components/toast/index.tsx rename to pkgs/clan-app/ui/src/components/toast/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/floating/index.tsx b/pkgs/clan-app/ui/src/floating/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/floating/index.tsx rename to pkgs/clan-app/ui/src/floating/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/hooks/index.ts b/pkgs/clan-app/ui/src/hooks/index.ts similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/hooks/index.ts rename to pkgs/clan-app/ui/src/hooks/index.ts diff --git a/pkgs/clan-app/webview-ui/app/src/index.css b/pkgs/clan-app/ui/src/index.css similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/index.css rename to pkgs/clan-app/ui/src/index.css diff --git a/pkgs/clan-app/webview-ui/app/src/index.tsx b/pkgs/clan-app/ui/src/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/index.tsx rename to pkgs/clan-app/ui/src/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/layout/header.tsx b/pkgs/clan-app/ui/src/layout/header.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/layout/header.tsx rename to pkgs/clan-app/ui/src/layout/header.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/layout/layout.tsx b/pkgs/clan-app/ui/src/layout/layout.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/layout/layout.tsx rename to pkgs/clan-app/ui/src/layout/layout.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/queries/index.ts b/pkgs/clan-app/ui/src/queries/index.ts similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/queries/index.ts rename to pkgs/clan-app/ui/src/queries/index.ts diff --git a/pkgs/clan-app/webview-ui/app/src/routes/clans/create.tsx b/pkgs/clan-app/ui/src/routes/clans/create.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/clans/create.tsx rename to pkgs/clan-app/ui/src/routes/clans/create.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/clans/details.tsx b/pkgs/clan-app/ui/src/routes/clans/details.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/clans/details.tsx rename to pkgs/clan-app/ui/src/routes/clans/details.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/clans/index.ts b/pkgs/clan-app/ui/src/routes/clans/index.ts similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/clans/index.ts rename to pkgs/clan-app/ui/src/routes/clans/index.ts diff --git a/pkgs/clan-app/webview-ui/app/src/routes/clans/list.tsx b/pkgs/clan-app/ui/src/routes/clans/list.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/clans/list.tsx rename to pkgs/clan-app/ui/src/routes/clans/list.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/colors/view.tsx b/pkgs/clan-app/ui/src/routes/colors/view.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/colors/view.tsx rename to pkgs/clan-app/ui/src/routes/colors/view.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/components/index.tsx b/pkgs/clan-app/ui/src/routes/components/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/components/index.tsx rename to pkgs/clan-app/ui/src/routes/components/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/deploy/index.tsx b/pkgs/clan-app/ui/src/routes/deploy/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/deploy/index.tsx rename to pkgs/clan-app/ui/src/routes/deploy/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/disk/view.tsx b/pkgs/clan-app/ui/src/routes/disk/view.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/disk/view.tsx rename to pkgs/clan-app/ui/src/routes/disk/view.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/flash/view.tsx b/pkgs/clan-app/ui/src/routes/flash/view.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/flash/view.tsx rename to pkgs/clan-app/ui/src/routes/flash/view.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/hosts/view.tsx b/pkgs/clan-app/ui/src/routes/hosts/view.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/hosts/view.tsx rename to pkgs/clan-app/ui/src/routes/hosts/view.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/machines/avatar.tsx b/pkgs/clan-app/ui/src/routes/machines/avatar.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/machines/avatar.tsx rename to pkgs/clan-app/ui/src/routes/machines/avatar.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/machines/create.tsx b/pkgs/clan-app/ui/src/routes/machines/create.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/machines/create.tsx rename to pkgs/clan-app/ui/src/routes/machines/create.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/machines/details.tsx b/pkgs/clan-app/ui/src/routes/machines/details.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/machines/details.tsx rename to pkgs/clan-app/ui/src/routes/machines/details.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/machines/index.ts b/pkgs/clan-app/ui/src/routes/machines/index.ts similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/machines/index.ts rename to pkgs/clan-app/ui/src/routes/machines/index.ts diff --git a/pkgs/clan-app/webview-ui/app/src/routes/machines/install/disk-step.tsx b/pkgs/clan-app/ui/src/routes/machines/install/disk-step.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/machines/install/disk-step.tsx rename to pkgs/clan-app/ui/src/routes/machines/install/disk-step.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/machines/install/hardware-step.tsx b/pkgs/clan-app/ui/src/routes/machines/install/hardware-step.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/machines/install/hardware-step.tsx rename to pkgs/clan-app/ui/src/routes/machines/install/hardware-step.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/machines/install/summary-step.tsx b/pkgs/clan-app/ui/src/routes/machines/install/summary-step.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/machines/install/summary-step.tsx rename to pkgs/clan-app/ui/src/routes/machines/install/summary-step.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/machines/install/vars-step.tsx b/pkgs/clan-app/ui/src/routes/machines/install/vars-step.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/machines/install/vars-step.tsx rename to pkgs/clan-app/ui/src/routes/machines/install/vars-step.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/machines/list.tsx b/pkgs/clan-app/ui/src/routes/machines/list.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/machines/list.tsx rename to pkgs/clan-app/ui/src/routes/machines/list.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/modules/add.tsx b/pkgs/clan-app/ui/src/routes/modules/add.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/modules/add.tsx rename to pkgs/clan-app/ui/src/routes/modules/add.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/modules/details.tsx b/pkgs/clan-app/ui/src/routes/modules/details.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/modules/details.tsx rename to pkgs/clan-app/ui/src/routes/modules/details.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/modules/list.tsx b/pkgs/clan-app/ui/src/routes/modules/list.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/modules/list.tsx rename to pkgs/clan-app/ui/src/routes/modules/list.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/routes/welcome/index.tsx b/pkgs/clan-app/ui/src/routes/welcome/index.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/routes/welcome/index.tsx rename to pkgs/clan-app/ui/src/routes/welcome/index.tsx diff --git a/pkgs/clan-app/webview-ui/app/src/three.tsx b/pkgs/clan-app/ui/src/three.tsx similarity index 100% rename from pkgs/clan-app/webview-ui/app/src/three.tsx rename to pkgs/clan-app/ui/src/three.tsx diff --git a/pkgs/clan-app/webview-ui/app/stylelint.config.js b/pkgs/clan-app/ui/stylelint.config.js similarity index 100% rename from pkgs/clan-app/webview-ui/app/stylelint.config.js rename to pkgs/clan-app/ui/stylelint.config.js diff --git a/pkgs/clan-app/webview-ui/app/tailwind.config.ts b/pkgs/clan-app/ui/tailwind.config.ts similarity index 100% rename from pkgs/clan-app/webview-ui/app/tailwind.config.ts rename to pkgs/clan-app/ui/tailwind.config.ts diff --git a/pkgs/clan-app/webview-ui/app/tailwind/core-plugin.ts b/pkgs/clan-app/ui/tailwind/core-plugin.ts similarity index 100% rename from pkgs/clan-app/webview-ui/app/tailwind/core-plugin.ts rename to pkgs/clan-app/ui/tailwind/core-plugin.ts diff --git a/pkgs/clan-app/webview-ui/app/tailwind/typography.ts b/pkgs/clan-app/ui/tailwind/typography.ts similarity index 100% rename from pkgs/clan-app/webview-ui/app/tailwind/typography.ts rename to pkgs/clan-app/ui/tailwind/typography.ts diff --git a/pkgs/clan-app/webview-ui/app/tests/types.test.ts b/pkgs/clan-app/ui/tests/types.test.ts similarity index 100% rename from pkgs/clan-app/webview-ui/app/tests/types.test.ts rename to pkgs/clan-app/ui/tests/types.test.ts diff --git a/pkgs/clan-app/webview-ui/app/tsconfig.json b/pkgs/clan-app/ui/tsconfig.json similarity index 100% rename from pkgs/clan-app/webview-ui/app/tsconfig.json rename to pkgs/clan-app/ui/tsconfig.json diff --git a/pkgs/clan-app/webview-ui/app/util.ts b/pkgs/clan-app/ui/util.ts similarity index 100% rename from pkgs/clan-app/webview-ui/app/util.ts rename to pkgs/clan-app/ui/util.ts diff --git a/pkgs/clan-app/webview-ui/app/vite.config.ts b/pkgs/clan-app/ui/vite.config.ts similarity index 100% rename from pkgs/clan-app/webview-ui/app/vite.config.ts rename to pkgs/clan-app/ui/vite.config.ts diff --git a/pkgs/clan-app/webview-ui/flake-module.nix b/pkgs/clan-app/webview-ui/flake-module.nix deleted file mode 100644 index 95e3fafb9..000000000 --- a/pkgs/clan-app/webview-ui/flake-module.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ ... }: -{ - perSystem = - { - pkgs, - config, - self', - ... - }: - { - packages.fonts = - let - # 400 -> Regular - archivoRegular = pkgs.fetchurl { - url = "https://github.com/Omnibus-Type/Archivo/raw/b5d63988ce19d044d3e10362de730af00526b672/fonts/webfonts/ArchivoSemiCondensed-Regular.woff2"; - hash = "sha256-3PeB6tMpbYxR9JFyQ+yjpM7bAvZIjcJ4eBiHr9iV5p4="; - }; - # 500 -> Medium - archivoMedium = pkgs.fetchurl { - url = "https://github.com/Omnibus-Type/Archivo/raw/b5d63988ce19d044d3e10362de730af00526b672/fonts/webfonts/ArchivoSemiCondensed-Medium.woff2"; - hash = "sha256-IKaY3YhpmjMaIVUpwKRLd6eFiIihBoAP99I/pwmyll8="; - }; - # 600 -> SemiBold - archivoSemiBold = pkgs.fetchurl { - url = "https://github.com/Omnibus-Type/Archivo/raw/b5d63988ce19d044d3e10362de730af00526b672/fonts/webfonts/ArchivoSemiCondensed-SemiBold.woff2"; - hash = "sha256-fOE+b+UeTRoj+sDdUWR1pPCZVn0ABy6FEDDmXrOA4LY="; - }; - in - pkgs.runCommand "" { } '' - mkdir -p $out - cp ${archivoRegular} $out/ArchivoSemiCondensed-Regular.woff2 - cp ${archivoMedium} $out/ArchivoSemiCondensed-Medium.woff2 - cp ${archivoSemiBold} $out/ArchivoSemiCondensed-SemiBold.woff2 - ''; - packages.webview-ui = pkgs.buildNpmPackage { - pname = "clan-webview-ui"; - version = "0.0.1"; - nodejs = pkgs.nodejs_20; - src = ./app; - - npmDeps = pkgs.importNpmLock { npmRoot = ./app; }; - npmConfigHook = pkgs.importNpmLock.npmConfigHook; - - preBuild = '' - mkdir -p api - cp -r ${config.packages.clan-ts-api}/* api - cp -r ${self'.packages.fonts} ".fonts" - ''; - }; - devShells.webview-ui = pkgs.mkShell { - name = "clan-webview-ui"; - inputsFrom = [ - config.packages.webview-ui - self'.devShells.default - ]; - packages = [ - # required for reload-python-api.sh script - pkgs.python3 - pkgs.json2ts - ]; - shellHook = '' - export GIT_ROOT="$(git rev-parse --show-toplevel)" - export PKG_ROOT="$GIT_ROOT/pkgs/ui/webview-ui" - export NODE_PATH="$PKG_ROOT/app/node_modules" - - scriptsPath="$PKG_ROOT/bin" - export PATH="$NODE_PATH/.bin:$scriptsPath:$PATH" - - cp -r ${self'.packages.fonts} "$PKG_ROOT/app/.fonts" - chmod -R +w "$PKG_ROOT/app/.fonts" - - # Define the yellow color code - YELLOW='\033[1;33m' - # Define the reset color code - NC='\033[0m' - - # Check if the directory does not exist - if [ ! -d "$PKG_ROOT/app/node_modules" ]; then - echo -e "$YELLOW The directory $PKG_ROOT/app/node_modules does not exist.$NC" - echo -e "$YELLOW Please run 'npm install' in the app directory.$NC" - echo -e "$YELLOW This will install the necessary dependencies.$NC" - echo -e "$YELLOW To serve the webview run 'vite'.$NC" - else - echo "The directory $PKG_ROOT/app/node_modules exists." - fi - - - mkdir -p ./app/api - cp -r ${config.packages.clan-ts-api}/* app/api - chmod -R +w app/api - ''; - }; - }; -} diff --git a/pkgs/icon-update/default.nix b/pkgs/icon-update/default.nix index 90df7cd64..17c02338a 100644 --- a/pkgs/icon-update/default.nix +++ b/pkgs/icon-update/default.nix @@ -13,7 +13,7 @@ pkgs.writeShellApplication { text = '' REPO_ROOT="$(git rev-parse --show-toplevel)" - OUT_DIR="$(realpath "$REPO_ROOT"/pkgs/ui/webview-ui/app/icons)" + OUT_DIR="$(realpath "$REPO_ROOT"/pkgs/clan-app/ui/app/icons)" export OUT_DIR deno run --allow-all ${src}/main.ts ''; diff --git a/renovate.json b/renovate.json index 06094a0fa..e34c61512 100644 --- a/renovate.json +++ b/renovate.json @@ -8,7 +8,7 @@ "packageRules": [ { "matchManagers": ["npm"], - "matchPaths": ["pkgs/webview-ui/**"], + "matchPaths": ["pkgs/clan-app/ui/**"], "enabled": false } ]