From 7dd249863fc67cee4327e0227a6da4547858de31 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Tue, 22 Apr 2025 15:24:52 +0200 Subject: [PATCH] Fix: remove daisyui We wanted to remove daisyui a long time ago Since renovate updates broke all of the classes somehow we use the opportunity to remove daisyui And will fix all the breakages continously as we work on the features --- pkgs/webview-ui/app/package-lock.json | 45 ----------------- pkgs/webview-ui/app/package.json | 1 - pkgs/webview-ui/app/src/Form/base/label.tsx | 2 +- .../webview-ui/app/src/Form/fields/Select.tsx | 4 +- pkgs/webview-ui/app/src/Form/form/index.tsx | 6 +-- .../app/src/components/FileInput.tsx | 12 ++--- .../app/src/components/MachineListItem.tsx | 8 +-- pkgs/webview-ui/app/src/components/Menu.tsx | 2 +- .../app/src/components/SelectInput.tsx | 14 +++--- .../app/src/components/inputBase/index.tsx | 2 +- pkgs/webview-ui/app/src/layout/header.tsx | 9 ++-- pkgs/webview-ui/app/src/layout/layout.tsx | 14 ++---- .../app/src/routes/clans/create.tsx | 42 +++++++--------- .../app/src/routes/clans/details.tsx | 49 ++++++++----------- pkgs/webview-ui/app/src/routes/clans/list.tsx | 36 +++++++------- pkgs/webview-ui/app/src/routes/flash/view.tsx | 6 +-- pkgs/webview-ui/app/src/routes/hosts/view.tsx | 30 ++++++------ .../app/src/routes/machines/avatar.tsx | 2 +- .../app/src/routes/machines/create.tsx | 8 ++- .../app/src/routes/machines/details.tsx | 27 +++++----- .../app/src/routes/machines/list.tsx | 22 ++++----- .../app/src/routes/modules/details.tsx | 10 ++-- .../app/src/routes/modules/list.tsx | 22 ++++----- .../app/src/routes/welcome/index.tsx | 6 +-- pkgs/webview-ui/app/tailwind.config.ts | 22 +-------- 25 files changed, 150 insertions(+), 251 deletions(-) diff --git a/pkgs/webview-ui/app/package-lock.json b/pkgs/webview-ui/app/package-lock.json index 93b85f1dc..4886ff03e 100644 --- a/pkgs/webview-ui/app/package-lock.json +++ b/pkgs/webview-ui/app/package-lock.json @@ -31,7 +31,6 @@ "@typescript-eslint/parser": "^7.10.0", "autoprefixer": "^10.4.19", "classnames": "^2.5.1", - "daisyui": "^4.11.1", "eslint": "^8.57.0", "eslint-plugin-tailwindcss": "^3.17.0", "jsdom": "^24.1.0", @@ -2837,16 +2836,6 @@ "url": "https://github.com/sponsors/fb55" } }, - "node_modules/css-selector-tokenizer": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.8.0.tgz", - "integrity": "sha512-Jd6Ig3/pe62/qe5SBPTN8h8LeUg/pT4lLgtavPf7updwwHpvFzxvOQBHYj2LZDMjUnBzgvIUSjRcf6oT5HzHFg==", - "dev": true, - "dependencies": { - "cssesc": "^3.0.0", - "fastparse": "^1.1.2" - } - }, "node_modules/css-tree": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", @@ -2946,34 +2935,6 @@ "integrity": "sha512-d4ZVpCW31eWwCMe1YT3ur7mUDnTXbgwyzaL320DrcRT45rfjYxkt5QWLrmOJ+/UEAI2+fQgKe/fCjR8l4TpRgw==", "dev": true }, - "node_modules/culori": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/culori/-/culori-3.3.0.tgz", - "integrity": "sha512-pHJg+jbuFsCjz9iclQBqyL3B2HLCBF71BwVNujUYEvCeQMvV97R59MNK3R2+jgJ3a1fcZgI9B3vYgz8lzr/BFQ==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - } - }, - "node_modules/daisyui": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/daisyui/-/daisyui-4.11.1.tgz", - "integrity": "sha512-obT9CUbQdW6eoHwSeT5VwaRrWlwrM4OT5qlfdJ0oQlSIEYhwnEl2+L2fwu5PioLbitwuMdYC2X8I1cyy8Pf6LQ==", - "dev": true, - "dependencies": { - "css-selector-tokenizer": "^0.8", - "culori": "^3", - "picocolors": "^1", - "postcss-js": "^4" - }, - "engines": { - "node": ">=16.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/daisyui" - } - }, "node_modules/data-urls": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", @@ -3626,12 +3587,6 @@ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" }, - "node_modules/fastparse": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz", - "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==", - "dev": true - }, "node_modules/fastq": { "version": "1.17.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", diff --git a/pkgs/webview-ui/app/package.json b/pkgs/webview-ui/app/package.json index b031a1bd6..8150b49ab 100644 --- a/pkgs/webview-ui/app/package.json +++ b/pkgs/webview-ui/app/package.json @@ -20,7 +20,6 @@ "@typescript-eslint/parser": "^7.10.0", "autoprefixer": "^10.4.19", "classnames": "^2.5.1", - "daisyui": "^4.11.1", "eslint": "^8.57.0", "eslint-plugin-tailwindcss": "^3.17.0", "jsdom": "^24.1.0", diff --git a/pkgs/webview-ui/app/src/Form/base/label.tsx b/pkgs/webview-ui/app/src/Form/base/label.tsx index 28cfb9b79..03873cced 100644 --- a/pkgs/webview-ui/app/src/Form/base/label.tsx +++ b/pkgs/webview-ui/app/src/Form/base/label.tsx @@ -5,7 +5,7 @@ interface LabelProps { } export const Label = (props: LabelProps) => (
{
{clan_dir}
-
+
-
{details.data?.name}
+
{details.data?.name}
 -
{details.data?.description}
+
{details.data?.description}
); @@ -139,19 +139,19 @@ const ClanItem = (props: ClanItemProps) => { export const ClanList = () => { const navigate = useNavigate(); return ( -
-
-
-
Registered Clans
+
+
+
+
Registered Clans
- + - +
-
+
{(value) => } diff --git a/pkgs/webview-ui/app/src/routes/flash/view.tsx b/pkgs/webview-ui/app/src/routes/flash/view.tsx index b97c639df..f09e6a50f 100644 --- a/pkgs/webview-ui/app/src/routes/flash/view.tsx +++ b/pkgs/webview-ui/app/src/routes/flash/view.tsx @@ -401,12 +401,12 @@ export const Flash = () => {
-
+
-
+
Advanced
-
+
{ return (
-
+
-
-
+
+
Actions
- + Installs the system for the first time. Used to bootstrap the remote device. -
+
- +
- + - +
- +