gm-dash/ui/src/Dashboard.tsx

@@ -1,9 +1,10 @@
 import './Dashboard.css';
+import Card from './components/Card/Card';
+import Launcher from './components/Launcher/Launcher';
 import Launchpad from './components/Launchpad/Launchpad';
 
-const LightThemes = () =>
+const LightThemes = () => <Card name="Light Themes">
     <Launchpad
-        title="Lights"
         exclusive={true}
         options={[
             { title: "Dark reds" },
@@ -12,10 +13,18 @@ const LightThemes = () =>
             { title: "Darkness" },
         ]}
     />
+</Card>
 
-const Tracks = () =>
+const LightSetup = () => <div> </div>
+
+interface LightProps {
+    name: string,
+}
+
+const Light = ({ name }: LightProps) => <div> <p> {name} </p> </div>
+
+const Tracks = () => <Card name="Tracks">
     <Launchpad
-        title="Tracks"
         exclusive={false}
         options={[
             { title: "City BGM" },
@@ -24,10 +33,15 @@ const Tracks = () =>
             { title: "Water dripping" },
         ]}
     />
+</Card>
 
-const Presets = () =>
+interface TrackProps {
+    name: string,
+}
+const Track = ({ name }: TrackProps) => <Launcher title={name} />
+
+const Presets = () => <Card name="Presets">
     <Launchpad
-        title="Presets"
         exclusive={true}
         options={[
             { title: "Gilcrest Falls day" },
@@ -36,6 +50,15 @@ const Presets = () =>
             { title: "Surk colony" },
         ]}
     />
+</Card>
+
+interface PresetProps {
+    name: string
+}
+
+// const Scene = ({ name }: PresetProps) => <Launcher title={name} activated={false} />
+
+const SceneEditor = () => <div> </div>
 
 const Dashboard = () => {
     return (

gm-dash/ui/src/components/Card/Card.tsx

@@ -2,12 +2,12 @@ import { PropsWithChildren } from 'react';
 import './Card.css';
 
 interface CardProps {
-    title: string,
+    name: string,
 }
 
-const Card = ({ title, children }: PropsWithChildren<CardProps>) => (
+const Card = ({ name, children }: PropsWithChildren<CardProps>) => (
     <div className="card">
-        <h1 className="card__title"> {title} </h1>
+        <h1 className="card__title"> {name} </h1>
         <div className="card__body">
             {children}
         </div>

gm-dash/ui/src/components/Launcher/Launcher.css

@@ -0,0 +1,11 @@
+.activator {
+    border: 1px solid black;
+    border-radius: 5px;
+    margin: var(--spacer-m);
+    padding: var(--spacer-s);
+    box-shadow: var(--shadow-deep);
+}
+
+.activator_enabled {
+    box-shadow: var(--activator-ring);
+}

gm-dash/ui/src/components/Launcher/Launcher.tsx

@@ -0,0 +1,20 @@
+import './Launcher.css';
+import React from 'react';
+
+export interface LauncherProps {
+    title: string,
+    icon?: string,
+    activated?: boolean,
+    onSelected?: (key: string) => void,
+}
+
+const Launcher = ({ title, activated = false, onSelected = (key) => {} }: LauncherProps) => {
+    const classnames = activated ? "activator activator_enabled" : "activator";
+    console.log("classnames ", activated, classnames);
+    return (
+        <div className={classnames} onClick={() => onSelected(title)}>
+            <p> {title} </p>
+        </div>)
+}
+
+export default Launcher;

gm-dash/ui/src/components/Launchpad/Launchpad.css

@@ -1,14 +1,11 @@
 .launchpad {
+    display: flex;
     border: var(--border);
     border-radius: var(--border-radius);
     box-shadow: var(--shadow-depression);
     margin: var(--spacer-l);
 }
 
-.launchpad__title {
-    color: var(--title-color);
-}
-
 .launchpad_horizontal-flow {
     display: flex;
     flex-direction: row;

gm-dash/ui/src/components/Launchpad/Launchpad.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import './Launchpad.css';
-import { LaunchpadButton, LaunchpadButtonProps, EditPadButton } from '../LaunchpadButton/types';
+import Launcher, { LauncherProps } from '../Launcher/Launcher';
+import classnames from 'classnames';
 
 export interface Selectable {
     onSelected?: (key: string) => void;
@@ -9,10 +10,9 @@ export interface Selectable {
 export type Flow = "horizontal" | "vertical";
 
 interface LaunchpadProps {
-    title?: string;
     exclusive: boolean;
     flow?: Flow;
-    options: Array<LaunchpadButtonProps>;
+    options: Array<LauncherProps>;
 }
 
 const exclusiveSelect = (state: { [key: string]: boolean }, targetId: string) => {
@@ -28,20 +28,22 @@ const multiSelect = (state: { [key: string]: boolean }, targetId: string) => {
     }
 }
 
-const Launchpad = ({ title, flow = "horizontal", options, exclusive }: LaunchpadProps) => {
+const Launchpad = ({ flow = "horizontal", options, exclusive }: LaunchpadProps) => {
     const [selected, dispatch] = React.useReducer(exclusive ? exclusiveSelect : multiSelect, {});
 
+    let classOptions = [ "launchpad" ];
+
+    if (flow === "horizontal") {
+        classOptions.push("launchpad_horizontal-flow");
+    } else {
+        classOptions.push("launchpad_vertical-flow");
+    }
+
     let tiedOptions = options.map(option =>
-        <LaunchpadButton key={option.title} title={option.title} onSelected={(key: string) => dispatch(key)} activated={selected[option.title]} />
+        <Launcher key={option.title} title={option.title} onSelected={(key: string) => dispatch(key)} activated={selected[option.title]} />
     );
 
-    return (<div className="launchpad">
+    return (<div className={classnames(classOptions)}> {tiedOptions} </div>)
-        {title && <h1 className="launchpad__title"> {title} </h1>}
-        <div className={flow === "horizontal" ? "launchpad_horizontal-flow" : "launchpad_vertical-flow"}>
-            {tiedOptions}
-            <EditPadButton text="Add" />
-        </div>
-    </div>)
 }
 
 export default Launchpad;

gm-dash/ui/src/components/LaunchpadButton/styles.css

@@ -1,18 +0,0 @@
-.launchpad-button {
-    border: 1px solid black;
-    border-radius: var(--border-radius);
-    margin: var(--spacer-m);
-    padding: var(--spacer-s);
-    box-shadow: var(--shadow-deep);
-}
-
-.launchpad-button_enabled {
-    box-shadow: var(--activator-ring);
-}
-
-.edit-pad-button {
-    border: var(--border-faint);
-    border-radius: var(--border-radius);
-    margin: var(--spacer-m);
-    padding: var(--spacer-s);
-}

gm-dash/ui/src/components/LaunchpadButton/types.tsx

@@ -1,28 +0,0 @@
-import './styles.css';
-import React from 'react';
-
-export interface LaunchpadButtonProps {
-    title: string,
-    icon?: string,
-    activated?: boolean,
-    onSelected?: (key: string) => void,
-}
-
-export const LaunchpadButton = ({ title, activated = false, onSelected = (key) => { } }: LaunchpadButtonProps) => {
-    const classnames = activated ? "launchpad-button launchpad-button_enabled" : "launchpad-button";
-    return (
-        <div className={classnames} onClick={() => onSelected(title)}>
-            <p> {title} </p>
-        </div>)
-}
-
-export interface EditPadButtonProps {
-    text: string,
-    onSelected?: () => void,
-}
-
-export const EditPadButton = ({ text, onSelected = () => { } }: EditPadButtonProps) => (
-    <div className="edit-pad-button" onClick={() => onSelected()}>
-        <p> {text} </p>
-    </div>)
-

gm-dash/ui/src/index.css

@@ -20,7 +20,6 @@
     --title-color: var(--grey-1);
 
     --border: 1px solid var(--purple-1);
-    --border-faint: 1px solid var(--grey-4);
     --activator-ring: 0px 0px 8px 4px var(--blue-4);
     --shadow-depression: inset 1px 1px 2px 0px var(--purple-1);
     --shadow-shallow: 1px 1px 2px 0px var(--purple-1);

gm-dash/ui/src/index.tsx

@@ -1,8 +1,7 @@
-import './index.css';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
+import './index.css';
 import Dashboard from './Dashboard';
-import Setup from './pages/Setup';
 import Design from './Design';
 import reportWebVitals from './reportWebVitals';
 import { createBrowserRouter, RouterProvider } from 'react-router-dom';
@@ -15,10 +14,6 @@ const router = createBrowserRouter([
         path: "/",
         element: <Dashboard />,
     },
-    {
-        path: "/setup",
-        element: <Setup />,
-    },
     {
         path: "/design",
         element: <Design />,

gm-dash/ui/src/pages/Setup.tsx

@@ -1,15 +0,0 @@
-import './Setup.css'
-import Card from '../components/Card/Card';
-
-const Setup = () => (<div>
-    <h1> Setup </h1>
-
-    <Card title="Scenes" />
-    <Card title="Lights">
-        <p> Connect to nearby light systems </p>
-    </Card>
-    <Card title="Sounds">
-    </Card>
-</div>)
-
-export default Setup;