From cae63cc45d95145c07f81fc36483201e6772c3f2 Mon Sep 17 00:00:00 2001 From: Brian McGee Date: Tue, 19 Aug 2025 19:54:52 +0100 Subject: [PATCH 1/3] fix(ui): spelling mistake --- pkgs/clan-app/ui/src/workflows/Install/steps/installSteps.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 41d0511fe..66241a0da 100644 --- a/pkgs/clan-app/ui/src/workflows/Install/steps/installSteps.tsx +++ b/pkgs/clan-app/ui/src/workflows/Install/steps/installSteps.tsx @@ -671,7 +671,7 @@ const InstallProgress = () => { weight="bold" color="inherit" > - Machine is beeing installed + Machine is being installed Date: Tue, 19 Aug 2025 20:01:23 +0100 Subject: [PATCH 2/3] feat(ui): improve copy in create installer intro --- .../src/workflows/Install/steps/createInstaller.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/clan-app/ui/src/workflows/Install/steps/createInstaller.tsx b/pkgs/clan-app/ui/src/workflows/Install/steps/createInstaller.tsx index 9f0e829df..253582b67 100644 --- a/pkgs/clan-app/ui/src/workflows/Install/steps/createInstaller.tsx +++ b/pkgs/clan-app/ui/src/workflows/Install/steps/createInstaller.tsx @@ -56,11 +56,12 @@ const Prose = () => ( Let's walk through it. - In the following we will help you to write the clan installer - software to a USB-stick. This USB-stick will then be used to set - up the new machine. Get a USB-stick with at least 8GB of capacity, - and plug it into the machine on which you read this text. Note, - all data on the USB-Stick will be lost. + We will help you write the Clan Installer to a USB-stick or SD + card, which will then be used to set up the new machine. + + + Get a USB-stick or an SD card with at least 8GB of capacity, and + plug it into this machine.
From f339ca0d85d4a602e124227a62ad439067e3dfaa Mon Sep 17 00:00:00 2001 From: Brian McGee Date: Tue, 19 Aug 2025 20:52:20 +0100 Subject: [PATCH 3/3] feat(ui): allow installer splash screens to change modal size --- .../ui/src/components/Modal/Modal.tsx | 4 ++-- .../ui/src/workflows/Install/install.tsx | 23 ++++++++++++++++++- .../Install/steps/createInstaller.tsx | 20 ++++++++-------- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/pkgs/clan-app/ui/src/components/Modal/Modal.tsx b/pkgs/clan-app/ui/src/components/Modal/Modal.tsx index 86b0af901..cdca5d8c7 100644 --- a/pkgs/clan-app/ui/src/components/Modal/Modal.tsx +++ b/pkgs/clan-app/ui/src/components/Modal/Modal.tsx @@ -13,9 +13,9 @@ import Icon from "../Icon/Icon"; import cx from "classnames"; import { Dynamic } from "solid-js/web"; -export type ModalContextType = { +export interface ModalContextType { portalRef: HTMLDivElement; -}; +} const ModalContext = createContext(); diff --git a/pkgs/clan-app/ui/src/workflows/Install/install.tsx b/pkgs/clan-app/ui/src/workflows/Install/install.tsx index fccc98c97..3d38096cd 100644 --- a/pkgs/clan-app/ui/src/workflows/Install/install.tsx +++ b/pkgs/clan-app/ui/src/workflows/Install/install.tsx @@ -12,6 +12,8 @@ import { createInstallerSteps } from "./steps/createInstaller"; import { installSteps } from "./steps/installSteps"; import { ApiCall } from "@/src/hooks/api"; +import cx from "classnames"; + interface InstallStepperProps { onDone: () => void; } @@ -82,10 +84,29 @@ export const InstallModal = (props: InstallModalProps) => { set("install", { machineName: props.machineName }); + // allows each step to adjust the size of the modal + const sizeClasses = () => { + const defaultClass = "max-w-3xl h-[30rem]"; + + const currentStep = stepper.currentStep(); + if (!currentStep) { + return defaultClass; + } + + switch (currentStep.id) { + case "create:progress": + case "create:done": + return currentStep.class; + + default: + return defaultClass; + } + }; + return ( { console.log("Install modal closed"); diff --git a/pkgs/clan-app/ui/src/workflows/Install/steps/createInstaller.tsx b/pkgs/clan-app/ui/src/workflows/Install/steps/createInstaller.tsx index 253582b67..512ca5e3d 100644 --- a/pkgs/clan-app/ui/src/workflows/Install/steps/createInstaller.tsx +++ b/pkgs/clan-app/ui/src/workflows/Install/steps/createInstaller.tsx @@ -332,27 +332,27 @@ const FlashProgress = () => { return (
usb logo -
+
- USB stick is being flashed + Removable media is being flashed