bump version to 3.6.2-beta1

chore: add win32 target
2026-08-03 06:28:01 +00:00 · 2024-10-22 20:30:13 +02:00 · 2024-10-22 20:25:48 +02:00
250 changed files with 1641 additions and 3631 deletions
@@ -39,7 +39,6 @@ dist/
 # docker utils
 ontime-db
 ontime-external/
-ontime-data/

 # versioning file
 **/ONTIME_VERSION.js
@@ -91,7 +91,7 @@ While it should allow for a generic setup, it might need to be modified to fit y

 From the project root, run the following commands

- __Build docker image from__ by running `docker build -t getontime/ontime .`
+- __Build docker image from__ by running `docker build -t getontime/ontime`
 - __Run docker image from compose__ by running `docker-compose up -d`

 Other useful commands
@@ -1,6 +1,6 @@
 {
    "name": "@getontime/cli",
-    "version": "3.9.5",
+    "version": "3.6.2-beta1",
    "author": "Carlos Valente",
    "description": "Time keeping for live events",
    "repository": "https://github.com/cpvalente/ontime",
@@ -1,27 +1,37 @@
 <!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <base href="/" />
-    <link rel="icon" href="/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#101010" />
-    <meta name="ontime" content="ontime - time keeping for live events" />
-    <link rel="apple-touch-icon" href="/ontime-logo.png" />
-    <link rel="icon" type="image/png" href="/ontime-logo.png" />
-    <link rel="manifest" href="/site.webmanifest" />
-    <link rel="manifest" href="/manifest.json" />
-    <title>ontime</title>
-    <style>
-      body,
-      html {
-        background-color: rgba(0, 0, 0, 0) !important;
-      }
-    </style>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <script type="module" src="/src/index.tsx"></script>
-  </body>
+<html lang='en'>
+<head>
+  <meta charset='utf-8' />
+  <link rel='icon' href='/favicon.ico' />
+  <meta name='viewport' content='width=device-width, initial-scale=1' />
+  <meta name='theme-color' content='#121212' />
+  <meta name='ontime' content='ontime - event timer manager' />
+  <link rel='apple-touch-icon' href='/logo192.png' />
+  <link
+    rel='icon'
+    type='image/png'
+    sizes='32x32'
+    href='/favicon-32x32.png'
+  />
+  <link
+    rel='icon'
+    type='image/png'
+    sizes='16x16'
+    href='/favicon-16x16.png'
+  />
+  <link rel='manifest' href='/site.webmanifest' />
+  <link rel='manifest' href='/manifest.json' />
+  <title>ontime</title>
+  <style>
+    body,
+    html {
+      background-color: rgba(0, 0, 0, 0) !important;
+    }
+  </style>
+</head>
+<body>
+<noscript>You need to enable JavaScript to run this app.</noscript>
+<div id='root'></div>
+<script type='module' src='/src/index.tsx'></script>
+</body>
 </html>
@@ -1,6 +1,6 @@
 {
  "name": "ontime-ui",
-  "version": "3.9.5",
+  "version": "3.6.2-beta1",
  "private": true,
  "type": "module",
  "dependencies": {
@@ -11,7 +11,7 @@
    "@emotion/react": "^11.10.6",
    "@emotion/styled": "^11.10.6",
    "@fontsource/open-sans": "^5.0.28",
-    "@mantine/hooks": "^7.13.3",
+    "@mantine/hooks": "^7.6.2",
    "@react-icons/all-files": "^4.1.0",
    "@sentry/react": "^8.19.0",
    "@tanstack/react-query": "^5.17.9",
@@ -26,7 +26,7 @@
    "react-colorful": "^5.6.1",
    "react-dom": "^18.3.1",
    "react-fast-compare": "^3.2.2",
-    "react-hook-form": "^7.53.1",
+    "react-hook-form": "^7.49.2",
    "react-qr-code": "^2.0.12",
    "react-router-dom": "^6.3.0",
    "web-vitals": "^3.1.1",
@@ -39,7 +39,7 @@
    "build": "vite build",
    "build:local": "cross-env NODE_ENV=local vite build",
    "build:electron": "cross-env NODE_ENV=local vite build",
-    "build:docker": "cross-env VITE_IS_DOCKER=true vite build",
+    "build:docker": "vite build",
    "build:localdocker": "cross-env NODE_ENV=local vite build",
    "lint": "eslint . --quiet",
    "test": "vitest",
@@ -87,9 +87,9 @@
    "sass": "^1.57.1",
    "typescript": "catalog:",
    "vite": "^5.2.11",
-    "vite-plugin-compression2": "^1.3.3",
+    "vite-plugin-compression2": "^0.12.0",
    "vite-plugin-svgr": "^4.2.0",
    "vite-tsconfig-paths": "^4.3.1",
-    "vitest": "catalog:"
+    "vitest": "^1.6.0"
  }
 }
@@ -4,11 +4,18 @@
  "icons": [
    {
      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
      "type": "image/x-icon"
    },
    {
-      "src": "ontime-logo.png",
-      "type": "image/png"
+      "src": "logo192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "logo512.png",
+      "type": "image/png",
+      "sizes": "512x512"
    }
  ],
  "scope": "/",
@@ -11,7 +11,6 @@ import { connectSocket } from './common/utils/socket';
 import theme from './theme/theme';
 import { TranslationProvider } from './translation/TranslationProvider';
 import AppRouter from './AppRouter';
-import { baseURI } from './externals';

 connectSocket();

@@ -20,7 +19,7 @@ function App() {
    <ChakraProvider disableGlobalStyle resetCSS theme={theme}>
      <QueryClientProvider client={ontimeQueryClient}>
        <AppContextProvider>
-          <BrowserRouter basename={baseURI}>
+          <BrowserRouter>
            <div className='App'>
              <ErrorBoundary>
                <TranslationProvider>
@@ -19,7 +19,7 @@ import { ONTIME_VERSION } from './ONTIME_VERSION';
 import { sentryDsn, sentryRecommendedIgnore } from './sentry.config';

 const Editor = React.lazy(() => import('./features/editors/ProtectedEditor'));
-const Cuesheet = React.lazy(() => import('./views/cuesheet/ProtectedCuesheet'));
+const Cuesheet = React.lazy(() => import('./features/cuesheet/ProtectedCuesheet'));
 const Operator = React.lazy(() => import('./features/operator/OperatorExport'));

 const TimerView = React.lazy(() => import('./features/viewers/timer/Timer'));
@@ -32,14 +32,12 @@ const Timeline = React.lazy(() => import('./views/timeline/TimelinePage'));
 const Public = React.lazy(() => import('./features/viewers/public/Public'));
 const Lower = React.lazy(() => import('./features/viewers/lower-thirds/LowerThird'));
 const StudioClock = React.lazy(() => import('./features/viewers/studio/StudioClock'));
-const ProjectInfo = React.lazy(() => import('./views/project-info/ProjectInfo'));

 const STimer = withPreset(withData(TimerView));
 const SMinimalTimer = withPreset(withData(MinimalTimerView));
 const SClock = withPreset(withData(ClockView));
 const SCountdown = withPreset(withData(Countdown));
 const SBackstage = withPreset(withData(Backstage));
-const SProjectInfo = withPreset(withData(ProjectInfo));
 const SPublic = withPreset(withData(Public));
 const SLowerThird = withPreset(withData(Lower));
 const SStudio = withPreset(withData(StudioClock));
@@ -144,14 +142,6 @@ export default function AppRouter() {
            </ViewLoader>
          }
        />
-        <Route
-          path='/info'
-          element={
-            <ViewLoader>
-              <SProjectInfo />
-            </ViewLoader>
-          }
-        />

        {/*/!* Protected Routes *!/*/}
        <Route path='/editor' element={<Editor />} />
@@ -1,9 +1,6 @@
-import { serverURL } from '../../externals';
-
 // keys in tanstack store
 export const APP_INFO = ['appinfo'];
 export const APP_SETTINGS = ['appSettings'];
-export const APP_VERSION = ['appVersion'];
 export const CUSTOM_FIELDS = ['customFields'];
 export const HTTP_SETTINGS = ['httpSettings'];
 export const OSC_SETTINGS = ['oscSettings'];
@@ -16,7 +13,19 @@ export const URL_PRESETS = ['urlpresets'];
 export const VIEW_SETTINGS = ['viewSettings'];
 export const CLIENT_LIST = ['clientList'];

-// API URLs
+// resolve location
+const location = window.location;
+const socketProtocol = location.protocol === 'https:' ? 'wss' : 'ws';
+export const isProduction = import.meta.env.MODE === 'production';
+export const isDev = !isProduction;
+export const isLocalhost = location.hostname === 'localhost' || location.hostname === '127.0.0.1';
+
+// resolve port
+const STATIC_PORT = 4001;
+export const serverPort = isProduction ? location.port : STATIC_PORT;
+export const serverURL = `${location.protocol}//${location.hostname}:${serverPort}`;
+export const websocketUrl = `${socketProtocol}://${location.hostname}:${serverPort}/ws`;
+
 export const apiEntryUrl = `${serverURL}/data`;

 export const projectDataURL = `${serverURL}/project`;
@@ -26,4 +35,3 @@ export const ontimeURL = `${serverURL}/ontime`;
 export const userAssetsPath = 'user';
 export const cssOverridePath = 'styles/override.css';
 export const overrideStylesURL = `${serverURL}/${userAssetsPath}/${cssOverridePath}`;
-export const projectLogoPath = `${serverURL}/${userAssetsPath}/logo`;
@@ -1,7 +1,7 @@
 import axios, { AxiosResponse } from 'axios';
-import { DatabaseModel, MessageResponse, ProjectData, ProjectFileListResponse, QuickStartData } from 'ontime-types';
+import { DatabaseModel, MessageResponse, ProjectData, ProjectFileListResponse } from 'ontime-types';

-import { makeCSV, makeTable } from '../../views/cuesheet/cuesheet.utils';
+import { makeCSV, makeTable } from '../../features/cuesheet/cuesheetUtils';

 import { apiEntryUrl } from './constants';
 import { createBlob, downloadBlob } from './utils';
@@ -86,14 +86,6 @@ export async function createProject(
  return res.data;
 }

-/**
- * HTTP request to create a project file
- */
-export async function quickProject(data: QuickStartData): Promise<MessageResponse> {
-  const res = await axios.post(`${dbPath}/quick`, data);
-  return res.data;
-}
-
 /**
 * HTTP request to get the list of available project files
 */
@@ -112,14 +104,6 @@ export async function loadProject(filename: string): Promise<MessageResponse> {
  return res.data;
 }

-/**
- * HTTP request to load the demo project file
- */
-export async function loadDemo(): Promise<MessageResponse> {
-  const res = await axios.post(`${dbPath}/demo`);
-  return res.data;
-}
-
 /**
 * HTTP request to duplicate a project file
 */
@@ -1,5 +1,5 @@
 import axios, { AxiosResponse } from 'axios';
-import { ProjectData, ProjectLogoResponse } from 'ontime-types';
+import { ProjectData } from 'ontime-types';

 import { apiEntryUrl } from './constants';

@@ -19,18 +19,3 @@ export async function getProjectData(): Promise<ProjectData> {
 export async function postProjectData(data: ProjectData): Promise<AxiosResponse<ProjectData>> {
  return axios.post(projectPath, data);
 }
-
-/**
- * HTTP request to upload a project logo
- */
-export async function uploadProjectLogo(file: File): Promise<AxiosResponse<ProjectLogoResponse>> {
-  const formData = new FormData();
-  formData.append('image', file);
-  const response = await axios.post(`${projectPath}/upload`, formData, {
-    headers: {
-      'Content-Type': 'multipart/form-data',
-    },
-  });
-
-  return response;
-}
@@ -23,8 +23,6 @@ export function maybeAxiosError(error: unknown) {
      }
    }
    return `${statusText}: ${data}`;
-  } else if (error instanceof Error) {
-    return error.message;
  } else {
    if (typeof error !== 'string') {
      return JSON.stringify(error);
@@ -0,0 +1,6 @@
+.buttonSection {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: $element-spacing;
+  margin-top: -$element-spacing;
+}
@@ -15,6 +15,8 @@ import {

 import { setClientRemote } from '../../hooks/useSocket';

+import style from './ClientModal.module.scss';
+
 interface RedirectClientModalProps {
  id: string;
  name?: string;
@@ -52,12 +54,14 @@ export function RedirectClientModal(props: RedirectClientModalProps) {
          </InputGroup>
        </ModalBody>
        <ModalFooter>
-          <Button size='md' variant='ontime-subtle' onClick={onClose}>
-            Cancel
-          </Button>
-          <Button size='md' variant='ontime-filled' onClick={handleRedirect} isDisabled={!canSubmit}>
-            Submit
-          </Button>
+          <div className={style.buttonSection}>
+            <Button size='md' variant='ontime-subtle' onClick={onClose}>
+              Cancel
+            </Button>
+            <Button size='md' variant='ontime-filled' onClick={handleRedirect} isDisabled={!canSubmit}>
+              Submit
+            </Button>
+          </div>
        </ModalFooter>
      </ModalContent>
    </Modal>
@@ -13,6 +13,8 @@ import {

 import { setClientRemote } from '../../hooks/useSocket';

+import style from './ClientModal.module.scss';
+
 interface RenameClientModalProps {
  id: string;
  name?: string;
@@ -51,12 +53,14 @@ export function RenameClientModal(props: RenameClientModalProps) {
          />
        </ModalBody>
        <ModalFooter>
-          <Button size='md' variant='ontime-subtle' onClick={onClose}>
-            Cancel
-          </Button>
-          <Button size='md' variant='ontime-filled' onClick={handleRename} isDisabled={!canSubmit}>
-            Submit
-          </Button>
+          <div className={style.buttonSection}>
+            <Button size='md' variant='ontime-subtle' onClick={onClose}>
+              Cancel
+            </Button>
+            <Button size='md' variant='ontime-filled' onClick={handleRename} isDisabled={!canSubmit}>
+              Submit
+            </Button>
+          </div>
        </ModalFooter>
      </ModalContent>
    </Modal>
@@ -5,7 +5,6 @@ import { millisToString, parseUserTime } from 'ontime-utils';
 import { useEmitLog } from '../../../stores/logger';

 interface TimeInputProps<T extends string> {
-  id?: T;
  name: T;
  submitHandler: (field: T, value: string) => void;
  time?: number;
@@ -16,7 +15,7 @@ interface TimeInputProps<T extends string> {
 }

 export default function TimeInput<T extends string>(props: TimeInputProps<T>) {
-  const { id, name, submitHandler, time = 0, placeholder, disabled, align = 'center', className } = props;
+  const { name, submitHandler, time = 0, placeholder, disabled, align = 'center', className } = props;
  const { emitError } = useEmitLog();
  const inputRef = useRef<HTMLInputElement | null>(null);
  const [value, setValue] = useState<string>('');
@@ -118,7 +117,6 @@ export default function TimeInput<T extends string>(props: TimeInputProps<T>) {

  return (
    <Input
-      id={id}
      disabled={disabled}
      size='sm'
      ref={inputRef}
@@ -1,7 +1,8 @@
+import { useEffect, useState } from 'react';
 import { IoApps } from '@react-icons/all-files/io5/IoApps';
 import { IoSettingsOutline } from '@react-icons/all-files/io5/IoSettingsOutline';

-import { useFadeOutOnInactivity } from '../../../common/hooks/useFadeOutOnInactivity';
+import { debounce } from '../../utils/debounce';

 import style from './NavigationMenu.module.scss';

@@ -12,10 +13,32 @@ interface FloatingNavigationProps {

 export default function FloatingNavigation(props: FloatingNavigationProps) {
  const { toggleMenu, toggleSettings } = props;
-  const isButtonShown = useFadeOutOnInactivity();
+  const [showButton, setShowButton] = useState(false);
+
+  // show on mouse move
+  useEffect(() => {
+    let fadeOut: NodeJS.Timeout | null = null;
+    const setShowMenuTrue = () => {
+      setShowButton(true);
+      if (fadeOut) {
+        clearTimeout(fadeOut);
+      }
+      fadeOut = setTimeout(() => setShowButton(false), 3000);
+    };
+
+    const debouncedShowMenu = debounce(setShowMenuTrue, 1000);
+
+    document.addEventListener('mousemove', debouncedShowMenu);
+    return () => {
+      document.removeEventListener('mousemove', debouncedShowMenu);
+      if (fadeOut) {
+        clearTimeout(fadeOut);
+      }
+    };
+  }, []);

  return (
-    <div className={`${style.buttonContainer} ${!isButtonShown ? style.hidden : ''}`}>
+    <div className={`${style.buttonContainer} ${!showButton ? style.hidden : ''}`}>
      <button
        onClick={toggleMenu}
        aria-label='toggle menu'
@@ -38,16 +38,6 @@ $button-size: 3rem;
  border-radius: 3px;
 }

-.lockIcon {
-  font-size: 1.5rem;
-  display: grid;
-  place-content: center;
-  border-radius: 3px;
-  background-color: transparent;
-  color: $active-indicator;
-  cursor: default;
-}
-
 .navButton {
  @extend .button;
  z-index: 3;
@@ -17,15 +17,15 @@ import { IoExpand } from '@react-icons/all-files/io5/IoExpand';
 import { IoLockClosedOutline } from '@react-icons/all-files/io5/IoLockClosedOutline';
 import { IoSwapVertical } from '@react-icons/all-files/io5/IoSwapVertical';

-import { isLocalhost } from '../../../externals';
 import { navigatorConstants } from '../../../viewerConfig';
+import { isLocalhost, serverPort } from '../../api/constants';
 import useClickOutside from '../../hooks/useClickOutside';
-import { useElectronEvent } from '../../hooks/useElectronEvent';
+import useElectronEvent from '../../hooks/useElectronEvent';
 import useInfo from '../../hooks-query/useInfo';
 import { useClientStore } from '../../stores/clientStore';
 import { useViewOptionsStore } from '../../stores/viewOptions';
 import { isKeyEnter } from '../../utils/keyEvent';
-import { handleLinks, linkToOtherHost, openLink } from '../../utils/linkUtils';
+import { handleLinks, openLink } from '../../utils/linkUtils';
 import { cx } from '../../utils/styleUtils';
 import { RenameClientModal } from '../client-modal/RenameClientModal';
 import CopyTag from '../copy-tag/CopyTag';
@@ -45,7 +45,7 @@ function NavigationMenu(props: NavigationMenuProps) {

  const { isOpen: isOpenRename, onOpen: onRenameOpen, onClose: onCloseRename } = useDisclosure();
  const { fullscreen, toggle } = useFullscreen();
-  const { mirror, toggleMirror } = useViewOptionsStore();
+  const { toggleMirror } = useViewOptionsStore();
  const location = useLocation();

  const menuRef = useRef<HTMLDivElement | null>(null);
@@ -57,7 +57,7 @@ function NavigationMenu(props: NavigationMenuProps) {
      <RenameClientModal id={id} name={name} isOpen={isOpenRename} onClose={onCloseRename} />
      <Drawer placement='left' onClose={onClose} isOpen={isOpen} variant='ontime' data-testid='navigation__menu'>
        <DrawerOverlay />
-        <DrawerContent maxWidth='22rem'>
+        <DrawerContent maxWidth='21rem'>
          <DrawerHeader>
            <DrawerCloseButton size='lg' />
            Ontime
@@ -65,7 +65,7 @@ function NavigationMenu(props: NavigationMenuProps) {
          <DrawerBody padding={0}>
            <div className={style.buttonsContainer}>
              <div
-                className={cx([style.link, fullscreen && style.current])}
+                className={style.link}
                tabIndex={0}
                role='button'
                onClick={toggle}
@@ -77,7 +77,7 @@ function NavigationMenu(props: NavigationMenuProps) {
                {fullscreen ? <IoContract /> : <IoExpand />}
              </div>
              <div
-                className={cx([style.link, mirror && style.current])}
+                className={style.link}
                tabIndex={0}
                role='button'
                onClick={() => toggleMirror()}
@@ -154,8 +154,7 @@ function OtherAddresses(props: OtherAddressesProps) {
            return null;
          }

-          const address = linkToOtherHost(nif.address, currentLocation);
-
+          const address = `http://${nif.address}:${serverPort}${currentLocation}`;
          return (
            <CopyTag
              key={nif.name}
@@ -1,15 +0,0 @@
-import { IoLockClosedOutline } from '@react-icons/all-files/io5/IoLockClosedOutline';
-
-import { useFadeOutOnInactivity } from '../../../common/hooks/useFadeOutOnInactivity';
-
-import style from './NavigationMenu.module.scss';
-
-export default function ViewLockedIcon() {
-  const isLockIconShown = useFadeOutOnInactivity();
-
-  return (
-    <div className={`${style.buttonContainer} ${!isLockIconShown ? style.hidden : ''}`}>
-      <IoLockClosedOutline className={style.lockIcon} />
-    </div>
-  );
-}
@@ -2,18 +2,13 @@ import { memo, useCallback } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import { useDisclosure } from '@chakra-ui/react';

-import { isStringBoolean } from '../../../features/viewers/common/viewUtils';
-
 import FloatingNavigation from './FloatingNavigation';
 import NavigationMenu from './NavigationMenu';
-import ViewLockedIcon from './ViewLockedIcon';

 function ViewNavigationMenu() {
  const [searchParams, setSearchParams] = useSearchParams();
  const { isOpen: isMenuOpen, onOpen: onMenuOpen, onClose: onMenuClose } = useDisclosure();

-  const isViewLocked = isStringBoolean(searchParams.get('locked'));
-
  const showEditFormDrawer = useCallback(() => {
    searchParams.set('edit', 'true');
    setSearchParams(searchParams);
@@ -21,10 +16,6 @@ function ViewNavigationMenu() {

  const toggleMenu = () => (isMenuOpen ? onMenuClose() : onMenuOpen());

-  if (isViewLocked) {
-    return <ViewLockedIcon />;
-  }
-
  return (
    <>
      <FloatingNavigation toggleMenu={toggleMenu} toggleSettings={showEditFormDrawer} />
@@ -1,6 +1,5 @@
 import { PropsWithChildren, useCallback, useContext } from 'react';

-import { isLocalhost } from '../../../externals';
 import { AppContext } from '../../context/AppContext';

 import PinPage from './PinPage';
@@ -10,6 +9,7 @@ interface ProtectRouteProps {
 }

 export default function ProtectRoute({ permission, children }: PropsWithChildren<ProtectRouteProps>) {
+  const isLocal = window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1';
  const { editorAuth, operatorAuth, validate } = useContext(AppContext);

  const handleValidation = useCallback(
@@ -29,7 +29,7 @@ export default function ProtectRoute({ permission, children }: PropsWithChildren
    return false;
  };

-  if (isLocalhost || hasRelevantAuth()) {
+  if (isLocal || hasRelevantAuth()) {
    // eslint-disable-next-line react/jsx-no-useless-fragment -- trying to make typescript happy
    return <>{children}</>;
  }
@@ -1,20 +0,0 @@
-@use '../../../theme/viewerDefs' as *;
-
-/* share the same style as a page layout */
-.page {
-  margin: 0;
-  box-sizing: border-box; /* reset */
-  overflow: hidden;
-  width: 100%; /* restrict the page width to viewport */
-  height: 100vh;
-
-  font-family: var(--font-family-override, $viewer-font-family);
-  background: var(--background-color-override, $viewer-background-color);
-  color: var(--color-override, $viewer-color);
-  padding: min(2vh, 16px) clamp(16px, 10vw, 64px);
-
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding-top: 5rem;
-}
@@ -1,20 +0,0 @@
-import { CSSProperties } from 'react';
-
-import Empty from './Empty';
-
-import style from './EmptyPage.module.scss';
-
-interface EmptyPageProps {
-  text?: string;
-  style?: CSSProperties;
-}
-
-export default function EmptyPage(props: EmptyPageProps) {
-  const { text, ...rest } = props;
-
-  return (
-    <div className={style.page}>
-      <Empty text={text} {...rest} />
-    </div>
-  );
-}
@@ -1,11 +0,0 @@
-import { projectLogoPath } from '../../api/constants';
-
-interface ViewLogoProps {
-  name: string;
-  className: string;
-}
-
-export default function ViewLogo(props: ViewLogoProps) {
-  const { name, className } = props;
-  return <img src={`${projectLogoPath}/${name}`} className={className} />;
-}
@@ -13,7 +13,6 @@ import {
  Select,
  Switch,
 } from '@chakra-ui/react';
-import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';

 import { isStringBoolean } from '../../../features/viewers/common/viewUtils';

@@ -109,21 +108,25 @@ function MultiOption(props: EditFormMultiOptionProps) {
  const { paramField } = props;
  const { id, defaultValue } = paramField;

-  const optionFromParams = searchParams.getAll(id);
-  const [paramState, setParamState] = useState<string[]>(optionFromParams || defaultValue || ['']);
+  const optionFromParams = (searchParams.get(id) ?? '').toLocaleLowerCase();
+  const defaultOptionValue = optionFromParams || defaultValue?.toLocaleLowerCase() || '';
+
+  const [paramState, setParamState] = useState<string>(defaultOptionValue);

  return (
    <>
      <input name={id} hidden readOnly value={paramState} />
      <Menu isLazy closeOnSelect={false} variant='ontime-on-dark'>
        <MenuButton as={Button} variant='ontime-subtle-white' position='relative' width='fit-content' fontWeight={400}>
-          {paramField.title} <IoChevronDown style={{ display: 'inline' }} />
+          {paramField.title}
        </MenuButton>
        <MenuList>
          <MenuOptionGroup
            type='checkbox'
-            value={paramState}
-            onChange={(value) => setParamState(Array.isArray(value) ? value : [value])}
+            value={paramState.split('_')}
+            onChange={(value) => {
+              setParamState(typeof value === 'object' ? value.filter((v) => v !== '').join('_') : value);
+            }}
          >
            {Object.values(paramField.values).map((option) => {
              const { value, label } = option;
@@ -55,28 +55,10 @@ const getURLSearchParamsFromObj = (paramsObj: ViewParamsObj, paramFields: ViewOp
      // unfortunately this means we run all the strings through the sanitation
      const valueWithoutHash = sanitiseColour(value);
      if (defaultValues[id] !== valueWithoutHash) {
-        handleValueString(id, valueWithoutHash);
+        newSearchParams.set(id, valueWithoutHash);
      }
    }
  });
-
-  /** Utility function contains logic to add a value into the searchParams object */
-  function handleValueString(id: string, value: string) {
-    const maybeMultipleValues = value.split(',');
-
-    // we need to check if the value contains comma separated list, for the case of the multi-select data
-    if (Array.isArray(maybeMultipleValues) && maybeMultipleValues.length > 1) {
-      const added = new Set();
-      maybeMultipleValues.forEach((v) => {
-        if (!added.has(v)) {
-          added.add(v);
-          newSearchParams.append(id, v);
-        }
-      });
-    } else {
-      newSearchParams.set(id, value);
-    }
-  }
  return newSearchParams;
 };

@@ -1,34 +0,0 @@
-import { useQuery } from '@tanstack/react-query';
-import { dayInMs } from 'ontime-utils';
-
-import { version } from '../../../../../package.json';
-import { isLocalhost } from '../../externals';
-import { APP_VERSION } from '../api/constants';
-import { getLatestVersion, HasUpdate } from '../api/external';
-
-const placeholder: HasUpdate & { hasUpdates: boolean } = { url: '', version: '', hasUpdates: false };
-
-export default function useAppVersion() {
-  const {
-    data: fetchData,
-    status,
-    isFetching,
-    isError,
-    refetch,
-  } = useQuery({
-    queryKey: APP_VERSION,
-    queryFn: getLatestVersion,
-    placeholderData: (previousData, _previousQuery) => previousData,
-    refetchOnWindowFocus: false,
-    refetchOnReconnect: false,
-    retry: false,
-    staleTime: dayInMs,
-    enabled: isLocalhost,
-  });
-
-  const hasUpdates = fetchData?.version && !fetchData.version.includes(version);
-
-  const data = fetchData ? { ...fetchData, hasUpdates } : placeholder;
-
-  return { data, placeholder, status, isFetching, isError, refetch };
-}
@@ -1,4 +1,3 @@
-import { useMemo } from 'react';
 import { useQuery } from '@tanstack/react-query';
 import { ProjectFileListResponse } from 'ontime-types';

@@ -23,23 +22,3 @@ export function useProjectList() {
  });
  return { data: data ?? placeholderProjectList, status, refetch };
 }
-
-export function useOrderedProjectList() {
-  const response = useProjectList();
-  const { files, lastLoadedProject } = response.data;
-
-  const reorderedProjectFiles = useMemo(() => {
-    if (!files.length) return [];
-
-    const currentlyLoadedIndex = files.findIndex((project) => project.filename === lastLoadedProject);
-
-    if (currentlyLoadedIndex === -1) return files;
-
-    const projectFiles = [...files];
-    const current = projectFiles.splice(currentlyLoadedIndex, 1)[0];
-
-    return [current, ...projectFiles];
-  }, [files, lastLoadedProject]);
-
-  return { ...response, data: { reorderedProjectFiles, lastLoadedProject: response.data.lastLoadedProject } };
-}
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useQuery } from '@tanstack/react-query';
 import { NormalisedRundown, OntimeRundown, RundownCached } from 'ontime-types';

@@ -6,8 +6,6 @@ import { queryRefetchIntervalSlow } from '../../ontimeConfig';
 import { RUNDOWN } from '../api/constants';
 import { fetchNormalisedRundown } from '../api/rundown';

-import useProjectData from './useProjectData';
-
 // revision is -1 so that the remote revision is higher
 const cachedRundownPlaceholder = { order: [] as string[], rundown: {} as NormalisedRundown, revision: -1 };

@@ -26,9 +24,7 @@ export default function useRundown() {

 export function useFlatRundown() {
  const { data, status } = useRundown();
-  const { data: projectData } = useProjectData();

-  const loadedProject = useRef<string>('');
  const [prevRevision, setPrevRevision] = useState<number>(-1);
  const [flatRunDown, setFlatRunDown] = useState<OntimeRundown>([]);

@@ -41,14 +37,5 @@ export function useFlatRundown() {
    }
  }, [data.order, data.revision, data.rundown, prevRevision]);

-  // TODO: should we have a project id field?
-  // invalidate current version if project changes
-  useEffect(() => {
-    if (projectData?.title !== loadedProject.current) {
-      setPrevRevision(-1);
-      loadedProject.current = projectData?.title ?? '';
-    }
-  }, [projectData]);
-
  return { data: flatRunDown, status };
 }
@@ -1,42 +1,31 @@
 import { useCallback, useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';

-import { addDialog } from '../stores/dialogStore';
-
 const isElectron = window.process?.type === 'renderer';
 const ipcRenderer = isElectron ? window.require('electron').ipcRenderer : null;

-export function useElectronEvent() {
+export default function useElectronEvent() {
+  const navigate = useNavigate();
+
  const sendToElectron = useCallback((channel: string, args?: string | Record<string, unknown>) => {
    if (isElectron && ipcRenderer) {
      ipcRenderer.send(channel, args);
    }
  }, []);

-  return { isElectron, sendToElectron };
-}
-
-export function useElectronListener() {
-  const navigate = useNavigate();
-  const { isElectron } = useElectronEvent();
-
  // listen to requests to change the editor location
  useEffect(() => {
    if (isElectron) {
      ipcRenderer.on('request-editor-location', (_event: unknown, location: string) => {
        navigate(location, { relative: 'route' });
      });
-
-      ipcRenderer.on('dialog', (_event: unknown, dialog: string) => {
-        if (dialog === 'welcome') {
-          addDialog('welcome');
-        }
-      });
    }

    // Clean the listener after the component is dismounted
    return () => {
      ipcRenderer?.removeAllListeners();
    };
-  }, [isElectron, navigate]);
+  }, [navigate]);
+
+  return { isElectron, sendToElectron };
 }
@@ -1,7 +1,15 @@
 import { useCallback } from 'react';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { isOntimeEvent, OntimeEvent, OntimeRundownEntry, RundownCached } from 'ontime-types';
-import { dayInMs, MILLIS_PER_SECOND, parseUserTime, reorderArray, swapEventData } from 'ontime-utils';
+import { isOntimeEvent, MaybeString, OntimeEvent, OntimeRundownEntry, RundownCached } from 'ontime-types';
+import {
+  dayInMs,
+  getLinkedTimes,
+  getPreviousEventNormal,
+  MILLIS_PER_SECOND,
+  parseUserTime,
+  reorderArray,
+  swapEventData,
+} from 'ontime-utils';

 import { RUNDOWN } from '../api/constants';
 import {
@@ -262,6 +270,44 @@ export const useEventAction = () => {
    [_updateEventMutation, queryClient],
  );

+  /**
+   * Toggles link of an event to the previous
+   */
+  const linkTimer = useCallback(
+    async (eventId: string, linkStart: MaybeString) => {
+      let newEvent: Partial<OntimeEvent> = { id: eventId };
+
+      if (!linkStart) {
+        newEvent.linkStart = null;
+      } else {
+        const cachedRundown = queryClient.getQueryData<RundownCached>(RUNDOWN);
+        if (!cachedRundown) {
+          return;
+        }
+        const currentEvent = cachedRundown.rundown[eventId] as OntimeEvent;
+        if (!isOntimeEvent(currentEvent)) {
+          return;
+        }
+        const { previousEvent } = getPreviousEventNormal(cachedRundown.rundown, cachedRundown.order, eventId);
+
+        if (!previousEvent) {
+          newEvent.linkStart = null;
+        } else {
+          newEvent.linkStart = previousEvent.id;
+          const timePatch = getLinkedTimes(currentEvent, previousEvent);
+          newEvent = { ...newEvent, ...timePatch };
+        }
+      }
+
+      try {
+        await _updateEventMutation.mutateAsync(newEvent);
+      } catch (error) {
+        logAxiosError('Error updating event', error);
+      }
+    },
+    [_updateEventMutation, queryClient],
+  );
+
  /**
   * Calls mutation to edit multiple events
   * @private
@@ -568,6 +614,7 @@ export const useEventAction = () => {
    batchUpdateEvents,
    deleteEvent,
    deleteAllEvents,
+    linkTimer,
    reorderEvent,
    swapEvents,
    updateEvent,
@@ -1,31 +0,0 @@
-import { useEffect, useState } from 'react';
-
-import { debounce } from '../../common/utils/debounce';
-
-export const useFadeOutOnInactivity = () => {
-  const [isMouseMoved, setIsMouseMoved] = useState(false);
-
-  // show on mouse move
-  useEffect(() => {
-    let fadeOut: NodeJS.Timeout | null = null;
-    const setShowMenuTrue = () => {
-      setIsMouseMoved(true);
-      if (fadeOut) {
-        clearTimeout(fadeOut);
-      }
-      fadeOut = setTimeout(() => setIsMouseMoved(false), 3000);
-    };
-
-    const debouncedShowMenu = debounce(setShowMenuTrue, 1000);
-
-    document.addEventListener('mousemove', debouncedShowMenu);
-    return () => {
-      document.removeEventListener('mousemove', debouncedShowMenu);
-      if (fadeOut) {
-        clearTimeout(fadeOut);
-      }
-    };
-  }, []);
-
-  return isMouseMoved;
-};
@@ -6,7 +6,7 @@

 import { useMemo, useRef } from 'react';

-import { isDev } from '../../externals';
+import { isDev } from '../api/constants';

 type noop = (this: any, ...args: any[]) => any;

@@ -230,11 +230,3 @@ export const useTimelineStatus = () => {

  return useRuntimeStore(featureSelector);
 };
-
-export const usePing = () => {
-  const featureSelector = (state: RuntimeStore) => ({
-    ping: state.ping,
-  });
-
-  return useRuntimeStore(featureSelector);
-};
@@ -7,5 +7,4 @@ export const projectDataPlaceholder: ProjectData = {
  publicInfo: '',
  backstageUrl: '',
  backstageInfo: '',
-  projectLogo: null,
 };
@@ -15,5 +15,4 @@ export type OverridableOptions = {
  language?: string;
  showProgressBar?: boolean;
  hideTimerSeconds?: boolean;
-  removeLeadingZeros?: boolean;
 };
@@ -1,24 +0,0 @@
-import { MaybeString } from 'ontime-types';
-import { create } from 'zustand';
-
-interface DialogStore {
-  showDialog: MaybeString;
-  setDialog: (name: string) => void;
-  clearDialog: () => void;
-}
-
-/**
- * Used to allow the server to show a dialog in the client
- */
-export const useDialogStore = create<DialogStore>((set) => ({
-  showDialog: null,
-  clearDialog: () => set({ showDialog: null }),
-  setDialog: (name) => set({ showDialog: name }),
-}));
-
-/**
- * Allows setting a dialog to show (outside react)
- */
-export function addDialog(name: string): void {
-  useDialogStore.getState().setDialog(name);
-}
@@ -16,17 +16,11 @@ export const useRuntimeStore = <T>(selector: (state: RuntimeStore) => T) =>

 /**
 * Allows patching a property of the runtime store
+ * @param key
+ * @param value
 */
-export function patchRuntimeProperty<K extends keyof RuntimeStore>(key: K, value: RuntimeStore[K]) {
+export function patchRuntime<K extends keyof RuntimeStore>(key: K, value: RuntimeStore[K]): void {
  const state = runtimeStore.getState();
  state[key] = value;
  runtimeStore.setState({ ...state });
 }
-
-/**
- * Allows patching the entire runtime store
- */
-export function patchRuntime(patch: Partial<RuntimeStore>) {
-  const state = runtimeStore.getState();
-  runtimeStore.setState({ ...state, ...patch });
-}
@@ -0,0 +1,30 @@
+/**
+ * Returns hostname
+ * @type {string}
+ */
+export const host = window?.location?.host;
+
+/**
+ * Open an external URLs: specifically for a electron / browser case
+ * If electron: ask main process to call a new browser window
+ * If browser: open in new tab
+ * @param url
+ */
+export function openLink(url) {
+  if (window.process?.type === 'renderer') {
+    window.ipcRenderer.send('send-to-link', url);
+  } else {
+    window.open(url);
+  }
+}
+
+/**
+ * Handles opening external links
+ * @param event
+ * @param location
+ */
+export function handleLinks(event, location) {
+  // we handle the link manually
+  event.preventDefault();
+  openLink(`http://${host}/${location}`);
+}
@@ -1,40 +0,0 @@
-import type { MouseEvent } from 'react';
-
-import { baseURI, serverURL } from '../../externals';
-
-/**
- * Open an external URLs: specifically for a electron / browser case
- * If electron: ask main process to call a new browser window
- * If browser: open in new tab
- * @param url
- */
-export function openLink(url: string) {
-  if (window.process?.type === 'renderer') {
-    window.ipcRenderer.send('send-to-link', url);
-  } else {
-    window.open(url);
-  }
-}
-
-/**
- * Handles opening external links
- * @param event
- * @param location
- */
-export function handleLinks(event: MouseEvent, location: string) {
-  // we handle the link manually
-  event.preventDefault();
-
-  const destination = new URL(serverURL);
-  destination.pathname = baseURI ? `${baseURI}/${location}` : location;
-  openLink(destination.toString());
-}
-
-export function linkToOtherHost(host: string, path?: string) {
-  const destination = new URL(serverURL);
-  destination.hostname = host;
-  if (path) {
-    destination.pathname = baseURI ? `${baseURI}/${path}` : path;
-  }
-  return destination.toString();
-}
@@ -1,8 +1,6 @@
 import { Log, RundownCached, RuntimeStore } from 'ontime-types';

-import { isProduction, websocketUrl } from '../../externals';
-import { CLIENT_LIST, CUSTOM_FIELDS, RUNDOWN, RUNTIME } from '../api/constants';
-import { invalidateAllCaches } from '../api/utils';
+import { CLIENT_LIST, CUSTOM_FIELDS, isProduction, RUNDOWN, RUNTIME, websocketUrl } from '../api/constants';
 import { ontimeQueryClient } from '../queryClient';
 import {
  getClientId,
@@ -12,9 +10,8 @@ import {
  setClientRedirect,
  setClients,
 } from '../stores/clientStore';
-import { addDialog } from '../stores/dialogStore';
 import { addLog } from '../stores/logger';
-import { patchRuntime, patchRuntimeProperty } from '../stores/runtime';
+import { patchRuntime, runtimeStore } from '../stores/runtime';

 export let websocket: WebSocket | null = null;
 let reconnectTimeout: NodeJS.Timeout | null = null;
@@ -39,14 +36,12 @@ export const connectSocket = () => {
    }

    socketSendJson('set-client-type', 'ontime');
+
    socketSendJson('set-client-path', location.pathname + location.search);
-    setOnlineStatus(true);
  };

  websocket.onclose = () => {
    console.warn('WebSocket disconnected');
-    setOnlineStatus(false);
-
    if (shouldReconnect) {
      reconnectTimeout = setTimeout(() => {
        console.warn('WebSocket: attempting reconnect');
@@ -73,12 +68,6 @@ export const connectSocket = () => {
      }

      switch (type) {
-        case 'pong': {
-          const offset = (new Date().getTime() - new Date(payload).getTime()) * 0.5;
-          patchRuntimeProperty('ping', offset);
-          updateDevTools({ ping: offset });
-          break;
-        }
        case 'client-id': {
          if (typeof payload === 'string') {
            setClientId(payload);
@@ -121,88 +110,78 @@ export const connectSocket = () => {
          break;
        }

-        case 'dialog': {
-          if (payload.dialog === 'welcome') {
-            addDialog('welcome');
-          }
-          break;
-        }
-
        case 'ontime-log': {
          addLog(payload as Log);
          break;
        }
        case 'ontime': {
-          // eslint-disable-next-line @typescript-eslint/no-unused-vars -- removing the key from the payload
-          const { ping, ...serverPayload } = payload as Partial<RuntimeStore>;
-
-          patchRuntime(serverPayload);
-          updateDevTools(serverPayload);
+          runtimeStore.setState(payload as RuntimeStore);
+          if (!isProduction) {
+            ontimeQueryClient.setQueryData(RUNTIME, data.payload);
+          }
          break;
        }
        case 'ontime-clock': {
-          patchRuntimeProperty('clock', payload);
+          patchRuntime('clock', payload);
          updateDevTools({ clock: payload });
          break;
        }
        case 'ontime-timer': {
-          patchRuntimeProperty('timer', payload);
+          patchRuntime('timer', payload);
          updateDevTools({ timer: payload });
          break;
        }
        case 'ontime-onAir': {
-          patchRuntimeProperty('onAir', payload);
+          patchRuntime('onAir', payload);
          updateDevTools({ onAir: payload });
          break;
        }
        case 'ontime-message': {
-          patchRuntimeProperty('message', payload);
+          patchRuntime('message', payload);
          updateDevTools({ message: payload });
          break;
        }
        case 'ontime-runtime': {
-          patchRuntimeProperty('runtime', payload);
+          patchRuntime('runtime', payload);
          updateDevTools({ runtime: payload });
          break;
        }
        case 'ontime-eventNow': {
-          patchRuntimeProperty('eventNow', payload);
+          patchRuntime('eventNow', payload);
          updateDevTools({ eventNow: payload });
          break;
        }
        case 'ontime-currentBlock': {
-          patchRuntimeProperty('currentBlock', payload);
+          patchRuntime('currentBlock', payload);
          updateDevTools({ currentBlock: payload });
          break;
        }
        case 'ontime-publicEventNow': {
-          patchRuntimeProperty('publicEventNow', payload);
+          patchRuntime('publicEventNow', payload);
          updateDevTools({ publicEventNow: payload });
          break;
        }
        case 'ontime-eventNext': {
-          patchRuntimeProperty('eventNext', payload);
+          patchRuntime('eventNext', payload);
          updateDevTools({ eventNext: payload });
          break;
        }
        case 'ontime-publicEventNext': {
-          patchRuntimeProperty('publicEventNext', payload);
+          patchRuntime('publicEventNext', payload);
          updateDevTools({ publicEventNext: payload });
          break;
        }
        case 'ontime-auxtimer1': {
-          patchRuntimeProperty('auxtimer1', payload);
+          patchRuntime('auxtimer1', payload);
          updateDevTools({ auxtimer1: payload });
          break;
        }
        case 'ontime-refetch': {
          // the refetch message signals that the rundown has changed in the server side
-          const { revision, reload } = payload;
+          const { revision } = payload;
          const currentRevision = ontimeQueryClient.getQueryData<RundownCached>(RUNDOWN)?.revision ?? -1;

-          if (reload) {
-            invalidateAllCaches();
-          } else if (revision > currentRevision) {
+          if (revision > currentRevision) {
            ontimeQueryClient.invalidateQueries({ queryKey: RUNDOWN });
            ontimeQueryClient.invalidateQueries({ queryKey: CUSTOM_FIELDS });
          }
@@ -243,15 +222,3 @@ function updateDevTools(newData: Partial<RuntimeStore>) {
    }));
  }
 }
-
-/**
- * Allows setting the status of the client
- * We leverage the ping as an indication of the client's online status
- * @example ping < 0 - client is offline
- * @example ping > 0 -> client is online
- */
-function setOnlineStatus(status: boolean) {
-  const derivedPing = status ? 1 : -1;
-  patchRuntimeProperty('ping', derivedPing);
-  updateDevTools({ ping: derivedPing });
-}
@@ -34,7 +34,7 @@ export function validateProjectFile(file: File) {

  // Limit file size of a project file to around 1MB
  if (file.size > 1_000_000) {
-    throw new Error('File size limit (1MB) exceeded');
+    throw new Error('File size limit (10MB) exceeded');
  }
 }

@@ -45,19 +45,3 @@ export function isExcelFile(file: File | null) {
 export function isOntimeFile(file: File | null) {
  return file?.name.endsWith('.json');
 }
-
-/**
- * Collection of rules for pre-validating a project file
- * @param file
- */
-export function validateLogo(file: File) {
-  // Check if file is empty
-  if (file.size === 0) {
-    throw new Error('File is empty');
-  }
-
-  // Limit file size of a project file to around 1MB
-  if (file.size > 1_000_000) {
-    throw new Error('File size limit (1MB) exceeded');
-  }
-}
@@ -1,75 +1,6 @@
-/**
- * This file contains a list of constants that may need to be resolved at runtime
- */
-
-import { version } from '../../../package.json';
-
 export const githubUrl = 'https://www.github.com/cpvalente/ontime';
 export const apiRepoLatest = 'https://api.github.com/repos/cpvalente/ontime/releases/latest';
 export const websiteUrl = 'https://www.getontime.no';
-export const discordUrl = 'https://discord.com/invite/eje3CSUEXm';

 export const documentationUrl = 'https://docs.getontime.no';
 export const customFieldsDocsUrl = 'https://docs.getontime.no/features/custom-fields/';
-
-// resolve environment
-export const appVersion = version;
-export const isProduction = import.meta.env.MODE === 'production';
-export const isDev = !isProduction;
-export const isLocalhost = window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1';
-export const isDockerImage = Boolean(import.meta.env.VITE_IS_DOCKER);
-export const isOntimeCloud = window.location.hostname.includes('cloud.getontime.no');
-
-// resolve entrypoint URLs
-
-/**
- * Resolve base
- * @example '' for electron
- * @example '/client-hash' for cloud
- */
-export const baseURI = resolveBaseURI();
-export const serverURL = resolveUrl('http', '');
-export const websocketUrl = resolveUrl('ws', 'ws');
-
-function resolveUrl(protocol: 'http' | 'ws', path: string) {
-  const url = new URL(window.location.origin);
-
-  // generate ws url
-  if (protocol === 'ws') {
-    // ensure we remain in a secure context
-    const isSecure = window.location.protocol === 'https:';
-    url.protocol = isSecure ? 'wss' : 'ws';
-  }
-
-  // make path name relative to the base URI
-  url.pathname = baseURI ? `${baseURI}/${path}` : path;
-
-  // in development mode, we use the React port for UI, but need the requests to target the server
-  if (isDev) {
-    // this is used as a fallback port for development
-    url.port = '4001';
-  }
-
-  const result = url.toString();
-
-  // prevent trailing slash
-  return result.endsWith('/') ? result.slice(0, -1) : result;
-}
-
-/**
- * Resolves a base URI for a client that is not at the root segment
- * ie: https://cloud.getontime.com/client-hash/timer
- * This is necessary for ontime cloud and should otherwise not affect the client
- */
-function resolveBaseURI(): string {
-  // in ontime cloud, the base tag is set by the server
-  const baseHref = document.querySelector('base')?.getAttribute('href');
-  const base = baseHref ?? '';
-
-  // prevent a trailing slash from either an empty base or a base with a trailing slash
-  if (base.endsWith('/')) {
-    return base.slice(0, -1);
-  }
-
-  return base;
-}
@@ -18,7 +18,7 @@ import useAppSettingsNavigation from './useAppSettingsNavigation';
 import style from './AppSettings.module.scss';

 export default function AppSettings() {
-  const { close, panel, location, setLocation } = useAppSettingsNavigation();
+  const { close, panel, location } = useAppSettingsNavigation();
  useKeyDown(close, 'Escape');

  return (
@@ -26,7 +26,7 @@ export default function AppSettings() {
      <ErrorBoundary>
        <PanelList selectedPanel={panel} location={location} />
        <PanelContent onClose={close}>
-          {panel === 'project' && <ProjectPanel location={location} setLocation={setLocation} />}
+          {panel === 'project' && <ProjectPanel location={location} />}
          {panel === 'general' && <GeneralPanel location={location} />}
          {panel === 'feature_settings' && <FeatureSettingsPanel location={location} />}
          {panel === 'sources' && <SourcesPanel />}
@@ -40,16 +40,12 @@ ul {
    background-color: $gray-1100;
  }

-  &.highlight {
-    color: $red-400;
-
-    &::before {
-      content: '';
-      width: 0.5em;
-      height: 0.5em;
-      border-radius: 99px;
-      background-color: $red-400;
-    }
+  &.unsaved::before {
+    content: '';
+    width: 6px;
+    height: 6px;
+    border-radius: 3px;
+    background-color: $blue-400;
  }

  &.split {
@@ -1,90 +1,66 @@
 import { Fragment } from 'react';
-import { Tooltip } from '@chakra-ui/react';

 import { isKeyEnter } from '../../../common/utils/keyEvent';
 import { cx } from '../../../common/utils/styleUtils';
-import { tooltipDelayFast } from '../../../ontimeConfig';
-import { SettingsOption, SettingsOptionId, useAppSettingsMenu } from '../useAppSettingsMenu';
+import { PanelBaseProps, settingPanels, useSettingsStore } from '../settingsStore';
 import useAppSettingsNavigation from '../useAppSettingsNavigation';

 import style from './PanelList.module.scss';

-export interface PanelBaseProps {
-  location?: string;
-}
-
 interface PanelListProps extends PanelBaseProps {
  selectedPanel: string;
 }

 export default function PanelList({ selectedPanel, location }: PanelListProps) {
-  const { options } = useAppSettingsMenu();
+  const { setLocation } = useAppSettingsNavigation();
+  const { hasUnsavedChanges } = useSettingsStore();

  return (
    <ul className={style.tabs}>
-      {options.map((panel) => {
-        const isSelected = selectedPanel === panel.id;
-        if (panel.highlight) {
-          return (
-            <Tooltip key={panel.id} label={panel.highlight} openDelay={tooltipDelayFast} shouldWrapChildren>
-              <PanelListItem panel={panel} location={location} isSelected={isSelected} />
-            </Tooltip>
-          );
-        }
-        return <PanelListItem key={panel.id} panel={panel} location={location} isSelected={isSelected} />;
+      {settingPanels.map((panel) => {
+        const unsaved = hasUnsavedChanges(panel.id);
+
+        const classes = cx([
+          style.primary,
+          selectedPanel === panel.id ? style.active : null,
+          panel.split ? style.split : null,
+          unsaved ? style.unsaved : null,
+        ]);
+
+        return (
+          <Fragment key={panel.id}>
+            <li
+              key={panel.id}
+              onClick={() => setLocation(panel.id)}
+              onKeyDown={(event) => {
+                isKeyEnter(event) && setLocation(panel.id);
+              }}
+              className={classes}
+              tabIndex={0}
+              role='button'
+            >
+              {panel.label}
+            </li>
+            {panel.secondary?.map((secondary) => {
+              const id = secondary.id.split('__')[1];
+              const secondaryClasses = cx([style.secondary, location === id ? style.active : null]);
+              return (
+                <li
+                  key={secondary.id}
+                  onClick={() => setLocation(secondary.id)}
+                  onKeyDown={(event) => {
+                    isKeyEnter(event) && setLocation(secondary.id);
+                  }}
+                  className={secondaryClasses}
+                  role='button'
+                >
+                  {secondary.label}
+                </li>
+              );
+            })}
+          </Fragment>
+        );
      })}
    </ul>
  );
 }
-
-interface PanelListItemProps {
-  panel: SettingsOption;
-  isSelected: boolean;
-  location?: string;
-}
-
-function PanelListItem(props: PanelListItemProps) {
-  const { panel, isSelected, location } = props;
-  const { setLocation } = useAppSettingsNavigation();
-
-  const classes = cx([
-    style.primary,
-    isSelected && style.active,
-    panel.split && style.split,
-    panel.highlight && style.highlight,
-  ]);
-
-  return (
-    <Fragment key={panel.id}>
-      <li
-        key={panel.id}
-        onClick={() => setLocation(panel.id as SettingsOptionId)}
-        onKeyDown={(event) => {
-          isKeyEnter(event) && setLocation(panel.id as SettingsOptionId);
-        }}
-        className={classes}
-        tabIndex={0}
-        role='button'
-      >
-        {panel.label}
-      </li>
-      {panel.secondary?.map((secondary) => {
-        const id = secondary.id.split('__')[1];
-        const secondaryClasses = cx([style.secondary, location === id ? style.active : null]);
-        return (
-          <li
-            key={secondary.id}
-            onClick={() => setLocation(secondary.id as SettingsOptionId)}
-            onKeyDown={(event) => {
-              isKeyEnter(event) && setLocation(secondary.id as SettingsOptionId);
-            }}
-            className={secondaryClasses}
-            role='button'
-          >
-            {secondary.label}
-          </li>
-        );
-      })}
-    </Fragment>
-  );
-}
@@ -49,18 +49,6 @@ $inner-padding: 1rem;
  border-radius: 3px;
 }

-.highlight {
-  font-size: calc(1rem - 2px);
-  color: $orange-500;
-  padding-inline: 0.25rem;
-}
-
-.blockquote {
-  padding-left: 0.5rem;
-  border-left: 2px solid $gray-100;
-  background-color: $white-3;
-}
-
 .error {
  font-size: $inner-section-text-size;
  display: block;
@@ -2,7 +2,7 @@ import { HTMLAttributes, ReactNode } from 'react';

 import { cx } from '../../../common/utils/styleUtils';

-import style from './PanelUtils.module.scss';
+import style from './Panel.module.scss';

 export function Header({ children }: { children: ReactNode }) {
  return <h2 className={style.header}>{children}</h2>;
@@ -35,9 +35,9 @@ export function Paragraph({ children }: { children: ReactNode }) {
  return <p className={style.paragraph}>{children}</p>;
 }

-export function Card({ children, className, ...props }: { children: ReactNode } & JSX.IntrinsicElements['div']) {
+export function Card({ children, ...props }: { children: ReactNode } & JSX.IntrinsicElements['div']) {
  return (
-    <div className={cx([style.card, className])} {...props}>
+    <div className={style.card} {...props}>
      {children}
    </div>
  );
@@ -74,14 +74,6 @@ export function Description({ children }: { children: ReactNode }) {
  return <div className={style.fieldDescription}>{children}</div>;
 }

-export function Highlight({ children }: { children: ReactNode }) {
-  return <code className={style.highlight}>{children}</code>;
-}
-
-export function BlockQuote({ children }: { children: ReactNode }) {
-  return <blockquote className={style.blockquote}>{children}</blockquote>;
-}
-
 export function Error({ children }: { children: ReactNode }) {
  return <div className={style.fieldError}>{children}</div>;
 }
@@ -1,8 +1,9 @@
+import { version } from '../../../../../package.json';
 import ExternalLink from '../../../../common/components/external-link/ExternalLink';
-import { discordUrl, documentationUrl, githubUrl, websiteUrl } from '../../../../externals';
-import * as Panel from '../../panel-utils/PanelUtils';
+import { documentationUrl, githubUrl, websiteUrl } from '../../../../externals';
+import * as Panel from '../PanelUtils';

-import AppVersion from './AppVersion';
+import CheckUpdatesButton from './CheckUpdatesButton';

 export default function AboutPanel() {
  return (
@@ -19,11 +20,11 @@ export default function AboutPanel() {
        <Panel.SubHeader>Links</Panel.SubHeader>
        <ExternalLink href={documentationUrl}>Read the docs</ExternalLink>
        <ExternalLink href={githubUrl}>Follow the project on GitHub</ExternalLink>
-        <ExternalLink href={discordUrl}>Discord server</ExternalLink>
      </Panel.Section>
      <Panel.Section>
        <Panel.SubHeader>Current version</Panel.SubHeader>
-        <AppVersion />
+        <Panel.Paragraph>{`You are currently using Ontime ${version}`}</Panel.Paragraph>
+        <CheckUpdatesButton version={version} />
      </Panel.Section>
    </>
  );
@@ -1,31 +0,0 @@
-import ExternalLink from '../../../../common/components/external-link/ExternalLink';
-import useAppVersion from '../../../../common/hooks-query/useAppVersion';
-import { appVersion } from '../../../../externals';
-import * as Panel from '../../panel-utils/PanelUtils';
-
-export default function AppVersion() {
-  const { data, isError } = useAppVersion();
-
-  if (isError) {
-    return (
-      <Panel.Paragraph>
-        {`You are currently using Ontime version ${appVersion}`}
-        <Panel.Error>{`Could not fetch version information: ${isError}`}</Panel.Error>
-      </Panel.Paragraph>
-    );
-  }
-
-  if (data.hasUpdates) {
-    return (
-      <>
-        <Panel.Paragraph>{`You are currently using Ontime version ${appVersion}.`}</Panel.Paragraph>
-        <Panel.Paragraph>
-          {`A new version ${data.version} is available.`}
-          <ExternalLink href={data.url}> Please visit the release page to download</ExternalLink>
-        </Panel.Paragraph>
-      </>
-    );
-  }
-
-  return <Panel.Paragraph>{`You are currently using the latest version of Ontime: ${appVersion}`}</Panel.Paragraph>;
-}
@@ -0,0 +1,80 @@
+import { useState } from 'react';
+import { Button } from '@chakra-ui/react';
+
+import { getLatestVersion, HasUpdate } from '../../../../common/api/external';
+import ExternalLink from '../../../../common/components/external-link/ExternalLink';
+
+import style from '../Panel.module.scss';
+
+type CheckFail = {
+  error: string;
+};
+
+type CheckIsLatest = {
+  latest: true;
+};
+
+type CheckRemote = CheckFail | CheckIsLatest | HasUpdate;
+
+interface CheckUpdatesButtonProps {
+  version: string;
+}
+
+export default function CheckUpdatesButton(props: CheckUpdatesButtonProps) {
+  const { version } = props;
+
+  const [updateMessage, setUpdateMessage] = useState<CheckRemote | null>(null);
+  const [isFetching, setIsFetching] = useState(false);
+
+  /**
+   * Handles version comparison and returns component with message
+   */
+  const versionCheck = async () => {
+    setIsFetching(true);
+
+    try {
+      const latest = await getLatestVersion();
+
+      if (!latest.version.includes(version)) {
+        // new version, pass data to component
+        setUpdateMessage(latest);
+      } else {
+        setUpdateMessage({ latest: true });
+      }
+    } catch {
+      setUpdateMessage({ error: 'Error reaching server' });
+    } finally {
+      setIsFetching(false);
+    }
+  };
+
+  const disableButton = Boolean(updateMessage && 'version' in updateMessage);
+
+  return (
+    <>
+      <Button
+        onClick={versionCheck}
+        variant='ontime-filled'
+        isLoading={isFetching}
+        isDisabled={disableButton}
+        size='sm'
+        maxWidth='max-content'
+      >
+        Check for updates
+      </Button>
+      <ResolveUpdateMessage updateMessage={updateMessage} />
+    </>
+  );
+}
+
+function ResolveUpdateMessage(props: { updateMessage: CheckRemote | null }) {
+  const { updateMessage } = props;
+
+  if (updateMessage && 'error' in updateMessage) {
+    return <span className={style.error}>{updateMessage.error}</span>;
+  }
+  if (updateMessage && 'url' in updateMessage) {
+    return <ExternalLink href={updateMessage?.url}>{`New version available: ${updateMessage.version}`}</ExternalLink>;
+  }
+  return null;
+}
@@ -1,4 +1,4 @@
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import ClientList from './ClientList';

@@ -5,7 +5,7 @@ import { RedirectClientModal } from '../../../../common/components/client-modal/
 import { RenameClientModal } from '../../../../common/components/client-modal/RenameClientModal';
 import { setClientRemote } from '../../../../common/hooks/useSocket';
 import { useClientStore } from '../../../../common/stores/clientStore';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import style from './ClientControlPanel.module.scss';

@@ -1,6 +1,6 @@
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
-import type { PanelBaseProps } from '../../panel-list/PanelList';
-import * as Panel from '../../panel-utils/PanelUtils';
+import { PanelBaseProps } from '../../settingsStore';
+import * as Panel from '../PanelUtils';

 import CustomFields from './custom-fields/CustomFields';
 import UrlPresetsForm from './UrlPresetsForm';
@@ -13,7 +13,7 @@ import ExternalLink from '../../../../common/components/external-link/ExternalLi
 import useUrlPresets from '../../../../common/hooks-query/useUrlPresets';
 import { handleLinks } from '../../../../common/utils/linkUtils';
 import { validateUrlPresetPath } from '../../../../common/utils/urlPresets';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import style from './FeatureSettings.module.scss';

@@ -33,7 +33,7 @@ export default function UrlPresetsForm() {
    setError,
    formState: { isSubmitting, isDirty, isValid, errors },
  } = useForm<FormData>({
-    mode: 'onChange',
+    mode: 'onBlur',
    defaultValues: { data },
    values: { data },
    resetOptions: {
@@ -105,25 +105,12 @@ export default function UrlPresetsForm() {
        <Alert status='info' variant='ontime-on-dark-info'>
          <AlertIcon />
          <AlertDescription>
-            URL presets are user defined aliases to Ontime URLs
+            URL Presets
            <br />
            <br />
-            <b>Preset Name</b> <br />
-            The alias for the URL. This will be the URL you will be calling. eg: <br />
-            <Panel.BlockQuote>
-              Preset name <Panel.Highlight>cam3</Panel.Highlight> called as{' '}
-              <Panel.Highlight>http://localhost:4001/cam3</Panel.Highlight>
-            </Panel.BlockQuote>
+            Custom presets allow providing a short name for any ontime URL. <br />
+            - Providing dynamic URLs for automation or unattended screens <br />- Simplifying complex URLs
            <br />
-            <b>URL Segment</b> <br />
-            The corresponding alias path and configuration parameters. eg: <br />
-            <Panel.BlockQuote>
-              URL segment <Panel.Highlight>backstage?hidePast=true&stopCycle=true</Panel.Highlight> corresponds to
-              complete URL
-              <Panel.Highlight>http://localhost:4001/backstage?hidePast=true&stopCycle=true</Panel.Highlight>
-            </Panel.BlockQuote>
-            <br />
-            You will need to save the changes before the presets are functional.
            <br />
            <ExternalLink href={urlPresetsDocs}>See the docs</ExternalLink>
          </AlertDescription>
@@ -143,8 +130,8 @@ export default function UrlPresetsForm() {
            <thead>
              <tr>
                <th className={style.fit}>Active</th>
-                <th className={style.aliasConstrain}>Preset name</th>
-                <th className={style.fullWidth}>URL segment</th>
+                <th className={style.aliasConstrain}>Preset</th>
+                <th className={style.fullWidth}>URL</th>
                <th />
              </tr>
            </thead>
@@ -7,7 +7,7 @@ import { customFieldLabelToKey, isAlphanumericWithSpace } from 'ontime-utils';
 import { maybeAxiosError } from '../../../../../common/api/utils';
 import SwatchSelect from '../../../../../common/components/input/colour-input/SwatchSelect';
 import useCustomFields from '../../../../../common/hooks-query/useCustomFields';
-import * as Panel from '../../../panel-utils/PanelUtils';
+import * as Panel from '../../PanelUtils';

 import style from '../FeatureSettings.module.scss';

@@ -67,8 +67,6 @@ export default function CustomFieldForm(props: CustomFieldsFormProps) {

  const colour = getValues('colour');
  const canSubmit = isDirty && isValid;
-  // if initial values are given, we can assume we are in edit mode
-  const isEditMode = initialKey !== undefined;

  return (
    <form onSubmit={handleSubmit(setupSubmit)} className={style.fieldForm}>
@@ -83,9 +81,7 @@ export default function CustomFieldForm(props: CustomFieldsFormProps) {
              validate: (value) => {
                if (value.trim().length === 0) return 'Required field';
                if (!isAlphanumericWithSpace(value)) return 'Only alphanumeric characters and space are allowed';
-                if (!isEditMode) {
-                  if (isEditMode && Object.keys(data).includes(value)) return 'Custom fields must be unique';
-                }
+                if (Object.keys(data).includes(value)) return 'Custom fields must be unique';
                return true;
              },
            })}
@@ -96,7 +92,7 @@ export default function CustomFieldForm(props: CustomFieldsFormProps) {
        </div>

        <div>
-          <Panel.Description>Key (use in Integrations and API)</Panel.Description>
+          <Panel.Description>Key (auto-generated value for use in Integrations and API)</Panel.Description>
          <Input {...register('key')} disabled size='sm' variant='ontime-filled' autoComplete='off' />
        </div>
      </div>
@@ -7,7 +7,7 @@ import { deleteCustomField, editCustomField, postCustomField } from '../../../..
 import ExternalLink from '../../../../../common/components/external-link/ExternalLink';
 import useCustomFields from '../../../../../common/hooks-query/useCustomFields';
 import { customFieldsDocsUrl } from '../../../../../externals';
-import * as Panel from '../../../panel-utils/PanelUtils';
+import * as Panel from '../../PanelUtils';

 import CustomFieldEntry from './CustomFieldEntry';
 import CustomFieldForm from './CustomFieldForm';
@@ -1,7 +1,7 @@
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
-import type { PanelBaseProps } from '../../panel-list/PanelList';
-import * as Panel from '../../panel-utils/PanelUtils';
+import { PanelBaseProps } from '../../settingsStore';
 import EditorSettingsForm from '../interface-panel/EditorSettingsForm';
+import * as Panel from '../PanelUtils';

 import GeneralPanelForm from './GeneralPanelForm';
 import ViewSettingsForm from './ViewSettingsForm';
@@ -7,7 +7,7 @@ import { postSettings } from '../../../../common/api/settings';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import useSettings from '../../../../common/hooks-query/useSettings';
 import { isOnlyNumbers } from '../../../../common/utils/regex';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import GeneralPinInput from './GeneralPinInput';

@@ -154,8 +154,7 @@ export default function GeneralPanelForm() {
                <option value='pt'>Portuguese</option>
                <option value='es'>Spanish</option>
                <option value='sv'>Swedish</option>
-                <option value='pl'>Polish</option>
-                <option value='zh'>Chinese (Simplified)</option>
+		<option value='pl'>Polish</option>
              </Select>
            </Panel.ListItem>
          </Panel.ListGroup>
@@ -9,7 +9,7 @@ import ExternalLink from '../../../../common/components/external-link/ExternalLi
 import { PopoverPickerRHF } from '../../../../common/components/input/popover-picker/PopoverPicker';
 import useInfo from '../../../../common/hooks-query/useInfo';
 import useViewSettings from '../../../../common/hooks-query/useViewSettings';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import style from './GeneralPanel.module.scss';

@@ -126,7 +126,7 @@ export default function ViewSettingsForm() {
            <Panel.ListItem>
              <Panel.Field
                title='Freeze timer on end'
-                description='When a timer hits 00:00:00, it freezes instead of going negative. It invalidates the End Message.'
+                description='Timer in views will stop from going negative and instead stop at 00:00:00'
              />
              <Controller
                control={control}
@@ -139,7 +139,7 @@ export default function ViewSettingsForm() {
            <Panel.ListItem>
              <Panel.Field
                title='End message'
-                description='Message for negative timers; applies only if the timer isn`t frozen on End. If no message is provided, it continues into negative time'
+                description='Message to show on negative timers if not frozen. If not provided, timer will continue'
              />
              <Input
                size='sm'
@@ -9,7 +9,7 @@ import { maybeAxiosError } from '../../../../common/api/utils';
 import { useHttpSettings, usePostHttpSettings } from '../../../../common/hooks-query/useHttpSettings';
 import { isKeyEscape } from '../../../../common/utils/keyEvent';
 import { startsWithHttp } from '../../../../common/utils/regex';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import { cycles } from './integrationUtils';

@@ -27,7 +27,7 @@ export default function HttpIntegrations() {
    setError,
    formState: { errors, isSubmitting, isDirty, isValid },
  } = useForm<HttpSettings>({
-    mode: 'onChange',
+    mode: 'onBlur',
    defaultValues: data,
    values: data,
    resetOptions: {
@@ -2,8 +2,8 @@ import { Alert, AlertDescription, AlertIcon } from '@chakra-ui/react';

 import ExternalLink from '../../../../common/components/external-link/ExternalLink';
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
-import type { PanelBaseProps } from '../../panel-list/PanelList';
-import * as Panel from '../../panel-utils/PanelUtils';
+import { PanelBaseProps } from '../../settingsStore';
+import * as Panel from '../PanelUtils';

 import HttpIntegrations from './HttpIntegrations';
 import OscIntegrations from './OscIntegrations';
@@ -10,8 +10,7 @@ import { maybeAxiosError } from '../../../../common/api/utils';
 import useOscSettings, { useOscSettingsMutation } from '../../../../common/hooks-query/useOscSettings';
 import { isKeyEscape } from '../../../../common/utils/keyEvent';
 import { isASCII, isASCIIorEmpty, isIPAddress, isOnlyNumbers, startsWithSlash } from '../../../../common/utils/regex';
-import { isOntimeCloud } from '../../../../externals';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import { cycles } from './integrationUtils';

@@ -29,7 +28,7 @@ export default function OscIntegrations() {
    setError,
    formState: { errors, isSubmitting, isDirty, isValid },
  } = useForm<OSCSettings>({
-    mode: 'onChange',
+    mode: 'onBlur',
    defaultValues: data,
    values: data,
    resetOptions: {
@@ -107,9 +106,6 @@ export default function OscIntegrations() {
          </Button>
        </div>
      </Panel.SubHeader>
-      {isOntimeCloud && (
-        <Panel.Highlight>For security reasons OSC integrations are not available in the cloud service.</Panel.Highlight>
-      )}

      <Panel.Divider />

@@ -4,7 +4,7 @@ import { parseUserTime } from 'ontime-utils';

 import TimeInput from '../../../../common/components/input/time-input/TimeInput';
 import { editorSettingsDefaults, useEditorSettings } from '../../../../common/stores/editorSettings';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 export default function EditorSettingsForm() {
  const {
@@ -90,7 +90,6 @@ export default function EditorSettingsForm() {
                <option value={TimerType.CountUp}>Count up</option>
                <option value={TimerType.TimeToEnd}>Time to end</option>
                <option value={TimerType.Clock}>Clock</option>
-                <option value={TimerType.None}>None</option>
              </Select>
            </Panel.ListItem>
            <Panel.ListItem>
@@ -1,6 +1,6 @@
 import { Alert, AlertDescription, AlertIcon } from '@chakra-ui/react';

-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import EditorSettingsForm from './EditorSettingsForm';

@@ -1,9 +1,9 @@
 import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';

+import { serverPort } from '../../../../common/api/constants';
 import CopyTag from '../../../../common/components/copy-tag/CopyTag';
 import useInfo from '../../../../common/hooks-query/useInfo';
-import { linkToOtherHost, openLink } from '../../../../common/utils/linkUtils';
-import { isLocalhost } from '../../../../externals';
+import { openLink } from '../../../../common/utils/linkUtils';

 import style from './NetworkInterfaces.module.scss';

@@ -14,10 +14,8 @@ export default function InfoNif() {

  return (
    <div className={style.interfaces}>
-      {data.networkInterfaces.map((nif) => {
-        // interfaces outside localhost wont have access
-        if (nif.name === 'localhost' && !isLocalhost) return null;
-        const address = linkToOtherHost(nif.address);
+      {data?.networkInterfaces?.map((nif) => {
+        const address = `http://${nif.address}:${serverPort}`;

        return (
          <CopyTag
@@ -4,7 +4,7 @@ import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';

 import { handleLinks } from '../../../../common/utils/linkUtils';
 import Log from '../../../log/Log';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import style from './NetworkLogExport.module.scss';

@@ -1,12 +1,7 @@
-import { useEffect } from 'react';
-
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
-import { usePing } from '../../../../common/hooks/useSocket';
-import { socketSendJson } from '../../../../common/utils/socket';
-import { isDockerImage } from '../../../../externals';
-import type { PanelBaseProps } from '../../panel-list/PanelList';
-import * as Panel from '../../panel-utils/PanelUtils';
+import { PanelBaseProps } from '../../settingsStore';
 import ClientControlPanel from '../client-control-panel/ClientControlPanel';
+import * as Panel from '../PanelUtils';

 import InfoNif from './NetworkInterfaces';
 import LogExport from './NetworkLogExport';
@@ -19,7 +14,6 @@ export default function NetworkLogPanel({ location }: PanelBaseProps) {
    <>
      <Panel.Header>Network</Panel.Header>
      <Panel.Section>
-        {isDockerImage && <OntimeCloudStats />}
        <Panel.Paragraph>Ontime is streaming on the following network interfaces</Panel.Paragraph>
      </Panel.Section>
      <InfoNif />
@@ -32,29 +26,3 @@ export default function NetworkLogPanel({ location }: PanelBaseProps) {
    </>
  );
 }
-
-function OntimeCloudStats() {
-  const { ping } = usePing();
-
-  /**
-   * Send immediate ping request, and keep sending on an interval
-   */
-  useEffect(() => {
-    socketSendJson('ping', new Date());
-
-    const doPing = setInterval(() => {
-      socketSendJson('ping', new Date());
-    }, 5000);
-
-    return () => {
-      clearInterval(doPing);
-    };
-  }, []);
-
-  return (
-    <Panel.SubHeader>
-      Ontime cloud
-      <Panel.Description>Current ping: {ping}ms</Panel.Description>
-    </Panel.SubHeader>
-  );
-}
@@ -6,7 +6,7 @@ import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
 import { uploadProjectFile } from '../../../../common/api/db';
 import { invalidateAllCaches, maybeAxiosError } from '../../../../common/api/utils';
 import { validateProjectFile } from '../../../../common/utils/uploadUtils';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import ProjectCreateForm from './ProjectCreateForm';
 import ProjectList from './ProjectList';
@@ -20,10 +20,10 @@ export default function ManageProjects() {

  const fileInputRef = useRef<HTMLInputElement>(null);

-  const isCreatingProject = searchParams.get('new') === 'true';
+  const isCreatingProject = searchParams.get('create') === 'true';

  const handleToggleCreate = () => {
-    searchParams.set('new', isCreatingProject ? 'false' : 'true');
+    searchParams.set('create', isCreatingProject ? 'false' : 'true');
    setSearchParams(searchParams);
  };

@@ -53,7 +53,7 @@ export default function ManageProjects() {
  };

  const handleCloseForm = () => {
-    searchParams.delete('new');
+    searchParams.delete('create');
    setSearchParams(searchParams);
  };

@@ -6,8 +6,7 @@ import { useQueryClient } from '@tanstack/react-query';
 import { PROJECT_LIST } from '../../../../common/api/constants';
 import { createProject } from '../../../../common/api/db';
 import { maybeAxiosError } from '../../../../common/api/utils';
-import { documentationUrl, websiteUrl } from '../../../../externals';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import style from './ProjectPanel.module.scss';

@@ -119,7 +118,7 @@ export default function ProjectCreateForm(props: ProjectCreateFromProps) {
          <Input
            variant='ontime-filled'
            size='sm'
-            placeholder={websiteUrl}
+            placeholder='www.getontime.no'
            autoComplete='off'
            {...register('publicUrl')}
          />
@@ -141,7 +140,7 @@ export default function ProjectCreateForm(props: ProjectCreateFromProps) {
          <Input
            variant='ontime-filled'
            size='sm'
-            placeholder={documentationUrl}
+            placeholder='http://docs.getontime.no'
            autoComplete='off'
            {...register('backstageUrl')}
          />
@@ -1,17 +1,12 @@
-import { ChangeEvent, useEffect, useRef } from 'react';
+import { useEffect } from 'react';
 import { useForm } from 'react-hook-form';
 import { Button, Input, Textarea } from '@chakra-ui/react';
-import { IoDownloadOutline } from '@react-icons/all-files/io5/IoDownloadOutline';
-import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
 import { type ProjectData } from 'ontime-types';

-import { projectLogoPath } from '../../../../common/api/constants';
-import { postProjectData, uploadProjectLogo } from '../../../../common/api/project';
+import { postProjectData } from '../../../../common/api/project';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import useProjectData from '../../../../common/hooks-query/useProjectData';
-import { validateLogo } from '../../../../common/utils/uploadUtils';
-import { documentationUrl, websiteUrl } from '../../../../externals';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import style from './ProjectPanel.module.scss';

@@ -22,10 +17,8 @@ export default function ProjectData() {
    handleSubmit,
    register,
    reset,
-    formState: { isSubmitting, isValid, isDirty, errors },
+    formState: { isSubmitting, isValid, isDirty },
    setError,
-    watch,
-    setValue,
  } = useForm({
    defaultValues: data,
    values: data,
@@ -41,42 +34,6 @@ export default function ProjectData() {
    }
  }, [data, reset]);

-  const handleUploadProjectLogo = async (event: ChangeEvent<HTMLInputElement>) => {
-    const file = event.target.files?.[0];
-
-    if (!file) {
-      return;
-    }
-
-    try {
-      validateLogo(file);
-      const response = await uploadProjectLogo(file);
-
-      setValue('projectLogo', response.data.logoFilename, {
-        shouldDirty: true,
-      });
-    } catch (error) {
-      const message = maybeAxiosError(error);
-      setError('projectLogo', { message });
-    }
-  };
-
-  const { ref, ...projectLogoRest } = register('projectLogo');
-
-  const uploadInputRef = useRef<HTMLInputElement | null>(null);
-
-  const handleClickUpload = () => {
-    uploadInputRef.current?.click();
-  };
-
-  const handleDeleteLogo = (e: React.MouseEvent<HTMLButtonElement>) => {
-    e.preventDefault();
-    e.stopPropagation();
-    setValue('projectLogo', null, {
-      shouldDirty: true,
-    });
-  };
-
  const onSubmit = async (formData: ProjectData) => {
    try {
      await postProjectData(formData);
@@ -124,58 +81,11 @@ export default function ProjectData() {
              variant='ontime-filled'
              size='sm'
              maxLength={50}
-              placeholder='Project title is shown in production views'
+              placeholder='Your project name'
              autoComplete='off'
              {...register('title')}
            />
          </label>
-          <Panel.Section style={{ marginTop: 0 }}>
-            <label>
-              Project logo
-              <Input
-                variant='ontime-filled'
-                size='sm'
-                type='file'
-                style={{ display: 'none' }}
-                accept='image/*'
-                {...projectLogoRest}
-                ref={(e) => {
-                  ref(e);
-                  uploadInputRef.current = e;
-                }}
-                onChange={handleUploadProjectLogo}
-              />
-              <Panel.Card className={style.uploadLogoCard}>
-                {watch('projectLogo') ? (
-                  <>
-                    <img src={`${projectLogoPath}/${watch('projectLogo')}`} />
-                    <Button
-                      size='sm'
-                      variant='ontime-filled'
-                      isDisabled={isSubmitting || !watch('projectLogo')}
-                      leftIcon={<IoTrash />}
-                      onClick={handleDeleteLogo}
-                      type='button'
-                    >
-                      Delete
-                    </Button>
-                  </>
-                ) : (
-                  <Button
-                    variant='ontime-filled'
-                    size='sm'
-                    isDisabled={isSubmitting}
-                    leftIcon={<IoDownloadOutline />}
-                    onClick={handleClickUpload}
-                    type='button'
-                  >
-                    Upload logo
-                  </Button>
-                )}
-                {errors?.projectLogo?.message && <Panel.Error>{errors.projectLogo.message}</Panel.Error>}
-              </Panel.Card>
-            </label>
-          </Panel.Section>
          <label>
            Project description
            <Input
@@ -204,7 +114,7 @@ export default function ProjectData() {
            <Input
              variant='ontime-filled'
              size='sm'
-              placeholder={websiteUrl}
+              placeholder='www.getontime.no'
              autoComplete='off'
              {...register('publicUrl')}
            />
@@ -226,7 +136,7 @@ export default function ProjectData() {
            <Input
              variant='ontime-filled'
              size='sm'
-              placeholder={documentationUrl}
+              placeholder='http://docs.getontime.no'
              autoComplete='off'
              {...register('backstageUrl')}
            />
@@ -1,14 +1,15 @@
-import { useState } from 'react';
+import { useMemo, useState } from 'react';

-import { useOrderedProjectList } from '../../../../common/hooks-query/useProjectList';
-import * as Panel from '../../panel-utils/PanelUtils';
+import { useProjectList } from '../../../../common/hooks-query/useProjectList';
+import * as Panel from '../PanelUtils';

 import ProjectListItem, { EditMode } from './ProjectListItem';

 import style from './ProjectPanel.module.scss';

 export default function ProjectList() {
-  const { data, refetch } = useOrderedProjectList();
+  const { data, refetch } = useProjectList();
+  const { files, lastLoadedProject } = data;

  const [editingMode, setEditingMode] = useState<EditMode | null>(null);
  const [editingFilename, setEditingFilename] = useState<string | null>(null);
@@ -27,6 +28,16 @@ export default function ProjectList() {
    await refetch();
  };

+  const reorderedProjectFiles = useMemo(() => {
+    if (!data.files?.length) return [];
+
+    const currentlyLoadedIndex = files.findIndex((project) => project.filename === lastLoadedProject);
+    const projectFiles = [...files];
+    const current = projectFiles.splice(currentlyLoadedIndex, 1)?.[0];
+
+    return [current, ...projectFiles];
+  }, [data.files?.length, files, lastLoadedProject]);
+
  return (
    <Panel.Table>
      <thead>
@@ -37,7 +48,7 @@ export default function ProjectList() {
        </tr>
      </thead>
      <tbody>
-        {data.reorderedProjectFiles.map((project) => (
+        {reorderedProjectFiles.map((project) => (
          <ProjectListItem
            key={project.filename}
            filename={project.filename}
@@ -47,7 +58,7 @@ export default function ProjectList() {
            onRefetch={handleRefetch}
            editingFilename={editingFilename}
            editingMode={editingMode}
-            current={project.filename === data.lastLoadedProject}
+            current={project.filename === lastLoadedProject}
          />
        ))}
      </tbody>
@@ -12,7 +12,7 @@ import {
 } from '../../../../common/api/db';
 import { invalidateAllCaches, maybeAxiosError } from '../../../../common/api/utils';
 import { cx } from '../../../../common/utils/styleUtils';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import ProjectForm, { ProjectFormValues } from './ProjectForm';
 import ProjectMergeForm from './ProjectMergeForm';
@@ -7,7 +7,7 @@ import { PROJECT_DATA } from '../../../../common/api/constants';
 import { getDb, patchData } from '../../../../common/api/db';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import { cx } from '../../../../common/utils/styleUtils';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import { makeProjectPatch } from './project.utils';

@@ -61,26 +61,3 @@
    gap: 1rem;
  }
 }
-
-.flex {
-  display: flex;
-  gap: 1rem;
-  height: 100px;
-}
-
-.uploadLogoCard {
-  display: flex;
-  gap: 1rem;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-
-  background-color: $gray-1350;
-  border: 1px solid $white-10;
-  border-radius: 3px;
-
-  img {
-    max-width: 250px;
-    height: auto;
-  }
-}
@@ -1,28 +1,17 @@
 import useScrollIntoView from '../../../../common/hooks/useScrollIntoView';
-import type { PanelBaseProps } from '../../panel-list/PanelList';
-import * as Panel from '../../panel-utils/PanelUtils';
-import QuickStart from '../../quick-start/QuickStart';
-import type { SettingsOptionId } from '../../useAppSettingsMenu';
+import { PanelBaseProps } from '../../settingsStore';
+import * as Panel from '../PanelUtils';

 import ManageProjects from './ManageProjects';
 import ProjectData from './ProjectData';

-interface ProjectPanelProps extends PanelBaseProps {
-  setLocation: (location: SettingsOptionId) => void;
-}
-
-export default function ProjectPanel({ location, setLocation }: ProjectPanelProps) {
+export default function ProjectPanel({ location }: PanelBaseProps) {
  const projectRef = useScrollIntoView<HTMLDivElement>('data', location);
  const manageRef = useScrollIntoView<HTMLDivElement>('manage', location);

-  const handleQuickClose = () => {
-    setLocation('project');
-  };
-
  return (
    <>
      <Panel.Header>Project</Panel.Header>
-      <QuickStart isOpen={location === 'create'} onClose={handleQuickClose} />
      <div ref={projectRef}>
        <ProjectData />
      </div>
@@ -10,9 +10,9 @@ import {
  useDisclosure,
 } from '@chakra-ui/react';

-import { useElectronEvent } from '../../../../common/hooks/useElectronEvent';
-import { isLocalhost, isOntimeCloud } from '../../../../externals';
-import * as Panel from '../../panel-utils/PanelUtils';
+import { isLocalhost } from '../../../../common/api/constants';
+import useElectronEvent from '../../../../common/hooks/useElectronEvent';
+import * as Panel from '../PanelUtils';

 export default function ShutdownPanel() {
  const { isElectron, sendToElectron } = useElectronEvent();
@@ -24,28 +24,18 @@ export default function ShutdownPanel() {
    onClose();
  };

-  const canShutdown = isElectron || isLocalhost;
-
  return (
    <>
      <Panel.Header>Shutdown Ontime</Panel.Header>
      <Panel.Section>
-        {isOntimeCloud ? (
-          <Panel.Highlight>
-            For security reasons, shutting down the server must be done from the Ontime Cloud dashboard.
-          </Panel.Highlight>
-        ) : (
-          <Panel.Paragraph>
-            This will shutdown the Ontime server. <br />
-            The runtime state will be lost, but your project is kept for next time.
-          </Panel.Paragraph>
-        )}
+        <Panel.Paragraph>
+          This will shutdown the Ontime server. <br />
+          The runtime state will be lost, but your project is kept for next time.
+        </Panel.Paragraph>
        <Button colorScheme='red' onClick={onOpen} maxWidth='350px' isDisabled={!(isElectron || isLocalhost)}>
          Shutdown ontime
        </Button>
-        {!canShutdown && (
-          <Panel.Description>Note: Ontime can only be shutdown from the machine it is running in.</Panel.Description>
-        )}
+        <Panel.Description>Note: Ontime can only be shutdown from the machine it is running in.</Panel.Description>
        <AlertDialog variant='ontime' isOpen={isOpen} leastDestructiveRef={cancelRef} onClose={onClose}>
          <AlertDialogOverlay>
            <AlertDialogContent>
@@ -59,7 +49,7 @@ export default function ShutdownPanel() {
                <Button ref={cancelRef} onClick={onClose} variant='ontime-ghosted-white'>
                  Cancel
                </Button>
-                <Button colorScheme='red' onClick={sendShutdown} disabled={!canShutdown}>
+                <Button colorScheme='red' onClick={sendShutdown} ml={4}>
                  Shutdown
                </Button>
              </AlertDialogFooter>
@@ -7,7 +7,7 @@ import { getWorksheetNames } from '../../../../common/api/sheets';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import CopyTag from '../../../../common/components/copy-tag/CopyTag';
 import { openLink } from '../../../../common/utils/linkUtils';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import useGoogleSheet from './useGoogleSheet';
 import { useSheetStore } from './useSheetStore';
@@ -2,7 +2,7 @@ import { useState } from 'react';
 import { Button } from '@chakra-ui/react';
 import { CustomFields, OntimeRundown } from 'ontime-types';

-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import PreviewSpreadsheet from './preview/PreviewRundown';
 import useGoogleSheet from './useGoogleSheet';
@@ -12,7 +12,7 @@ import {
 import { getWorksheetNames } from '../../../../common/api/sheets';
 import { maybeAxiosError } from '../../../../common/api/utils';
 import { validateExcelImport } from '../../../../common/utils/uploadUtils';
-import * as Panel from '../../panel-utils/PanelUtils';
+import * as Panel from '../PanelUtils';

 import ImportMapForm from './import-map/ImportMapForm';
 import GSheetInfo from './GSheetInfo';
@@ -70,17 +70,6 @@ export default function SourcesPanel() {
    fileInputRef.current?.click();
  };

-  const resetFlow = () => {
-    // we purposely omit clearing the authentication status
-    setImportFlow('none');
-    setRundown(null);
-    setHasFile('none');
-    setWorksheets(null);
-    setCustomFields(null);
-    setError('');
-    setSheetId(null);
-  };
-
  const openGSheetFlow = async () => {
    const result = await verifyAuth();
    if (result) {
@@ -100,7 +89,7 @@ export default function SourcesPanel() {
  };

  const cancelGSheetFlow = () => {
-    resetFlow();
+    setImportFlow('none');
  };

  const handleSubmitImportPreview = async (importMap: ImportMap) => {
@@ -121,7 +110,9 @@ export default function SourcesPanel() {
  };

  const cancelImportMap = async () => {
-    resetFlow();
+    setImportFlow('none');
+    setHasFile('none');
+    setWorksheets(null);
    if (authenticationStatus === 'authenticated') {
      const result = await verifyAuth();
      if (result) {
@@ -136,7 +127,6 @@ export default function SourcesPanel() {
    setHasFile('none');
    setWorksheets(null);
    setCustomFields(null);
-    setError('');
  };

  const handleSubmitExport = async (importMap: ImportMap) => {
@@ -144,6 +134,15 @@ export default function SourcesPanel() {
    await exportRundown(sheetId, importMap);
  };

+  const resetFlow = () => {
+    setImportFlow('none');
+    setRundown(null);
+    setHasFile('none');
+    setWorksheets(null);
+    setCustomFields(null);
+    setError('');
+  };
+
  const isExcelFlow = importFlow === 'excel';
  const isGSheetFlow = importFlow === 'gsheet';
  const isAuthenticated = authenticationStatus === 'authenticated';
@@ -5,7 +5,7 @@ import { IoAdd } from '@react-icons/all-files/io5/IoAdd';
 import { IoTrash } from '@react-icons/all-files/io5/IoTrash';
 import { ImportMap, isAlphanumericWithSpace } from 'ontime-utils';

-import * as Panel from '../../../panel-utils/PanelUtils';
+import * as Panel from '../../PanelUtils';
 import useGoogleSheet from '../useGoogleSheet';
 import { useSheetStore } from '../useSheetStore';

@@ -31,7 +31,7 @@ export default function ImportMapForm(props: ImportMapFormProps) {
    register,
    formState: { errors, isValid },
  } = useForm<NamedImportMap>({
-    mode: 'onChange',
+    mode: 'onBlur',
    defaultValues: namedImportMap,
    values: namedImportMap,
  });
@@ -121,7 +121,7 @@ export default function ImportMapForm(props: ImportMapFormProps) {
        <thead>
          <tr>
            <th>Ontime field</th>
-            <th>Column name in spreadsheet</th>
+            <th>From spreadsheet name</th>
            <th className={style.singleActionCell} />
          </tr>
        </thead>
@@ -5,7 +5,7 @@ import { millisToString } from 'ontime-utils';

 import Tag from '../../../../../common/components/tag/Tag';
 import { getAccessibleColour } from '../../../../../common/utils/styleUtils';
-import * as Panel from '../../../panel-utils/PanelUtils';
+import * as Panel from '../../PanelUtils';

 import style from './PreviewRundown.module.scss';

@@ -1,8 +0,0 @@
-.scrollContainer {
-  max-height: 70vh;
-  overflow: auto;
-
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-}
@@ -1,187 +0,0 @@
-import { Controller, useForm } from 'react-hook-form';
-import {
-  Button,
-  Input,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  Select,
-  Switch,
-} from '@chakra-ui/react';
-import { QuickStartData } from 'ontime-types';
-import { parseUserTime } from 'ontime-utils';
-
-import { quickProject } from '../../../common/api/db';
-import { invalidateAllCaches, maybeAxiosError } from '../../../common/api/utils';
-import TimeInput from '../../../common/components/input/time-input/TimeInput';
-import { editorSettingsDefaults, useEditorSettings } from '../../../common/stores/editorSettings';
-import * as Panel from '../panel-utils/PanelUtils';
-
-import { quickStartDefaults } from './quickStart.utils';
-
-import style from './QuickStart.module.scss';
-
-interface QuickStartProps {
-  isOpen: boolean;
-  onClose: () => void;
-}
-
-export default function QuickStart(props: QuickStartProps) {
-  const { isOpen, onClose } = props;
-  const { defaultWarnTime, defaultDangerTime, setDangerTime, setWarnTime } = useEditorSettings();
-
-  const {
-    control,
-    handleSubmit,
-    register,
-    formState: { errors, isSubmitting, isValid },
-    setError,
-  } = useForm<QuickStartData>({
-    defaultValues: quickStartDefaults,
-    values: quickStartDefaults,
-    resetOptions: {
-      keepDirtyValues: true,
-    },
-  });
-
-  const onSubmit = async (formData: QuickStartData) => {
-    try {
-      if (formData.project.title === '') {
-        formData.project.title = 'untitled';
-      }
-      await quickProject(formData);
-      await invalidateAllCaches();
-      onClose();
-    } catch (error) {
-      setError('root', { message: maybeAxiosError(error) });
-    }
-  };
-
-  const warnTimeInMs = parseUserTime(defaultWarnTime);
-  const dangerTimeInMs = parseUserTime(defaultDangerTime);
-
-  return (
-    <Modal isOpen={isOpen} onClose={onClose} closeOnOverlayClick={false} variant='ontime'>
-      <ModalOverlay />
-      <ModalCloseButton />
-      <ModalContent maxWidth='max(640px, 40vw)'>
-        <form onSubmit={handleSubmit(onSubmit)} id='quick-start'>
-          <ModalHeader>Create new project...</ModalHeader>
-          <ModalBody className={style.scrollContainer}>
-            <ModalCloseButton />
-            <Panel.ListGroup>
-              <Panel.ListItem>
-                <Panel.Field title='Project title' description='Shown as the title in some views' />
-                <Input
-                  variant='ontime-filled'
-                  size='sm'
-                  maxLength={150}
-                  placeholder='Project title'
-                  autoComplete='off'
-                  width='20rem'
-                  {...register('project.title')}
-                />
-              </Panel.ListItem>
-              <Panel.ListItem>
-                <Panel.Field
-                  title='Time format'
-                  description='Default time format to show in views 12 /24 hours'
-                  error={errors.settings?.timeFormat?.message}
-                />
-                <Select variant='ontime' size='sm' width='auto' isDisabled={false} {...register('settings.timeFormat')}>
-                  <option value='12'>12 hours 11:00:10 PM</option>
-                  <option value='24'>24 hours 23:00:10</option>
-                </Select>
-              </Panel.ListItem>
-              <Panel.ListItem>
-                <Panel.Field
-                  title='Views language'
-                  description='Language to be displayed in views'
-                  error={errors.settings?.language?.message}
-                />
-                <Select variant='ontime' size='sm' width='auto' isDisabled={false} {...register('settings.language')}>
-                  <option value='en'>English</option>
-                  <option value='fr'>French</option>
-                  <option value='de'>German</option>
-                  <option value='hu'>Hungarian</option>
-                  <option value='it'>Italian</option>
-                  <option value='no'>Norwegian</option>
-                  <option value='pt'>Portuguese</option>
-                  <option value='es'>Spanish</option>
-                  <option value='sv'>Swedish</option>
-                  <option value='pl'>Polish</option>
-                  <option value='zh'>Chinese (Simplified)</option>
-                </Select>
-              </Panel.ListItem>
-            </Panel.ListGroup>
-
-            <Panel.ListGroup>
-              <Panel.ListItem>
-                <Panel.Field title='Warning time' description='Default threshold for warning time in an event' />
-                <TimeInput<'warnTime'>
-                  name='warnTime'
-                  submitHandler={(_field, value) => setWarnTime(value)}
-                  time={warnTimeInMs}
-                  placeholder={editorSettingsDefaults.warnTime}
-                />
-              </Panel.ListItem>
-              <Panel.ListItem>
-                <Panel.Field title='Danger time' description='Default threshold for danger time in an event' />
-                <TimeInput<'dangerTime'>
-                  name='dangerTime'
-                  submitHandler={(_field, value) => setDangerTime(value)}
-                  time={dangerTimeInMs}
-                  placeholder={editorSettingsDefaults.dangerTime}
-                />
-              </Panel.ListItem>
-            </Panel.ListGroup>
-
-            <Panel.ListGroup>
-              <Panel.ListItem>
-                <Panel.Field
-                  title='Freeze timer on end'
-                  description='When a timer hits 00:00:00, it freezes instead of going negative. It invalidates the End Message.'
-                />
-                <Controller
-                  control={control}
-                  name='viewSettings.freezeEnd'
-                  render={({ field: { onChange, value, ref } }) => (
-                    <Switch variant='ontime' size='lg' isChecked={value} onChange={onChange} ref={ref} />
-                  )}
-                />
-              </Panel.ListItem>
-              <Panel.ListItem>
-                <Panel.Field
-                  title='End message'
-                  description='Message for negative timers; applies only if the timer isn`t frozen on End. If no message is provided, it continues into negative time'
-                />
-                <Input
-                  size='sm'
-                  autoComplete='off'
-                  variant='ontime-filled'
-                  maxLength={150}
-                  width='20rem'
-                  placeholder='Shown when timer reaches end'
-                  {...register('viewSettings.endMessage')}
-                />
-              </Panel.ListItem>
-            </Panel.ListGroup>
-          </ModalBody>
-          <ModalFooter>
-            {errors?.root && <Panel.Error>{errors.root.message}</Panel.Error>}
-            <Button variant='ontime-ghosted' size='md' onClick={onClose} isDisabled={false}>
-              Cancel
-            </Button>
-            <Button variant='ontime-filled' size='md' type='submit' isDisabled={!isValid} isLoading={isSubmitting}>
-              Create project
-            </Button>
-          </ModalFooter>
-        </form>
-      </ModalContent>
-    </Modal>
-  );
-}
@@ -1,15 +0,0 @@
-import type { QuickStartData } from 'ontime-types';
-
-export const quickStartDefaults: QuickStartData = {
-  project: {
-    title: '',
-  },
-  settings: {
-    timeFormat: '24',
-    language: 'en',
-  },
-  viewSettings: {
-    freezeEnd: false,
-    endMessage: '',
-  },
-};
@@ -1,21 +1,17 @@
-import { useMemo } from 'react';
-
-import useAppVersion from '../../common/hooks-query/useAppVersion';
+import { create } from 'zustand';

 export type SettingsOption = {
  id: string;
  label: string;
  secondary?: Readonly<SettingsOption[]>;
  split?: boolean;
-  highlight?: string;
 };

-const staticOptions = [
+export const settingPanels: Readonly<SettingsOption[]> = [
  {
    id: 'project',
    label: 'Project',
    secondary: [
-      { id: 'project__create', label: 'Create...' },
      { id: 'project__data', label: 'Project data' },
      { id: 'project__manage', label: 'Manage projects' },
    ],
@@ -81,19 +77,30 @@ const staticOptions = [
  },
 ] as const;

-export type SettingsOptionId = (typeof staticOptions)[number]['id'];
+export type SettingsOptionId = (typeof settingPanels)[number]['id'];

-export function useAppSettingsMenu() {
-  const { data } = useAppVersion();
-
-  const options: Readonly<SettingsOption[]> = useMemo(
-    () =>
-      staticOptions.map((option) => ({
-        ...option,
-        highlight: option.id === 'about' && data.hasUpdates ? 'New version available' : undefined,
-      })),
-    [data],
-  );
-
-  return { options };
+export interface PanelBaseProps {
+  location?: string;
 }
+
+type SettingsStore = {
+  unsavedChanges: Set<SettingsOptionId>;
+  hasUnsavedChanges: (panelId: SettingsOptionId) => boolean;
+  addUnsavedChanges: (panelId: SettingsOptionId) => void;
+  removeUnsavedChanges: (panelId: SettingsOptionId) => void;
+};
+
+export const useSettingsStore = create<SettingsStore>((set, get) => ({
+  unsavedChanges: new Set(),
+  hasUnsavedChanges: (panelId: SettingsOptionId) => get().unsavedChanges.has(panelId),
+  addUnsavedChanges: (panelId: SettingsOptionId) =>
+    set((state) => {
+      state.unsavedChanges.add(panelId);
+      return { unsavedChanges: new Set(state.unsavedChanges) };
+    }),
+  removeUnsavedChanges: (panelId: SettingsOptionId) =>
+    set((state) => {
+      state.unsavedChanges.delete(panelId);
+      return { unsavedChanges: new Set(state.unsavedChanges) };
+    }),
+}));
@@ -1,7 +1,7 @@
 import { useCallback, useMemo } from 'react';
 import { useSearchParams } from 'react-router-dom';

-import { SettingsOptionId } from './useAppSettingsMenu';
+import { SettingsOptionId } from './settingsStore';

 const settingsKey = 'settings';

@@ -21,6 +21,22 @@
  position: relative;
 }

+.corner {
+  @include rotate-fourty-five;
+
+  position: absolute;
+  top: 0.5rem;
+  right: 0.5rem;
+  cursor: pointer;
+  color: $ui-white;
+  transition-property: color;
+  transition-duration: $transition-time-action;
+
+  &:hover {
+    color: $ontime-color;
+  }
+}
+
 .options {
  display: flex;
  flex-direction: column;
@@ -1,21 +1,20 @@
 import { memo } from 'react';
+import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';

 import ErrorBoundary from '../../../common/components/error-boundary/ErrorBoundary';
 import { handleLinks } from '../../../common/utils/linkUtils';
 import { cx } from '../../../common/utils/styleUtils';
-import { Corner } from '../../editors/editor-utils/EditorUtils';

 import MessageControl from './MessageControl';

 import style from '../../editors/Editor.module.scss';

 const MessageControlExport = () => {
-  const isExtracted = window.location.pathname.includes('/messagecontrol');
  const classes = cx([style.content, style.contentColumnLayout]);

  return (
    <div className={style.messages} data-testid='panel-messages-control'>
-      {!isExtracted && <Corner onClick={(event) => handleLinks(event, 'messagecontrol')} />}
+      <IoArrowUp className={style.corner} onClick={(event) => handleLinks(event, 'messagecontrol')} />
      <div className={classes}>
        <ErrorBoundary>
          <MessageControl />
@@ -1,7 +1,6 @@
 import { Tooltip } from '@chakra-ui/react';
 import { IoArrowDown } from '@react-icons/all-files/io5/IoArrowDown';
 import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp';
-import { IoBan } from '@react-icons/all-files/io5/IoBan';
 import { IoFlag } from '@react-icons/all-files/io5/IoFlag';
 import { IoTime } from '@react-icons/all-files/io5/IoTime';
 import { TimerPhase, TimerType } from 'ontime-types';
@@ -9,9 +8,8 @@ import { TimerPhase, TimerType } from 'ontime-types';
 import { useMessagePreview } from '../../../common/hooks/useSocket';
 import useViewSettings from '../../../common/hooks-query/useViewSettings';
 import { handleLinks } from '../../../common/utils/linkUtils';
-import { cx, timerPlaceholder } from '../../../common/utils/styleUtils';
+import { cx } from '../../../common/utils/styleUtils';
 import { tooltipDelayMid } from '../../../ontimeConfig';
-import { Corner } from '../../editors/editor-utils/EditorUtils';

 import style from './MessageControl.module.scss';

@@ -26,9 +24,6 @@ export default function TimerPreview() {
    if (showTimerMessage) return 'Message';
    if (phase === TimerPhase.Pending) return 'Standby to start';
    if (phase === TimerPhase.Overtime && data.endMessage) return 'Custom end message';
-    if (timerType === TimerType.TimeToEnd) return 'Time to end';
-    if (timerType === TimerType.Clock) return 'Clock';
-    if (timerType === TimerType.None) return timerPlaceholder;
    return 'Timer';
  })();

@@ -53,7 +48,7 @@ export default function TimerPreview() {

  return (
    <div className={style.preview}>
-      <Corner onClick={(event) => handleLinks(event, 'timer')} />
+      <IoArrowUp className={style.corner} onClick={(event) => handleLinks(event, 'timer')} />
      <div className={contentClasses}>
        <div
          className={style.mainContent}
@@ -77,9 +72,6 @@ export default function TimerPreview() {
        <Tooltip label='Time type: Time to end' openDelay={tooltipDelayMid} shouldWrapChildren>
          <IoFlag className={style.statusIcon} data-active={timerType === TimerType.TimeToEnd} />
        </Tooltip>
-        <Tooltip label='Time type: None' openDelay={tooltipDelayMid} shouldWrapChildren>
-          <IoBan className={style.statusIcon} data-active={timerType === TimerType.None} />
-        </Tooltip>
      </div>
    </div>
  );
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Carlos Valente	079be74c16	bump version to 3.6.2-beta1	2024-10-22 20:30:13 +02:00
Carlos Valente	c3db240148	chore: add win32 target	2024-10-22 20:25:48 +02:00