From f754b88ae479540cca90c1cca07ba9c9ee4be7ba Mon Sep 17 00:00:00 2001 From: Brian McGee Date: Thu, 14 Aug 2025 14:28:23 +0100 Subject: [PATCH] chore(ui): general cleanup --- .../ui/logos/darknet-builder-logo.svg | 1 - pkgs/clan-app/ui/logos/darknet.svg | 43 ------------------- .../ui/src/components/Button/Button.tsx | 2 +- .../ui/src/components/Logo/Logo.stories.tsx | 2 +- pkgs/clan-app/ui/src/components/Logo/Logo.tsx | 2 - .../ui/src/routes/Onboarding/Onboarding.css | 18 -------- .../ui/src/routes/Onboarding/Onboarding.tsx | 33 ++------------ pkgs/clan-app/ui/src/scene/splash.module.css | 4 +- pkgs/clan-app/ui/src/scene/splash.tsx | 11 ++--- .../src/workflows/Install/steps/Initial.tsx | 2 +- .../workflows/Install/steps/installSteps.tsx | 1 - pkgs/clan-app/ui/tailwind/core-plugin.ts | 2 - 12 files changed, 10 insertions(+), 111 deletions(-) delete mode 100644 pkgs/clan-app/ui/logos/darknet-builder-logo.svg delete mode 100644 pkgs/clan-app/ui/logos/darknet.svg diff --git a/pkgs/clan-app/ui/logos/darknet-builder-logo.svg b/pkgs/clan-app/ui/logos/darknet-builder-logo.svg deleted file mode 100644 index 943a9a1bb..000000000 --- a/pkgs/clan-app/ui/logos/darknet-builder-logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/pkgs/clan-app/ui/logos/darknet.svg b/pkgs/clan-app/ui/logos/darknet.svg deleted file mode 100644 index 7d262fa5e..000000000 --- a/pkgs/clan-app/ui/logos/darknet.svg +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pkgs/clan-app/ui/src/components/Button/Button.tsx b/pkgs/clan-app/ui/src/components/Button/Button.tsx index 86e394cbf..78396338f 100644 --- a/pkgs/clan-app/ui/src/components/Button/Button.tsx +++ b/pkgs/clan-app/ui/src/components/Button/Button.tsx @@ -1,4 +1,4 @@ -import { splitProps, type JSX, createSignal } from "solid-js"; +import { splitProps, type JSX } from "solid-js"; import cx from "classnames"; import { Typography } from "../Typography/Typography"; import { Button as KobalteButton } from "@kobalte/core/button"; diff --git a/pkgs/clan-app/ui/src/components/Logo/Logo.stories.tsx b/pkgs/clan-app/ui/src/components/Logo/Logo.stories.tsx index 44bccf122..184fc7dec 100644 --- a/pkgs/clan-app/ui/src/components/Logo/Logo.stories.tsx +++ b/pkgs/clan-app/ui/src/components/Logo/Logo.stories.tsx @@ -3,7 +3,7 @@ import { Component, For } from "solid-js"; import { Logo, LogoProps, LogoVariant } from "./Logo"; import cx from "classnames"; -const variants: LogoVariant[] = ["Clan", "Darknet"]; +const variants: LogoVariant[] = ["Clan"]; const LogoExamples: Component = (props) => (
diff --git a/pkgs/clan-app/ui/src/components/Logo/Logo.tsx b/pkgs/clan-app/ui/src/components/Logo/Logo.tsx index 5ee2cb31e..6e45e1a47 100644 --- a/pkgs/clan-app/ui/src/components/Logo/Logo.tsx +++ b/pkgs/clan-app/ui/src/components/Logo/Logo.tsx @@ -1,5 +1,4 @@ import Clan from "@/logos/clan.svg"; -import Darknet from "@/logos/darknet.svg"; import { Dynamic } from "solid-js/web"; import { Color, fgClass } from "@/src/components/colors"; import { JSX, splitProps } from "solid-js"; @@ -7,7 +6,6 @@ import cx from "classnames"; const logos = { Clan, - Darknet, }; export type LogoVariant = keyof typeof logos; diff --git a/pkgs/clan-app/ui/src/routes/Onboarding/Onboarding.css b/pkgs/clan-app/ui/src/routes/Onboarding/Onboarding.css index 07f085da8..1119b1906 100644 --- a/pkgs/clan-app/ui/src/routes/Onboarding/Onboarding.css +++ b/pkgs/clan-app/ui/src/routes/Onboarding/Onboarding.css @@ -29,28 +29,10 @@ main#welcome { @apply absolute top-0 left-0 w-full h-full; } - svg[data-logo-name="Darknet"] { - @apply w-52; - @apply absolute top-28 left-1/2 transform -translate-x-1/2; - } - svg[data-logo-name="Clan"] { @apply w-16; @apply absolute bottom-28 left-1/2 transform -translate-x-1/2; } - - div.darknet-info { - @apply absolute bottom-[6.5rem] left-12; - @apply flex flex-col gap-y-2; - - span.darknet-label { - color: theme(colors.off.darknet_label); - } - - span.darknet-name { - color: theme(colors.off.darknet_name); - } - } } & > div.container { diff --git a/pkgs/clan-app/ui/src/routes/Onboarding/Onboarding.tsx b/pkgs/clan-app/ui/src/routes/Onboarding/Onboarding.tsx index c7770a20d..c50edfbb2 100644 --- a/pkgs/clan-app/ui/src/routes/Onboarding/Onboarding.tsx +++ b/pkgs/clan-app/ui/src/routes/Onboarding/Onboarding.tsx @@ -4,7 +4,6 @@ import { createSignal, Match, Setter, - Show, Switch, } from "solid-js"; import { RouteSectionProps, useNavigate } from "@solidjs/router"; @@ -22,7 +21,6 @@ import { FormStore, getError, getErrors, - getValue, SubmitHandler, valiForm, } from "@modular-forms/solid"; @@ -62,33 +60,7 @@ const background = (props: { state: State; form: FormStore }) => (
- - -
- - Your Darknet: - - - {getValue(props.form, "name")} - -
-
); @@ -117,8 +89,9 @@ const welcome = (props: { align="center" inverted={true} > - Build your
- own darknet + Build your own +
+ Clan {props.welcomeError() && ( (
- - - - - - - Loading new Clan + + Loading Clan +
); diff --git a/pkgs/clan-app/ui/src/workflows/Install/steps/Initial.tsx b/pkgs/clan-app/ui/src/workflows/Install/steps/Initial.tsx index 9e709955f..8c048fd8c 100644 --- a/pkgs/clan-app/ui/src/workflows/Install/steps/Initial.tsx +++ b/pkgs/clan-app/ui/src/workflows/Install/steps/Initial.tsx @@ -7,7 +7,7 @@ import { StepLayout } from "../../Steps"; const ChoiceLocalOrRemote = () => { const stepSignal = useStepper(); return ( -
+
diff --git a/pkgs/clan-app/ui/src/workflows/Install/steps/installSteps.tsx b/pkgs/clan-app/ui/src/workflows/Install/steps/installSteps.tsx index f2a9dcb51..3b288d4a4 100644 --- a/pkgs/clan-app/ui/src/workflows/Install/steps/installSteps.tsx +++ b/pkgs/clan-app/ui/src/workflows/Install/steps/installSteps.tsx @@ -30,7 +30,6 @@ import { import { useClanURI } from "@/src/hooks/clan"; import { useApiClient } from "@/src/hooks/ApiClient"; import { ProcessMessage, useNotifyOrigin } from "@/src/hooks/notify"; -import { Loader } from "@/src/components/Loader/Loader"; export const InstallHeader = (props: { machineName: string }) => { return ( diff --git a/pkgs/clan-app/ui/tailwind/core-plugin.ts b/pkgs/clan-app/ui/tailwind/core-plugin.ts index 4e1a6d74f..8eb63566b 100644 --- a/pkgs/clan-app/ui/tailwind/core-plugin.ts +++ b/pkgs/clan-app/ui/tailwind/core-plugin.ts @@ -11,8 +11,6 @@ const primaries = { off: { white: toRGB("#ffffff"), black: toRGB("#000000"), - darknet_name: toRGB("#00ff57"), - darknet_label: toRGB("#2cff74"), toolbar_border: toRGB("#2e4a4b"), }, primary: {