open using external browser

.dockerignore

@@ -11,13 +11,4 @@
 
 # Ignore git and cache folders
 .git
-.gitignore
 .cache
-
-# Ignore build folders
-node_modules
-dist
-
-# Ignore default volumes created by running docker compose up
-ontime-db
-ontime-styles

.eslintrc

@@ -8,28 +8,37 @@
     "jest": true
   },
   "parser": "@typescript-eslint/parser",
-  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "eslint-config-prettier"],
-  "plugins": ["@typescript-eslint", "prettier"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "prettier",
+    "eslint-config-prettier"
+  ],
+  "plugins": [
+    "@typescript-eslint",
+    "prettier"
+  ],
   "overrides": [
     {
-      "files": ["e2e/**/**.spec.ts", "e2e/**/**.test.ts"],
-      "extends": ["plugin:playwright/playwright-test"]
+      "files": [
+        "e2e/**/**.spec.ts",
+        "e2e/**/**.test.ts"
+      ],
+      "extends": [
+        "plugin:playwright/playwright-test"
+      ]
     }
   ],
   "rules": {
     "no-useless-concat": "warn",
     "prefer-template": "warn",
-    "no-throw-literal": "error",
     "no-console": [
       "warn",
       {
-        "allow": ["warn", "error"]
-      }
-    ],
-    "no-restricted-imports": [
-      "error",
-      {
-        "patterns": ["ontime-types/src/*", "ontime-utils/src/*"]
+        "allow": [
+          "warn",
+          "error"
+        ]
       }
     ],
     "@typescript-eslint/no-non-null-assertion": "warn",
@@ -50,4 +59,4 @@
       }
     ]
   }
-}
+}

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-github: cpvalente
-buy_me_a_coffee: cpvalente

.github/workflows/build_cli.yml

@@ -1,53 +0,0 @@
-name: Ontime CLI build
-
-on:
-  release:
-    types: [published]
-  workflow_dispatch:
-
-jobs:
-  build_cli:
-    permissions:
-      id-token: write
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22
-          registry-url: 'https://registry.npmjs.org'
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v3
-        with:
-          version: 10
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Build project packages
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-        run: pnpm build
-
-      - name: Copy server
-        run: mkdir -p apps/cli/server && cp apps/server/dist/index.cjs apps/cli/server/index.cjs
-      
-      - name: Copy client
-        run: cp -R apps/client/build apps/cli/client
-
-      - name: Copy external
-        run: cp -R apps/server/src/external apps/cli/external
-      
-      - name: Publish to NPM
-        run: pnpm publish --access public --no-git-checks
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-          NPM_CONFIG_PROVENANCE: true
-        working-directory: ./apps/cli

.github/workflows/build_docker.yml

@@ -1,48 +0,0 @@
-name: Docker Image CI Ontime
-
-on:
-  release:
-    types: [published]
-  workflow_dispatch:
-
-jobs:
-
-  publish_docker:
-    runs-on: ubuntu-latest
-    env:
-      CI: ''
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Docker Login
-      uses: docker/login-action@v2.1.0
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-    - name: Docker Setup Buildx
-      uses: docker/setup-buildx-action@v2.5.0
-
-    - name: Build and push stable release
-      if: github.event.release.prerelease == false
-      uses: docker/build-push-action@v4.0.0
-      with:
-        context: .
-        file: ./Dockerfile
-        platforms: linux/amd64,linux/arm64,linux/arm/v7
-        # Push is a shorthand for --output=type=registry
-        push: true
-        tags: ${{ secrets.DOCKERHUB_USERNAME }}/ontime:${{ github.event.release.tag_name }} , ${{ secrets.DOCKERHUB_USERNAME }}/ontime:latest
-
-    - name: Build and push pre-release
-      if: github.event.release.prerelease == true
-      uses: docker/build-push-action@v4.0.0
-      with:
-        context: .
-        file: ./Dockerfile
-        platforms: linux/amd64,linux/arm64,linux/arm/v7
-        # Push is a shorthand for --output=type=registry
-        push: true
-        tags: ${{ secrets.DOCKERHUB_USERNAME }}/ontime:${{ github.event.release.tag_name }} , ${{ secrets.DOCKERHUB_USERNAME }}/ontime:nightly
-

.github/workflows/build_docker_v2.yml

@@ -0,0 +1,56 @@
+name: Docker Image CI Ontime V2
+
+on:
+  push:
+    tags: [ "*" ]
+  workflow_dispatch:
+
+jobs:
+
+  publish_docker:
+    runs-on: ubuntu-latest
+    env:
+      CI: ''
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup env
+      run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+    - name: Setup Node.js environment
+      uses: actions/setup-node@v3.6.0
+      with:
+        version: 16.16.0
+
+    - name: Setup pnpm
+      uses: pnpm/action-setup@v2
+      with:
+        version: 8
+
+    - name: Install dependencies
+      run: pnpm install --frozen-lockfile
+
+    - name: Build project packages
+      env:
+        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+      run: pnpm turbo build:docker
+
+    - name: Docker Login
+      uses: docker/login-action@v2.1.0
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Docker Setup Buildx
+      uses: docker/setup-buildx-action@v2.5.0
+
+    - name: Build and push Docker images
+      uses: docker/build-push-action@v4.0.0
+      with:
+        context: .
+        file: ./Dockerfile
+        platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+        # Push is a shorthand for --output=type=registry
+        push: true
+        tags: ${{ secrets.DOCKERHUB_USERNAME }}/ontime:${{ env.RELEASE_VERSION  }} , ${{ secrets.DOCKERHUB_USERNAME }}/ontime:latest
+

.github/workflows/build_v2.yml

@@ -1,4 +1,4 @@
-name: Ontime build
+name: Ontime build v2
 
 on:
   push:
@@ -10,16 +10,16 @@ jobs:
     runs-on: macOS-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Use Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
-          node-version: 22
+          node-version: 16
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v2
         with:
-          version: 10
+          version: 8
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
@@ -30,14 +30,7 @@ jobs:
         run: pnpm build
 
       - name: Electron - Build app
-        env: 
-          APPLE_ID: ${{ secrets.APPLEID }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLEIDPASS }}
-          APPLE_TEAM_ID: ${{ secrets.TEAMID }}
-          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-          CSC_LINK: ${{ secrets.CSC_LINK }}
-        run: pnpm dist-mac --env-mode=loose
-        timeout-minutes: 60
+        run: pnpm dist-mac
 
       - name: Release
         uses: softprops/action-gh-release@v1
@@ -52,16 +45,16 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Use Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
-          node-version: 22
+          node-version: 16
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v2
         with:
-          version: 10
+          version: 8
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
@@ -85,16 +78,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Use Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
-          node-version: 22
+          node-version: 16
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v2
         with:
-          version: 10
+          version: 8
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile

.github/workflows/test_v2.yml

@@ -1,4 +1,4 @@
-name: Ontime test
+name: Ontime test v2
 
 on:
   pull_request:
@@ -13,16 +13,16 @@ jobs:
       CI: ''
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Use Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
-          node-version: 22
+          node-version: 16
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v2
         with:
-          version: 10
+          version: 8
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
@@ -69,16 +69,16 @@ jobs:
     timeout-minutes: 20
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Use Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
-          node-version: 22
+          node-version: 16
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v2
         with:
-          version: 10
+          version: 8
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
@@ -92,15 +92,9 @@ jobs:
       - name: Run Playwright tests
         run: pnpm e2e
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: playwright-report
           path: playwright-report/
           retention-days: 30
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: automated-screenshots
-          path: automated-screenshots/
-          retention-days: 14

.gitignore

@@ -27,8 +27,6 @@ ontime.code-workspace
 test-results
 playwright-report
 /playwright/.cache/
-automated-screenshots
-e2e/tests/fixtures/tmp/*
 
 # production
 build/
@@ -40,10 +38,9 @@ dist/
 # docker utils
 ontime-db
 ontime-external/
-ontime-data/
+
+# working database
+apps/server/src/preloaded-db/db.json
 
 # versioning file
 **/ONTIME_VERSION.js
-
-# temporary write files
-**.tmp

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+pnpm lint-staged

.nvmrc

@@ -1 +1 @@
-v22.15.1
+v16.16.0

DEVELOPMENT.md

@@ -9,8 +9,8 @@ Ontime consists of 3 distinct parts
 The steps below will assume you have locally installed the necessary dependencies.
 Other dependencies will be installed as part of the setup
 
-- __node__ (~22)
-- __pnpm__ (~10)
+- __node__ (>=16.16)
+- __pnpm__ (>=7)
 - __docker__ (only necessary to run and build docker images)
 
 ## LOCAL DEVELOPMENT
@@ -81,9 +81,6 @@ From the project root, run the following commands
 
 The build distribution assets will be at `.apps/electron/dist`
 
-Note: The MacOS build will only work in CI, locally it will fail due to notarisation issues.
-Use the `turbo dist-mac:local` command to build a MacOS distribution locally.
-
 ## DOCKER
 
 Ontime provides a docker-compose file to aid with building and running docker images.
@@ -91,17 +88,11 @@ 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 .`
+- __Install the project dependencies__ by running `pnpm i`
+- __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
 
 - __List running processes__ by running `docker ps`
 - __Kill running process__ by running `docker kill <process-id>`
-
-## General Info
-
-# APP Building
-
-We build the app from app.js for almost all applications. The output file will still be named index.cjs. This is because of Electron.
-Building the app from index.ts only applies for applications that don't use electron. index.ts will take over the initialization of the server and UI when electron isn't present.

Dockerfile

@@ -1,30 +1,20 @@
-FROM node:22-bullseye AS builder
-ENV PNPM_HOME="/pnpm"
-ENV PATH="$PNPM_HOME:$PATH"
-RUN npm install -g pnpm@10.11.0
-COPY . /app
-WORKDIR /app
-RUN pnpm --filter=ontime-ui --filter=ontime-server --filter=ontime-utils install --config.dedupe-peer-dependents=false --frozen-lockfile
-RUN pnpm --filter=ontime-ui --filter=ontime-server run build:docker
-
-FROM node:22-alpine
+FROM node:16-alpine
 
 # Set environment variables
 # Environment Variable to signal that we are running production
 ENV NODE_ENV=docker
 # Ontime Data path
-ENV ONTIME_DATA=/data/
+ENV ONTIME_DATA=/external/
 
 WORKDIR /app/
 
 # Prepare UI
-COPY --from=builder /app/apps/client/build ./client/
+COPY /apps/client/build ./client/
 
 # Prepare Backend
-COPY --from=builder /app/apps/server/dist/ ./server/
-COPY --from=builder /app/apps/server/src/external/ ./external/
-COPY --from=builder /app/apps/server/src/user/ ./user/
-COPY --from=builder /app/apps/server/src/html/ ./html/
+COPY /apps/server/dist/ ./server/
+COPY /demo-db/ ./preloaded-db/
+COPY /apps/server/src/external/ ./external/
 
 # Export default ports
 EXPOSE 4001/tcp 8888/udp 9999/udp
@@ -34,4 +24,4 @@ CMD ["node", "server/docker.cjs"]
 # Build and run commands
 # !!! Note that this command needs pre-build versions of the UI and server apps
 # docker buildx build . -t getontime/ontime
-# docker run -p 4001:4001 -p 8888:8888/udp -p 9999:9999/udp -v ./ontime-db:/data/ getontime/ontime
+# docker run -p 4001:4001 -p 8888:8888/udp -p 9999:9999/udp -v ./ontime-db:/external/db/ -v ./ontime-styles:/external/styles/ getontime/ontime

README.md

@@ -1,185 +1,199 @@
-[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-green.svg)](https://www.gnu.org/licenses/gpl-3.0)
-![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/cpvalente/ontime/total)
-![Docker Pulls](https://img.shields.io/docker/pulls/getontime/ontime)
-![NPM Downloads](https://img.shields.io/npm/dy/%40getontime%2Fcli)
-![Homebrew Cask Version](https://img.shields.io/homebrew/cask/v/ontime)
-[![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/cpvalente)
-[![](https://img.shields.io/static/v1?label=Buy%20me%20a%20coffee&message=%E2%9D%A4&logo=buymeacoffee&color=%23fe8e86)](https://www.buymeacoffee.com/cpvalente)
+[![Ontime build v2](https://github.com/cpvalente/ontime/actions/workflows/build_v2.yml/badge.svg)](https://github.com/cpvalente/ontime/actions/workflows/build_v2.yml)
+[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-green.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Documentation in Gitbook](https://badges.aleen42.com/src/gitbook_2.svg)](https://ontime.gitbook.io)
 
-## Download the latest release
-<a href="https://www.buymeacoffee.com/cpvalente" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" height="32"></a>
+## Download the latest releases here
 
-- Download for <a href="https://github.com/cpvalente/ontime/releases/latest/download/ontime-win64.exe">Windows</a>
-- Download for <a href="https://github.com/cpvalente/ontime/releases/latest/download/ontime-macOS-arm64.dmg">MacOS Arm</a>
-- Download for <a href="https://github.com/cpvalente/ontime/releases/latest/download/ontime-macOS-x64.dmg">MacOS Intel</a>
-- Download AppImage for <a href="https://github.com/cpvalente/ontime/releases/latest/download/ontime-linux.AppImage">Linux</a>
-
-... or
-- Get from <a href="https://hub.docker.com/r/getontime/ontime">Docker hub</a>
-- Install from <a href="https://www.npmjs.com/package/ontime">NPM</a>
-- Install from <a href="https://formulae.brew.sh/cask/ontime">Homebrew</a>
-
-## Need help?
-We do our best to have most topics covered by the documentation. However, if your question is not covered, you are welcome to [fill in a bug report in an issue](https://github.com/cpvalente/ontime/issues), [ask a question in GitHub discussions](https://github.com/cpvalente/ontime/discussions) or hop in the [discord server](https://discord.com/invite/eje3CSUEXm) for a chat.
-
-## Using Ontime?
-Let us know!
-Ontime improves from the collaboration with its users. We would like to understand how you use Ontime and appreciate your feedback.
-
-We would also like to include a testimonials section in our ✨new website✨. It would be great to showcase the diversity of users running Ontime.
+<div style="display: flex; justify-content: space-around">
+  <a href="https://github.com/cpvalente/ontime/releases/latest/download/ontime-macOS.dmg"><img alt="Download MacOS" src="https://github.com/cpvalente/ontime/blob/master/.github/aux-images/mac-download.png"/></a>
+  <a href="https://github.com/cpvalente/ontime/releases/latest/download/ontime-win64.exe"><img alt="Download Windows" src="https://github.com/cpvalente/ontime/blob/master/.github/aux-images/win-download.png"/></a>
+  <a href="https://github.com/cpvalente/ontime/releases/latest/download/ontime-linux.AppImage"><img alt="Download Linux" src="https://github.com/cpvalente/ontime/blob/master/.github/aux-images/linux-download.png"/></a>
+  <a href="https://hub.docker.com/r/getontime/ontime"><img alt="Get from Dockerhub" src="https://github.com/cpvalente/ontime/blob/master/.github/aux-images/dockerhub.png"/></a>
+</div>
 
 # Ontime
 
-Ontime is a browser-based application that manages event rundowns, scheduling, and cueing.
+Ontime is an application for creating and managing event running order and timers.
 
-With Ontime, you can plan, track your schedule, manage automation and cross-department show information all in one place.
+The user inputs a list of events along with scheduling and event information.
+This will then populate a series of screens which are available to be rendered by any device in the Network.
 
-Ontime is made by entertainment and broadcast engineers and used by
+This makes for a simple and cheap way to distribute over a venue using a network infrastructure instead of video
+outputs.
 
-- Conference organisers
-- Touring shows and receiving venues
-- Broadcasters and streamers
-- Theatres and opera houses
-- Houses of worship
+![App Window](https://github.com/cpvalente/ontime/blob/master/.github/aux-images/app.png)
 
-## Main features
-- [x] **Multiplatform**: Available for Windows / MacOS, Linux. You can also self host with the docker image
-- [x] **In any device**: Ontime is available in the local network to any device with a browser, eg: tablets, mobile phones, laptops, signage, media servers...
-- [x] **Made for teams**: Ontime caters to different roles in your production team: directors, operators, backstage and front of house signage...
-- [x] **Delay workflows**: Manage and communicate runtime delays in real-time to your team
-- [x] **Automatable**: Ontime can be fully or partially controlled by an operator, or run standalone with the system clock
-- [x] **Focus on integrations**: Use one of the APIs provided (OSC, HTTP, Websocket) or the available [Companion module](https://bitfocus.io/connections/getontime-ontime) to integrate into your workflow (vMix, disguise, Qlab, OBS)
-
-... and a lot more ...
-
-### For live environments
-
-Ontime is designed for use in live environments. \
-This guides the application into being flexible and efficiently integrating into different workflows.
-
-### For teams
-
-All information added in Ontime is shared with the production team and other software / hardware in your workflow. \
-Ontime also improves team collaboration with dedicated views for cuesheets and operators, and for public and production
-signage.
-
-### Simple infrastructure
-
-All the data is distributed over the network, making its distribution and infrastructure flexible and cheap. \
-With the availability of the docker image, you can also leverage IT infrastructure to make Ontime available online for
-your team and clients.
-
-Ontime is made by video engineers and entertainment technicians.
-
-![App Window](https://github.com/cpvalente/ontime/blob/master/.github/aux-images/editor.png)
-
-![Views](https://github.com/cpvalente/ontime/blob/master/.github/aux-images/ontime-overview.webp)
-
-[Read the docs to learn more](https://docs.getontime.no)
+![Views](https://github.com/cpvalente/ontime/blob/master/.github/aux-images/overview.png)
 
 ## Using Ontime
 
-Ontime can be started by downloading the latest release for your platform. \
-Alternatively you can also use the docker image, available at [Docker Hub](https://hub.docker.com/r/getontime/ontime)
+Once installed and running, Ontime starts a background server that is the heart of all processes.
+From the app, you can add / edit your running order and control the timer playback.
 
-Once installed and running, any device in the network has access to Ontime.
+Any device with a browser in the same network can choose one of the supported views to render the available data.
+This is done by reaching the ontime server at the _default port 4001_ eg: `localhost:4001`
+or `192.168.1.3:4001`
+<br />
+You can then use the menu in the top left corner to select the desired view.
+The menu will be initially hidden until there is mouse interaction.
 
-Ontime provides different screens which allow for different types of interactions with the data. These are called
-views. \
-Each view in Ontime focuses on empowering a specific role or achieving a particular task.
-
-You can access the different views by reaching the ontime server, in your browser, at (_default port
-4001_) `http://localhost:4001` or `http://192.168.1.3:4001`
+In the case of unattended machines or automation, it is possible to use different URL to recall
+individual views and extend view settings using the URL aliases feature
 
 ```
-For the backstage views
+For the presentation views
 -------------------------------------------------------------
+IP.ADDRESS:4001            > Web server default to presenter timer view
 IP.ADDRESS:4001/timer      > Presenter / Stage timer view
 IP.ADDRESS:4001/minimal    > Simple timer view
 IP.ADDRESS:4001/clock      > Simple clock view
-IP.ADDRESS:4001/backstage  > Stage Manager / Backstage view
-IP.ADDRESS:4001/countdown  > Countdown to anything
-IP.ADDRESS:4001/studio     > Studio Clock
-IP.ADDRESS:4001/timeline   > Timeline
-```
-
-```
-For the public views
--------------------------------------------------------------
+IP.ADDRESS:4001/sm         > Stage Manager / Backstage view
 IP.ADDRESS:4001/public     > Public / Foyer view
 IP.ADDRESS:4001/lower      > Lower Thirds
+IP.ADDRESS:4001/studio     > Studio Clock
 ```
 
 ```
-For production views
+For management views
 -------------------------------------------------------------
 IP.ADDRESS:4001/editor    > the control interface, same as the app
 IP.ADDRESS:4001/cuesheet  > realtime cuesheets for collaboration
-IP.ADDRESS:4001/operator  > automated views for operators
 ```
 
-More information is available [in our docs](https://docs.getontime.no)
+More documentation is available [in our docs](https://ontime.gitbook.io)
+
+## Feature List (in no specific order)
+
+- [x] Distribute data over network and render it in the browser
+- [x] Different screen types
+  - Stage Timer
+  - Minimal Timer
+  - Clock
+  - Backstage Info
+  - Public Info
+  - Studio Clock
+  - Countdown
+  - [Make your own?](#make-your-own-viewer)
+- [x] Configurable Lower Thirds
+- [x] Collaborative editing with the cuesheet view
+- [x] Send live messages to different screen types
+- [x] Differentiate between backstage and public data
+- [x] Workflow for managing delays
+- [x] Rich protocol integrations for Control and Feedback
+  - OSC (Open Sound Control)
+  - HTTP
+  - WebSockets
+- [x] Roll mode: run standalone using the system clock
+- [x] [Headless run](#headless-run): run server in a separate machine, configure from a browser locally
+- [x] [Countdown to anything!](https://ontime.gitbook.io/v2/views/countdown): have
+      a countdown to any scheduled event
+- [x] Multi-platform (available on Windows, MacOS and Linux)
+- [x] [Companion integration](https://bitfocus.io/connections/getontime-ontime)
+
+## Unopinionated
+
+We want Ontime to be unique by targeting freelancers instead of roles.
+
+We believe most freelancers work in different fields and we want to give you a tool that you can leverage across your
+many environments and workflows.
+
+We are not interested in forcing workflows and have made Ontime so, it is flexible to whichever way you would like to
+work.
+
+## Rich APIs for workflow integrations
+
+The app is currently being developed for a broad user base, from broadcast to entertainment and
+conference halls.
+
+Taking advantage of the integrations, we currently use Ontime with:
+
+- `disguise`: trigger Ontime from d3's timeline using the **OSC API**, and **render views** using d3's
+  webmodule
+- `OBS`: **render views** using the Browser Module
+- `QLab`: trigger Ontime using **OSC API**
+- `Companion`: Ontime has a **companion module**. Issue report and feature requests should be done
+  in the [repository getontime/ontime](https://github.com/bitfocus/companion-module-getontime-ontime)
+
+### Make your own viewer
+
+Ontime broadcasts its data over WebSockets. This allows you to consume its data outside the application.
+
+Writing a new view for the browser can be done with basic knowledge of HTML + CSS + Javascript (or any other language
+that can run in the browser).
+<br />
+See [this repository](https://github.com/cpvalente/ontime-viewer-template-v2) with a small template on
+how to get you started and read the docs about
+the [Websocket API](https://ontime.gitbook.io/v2/control-and-feedback/ontime-apis#osc-and-websocket-api)
+
+### Headless run️
+
+You can self-host and run Ontime in a docker image.
+
+The docker image along with documentation is [available Docker Hub at getontime/ontime](https://hub.docker.com/r/getontime/ontime)
+
+If you want to run this image in a Raspberry Pi, please see [the docs](https://ontime.gitbook.io/v2/additional-notes/use-in-raspberry-pi)
 
 ## Roadmap
 
 ### Continued development
 
-Ontime is under active development. We continue adding and improving features in collaboration with users.
-
+Several features are planned in the roadmap, and we continuously adjust this to match how users interact with the app.
+<br />
 Have an idea? Reach out via [email](mail@getontime.no)
 or [open an issue](https://github.com/cpvalente/ontime/issues/new)
 
 ### Issues
 
-We use Github's issue tracking for bug reporting and feature requests. \
+We use Github's issue tracking for bug reporting and feature requests. <br />
 Found a bug? [Open an issue](https://github.com/cpvalente/ontime/issues/new).
 
 #### Unsigned App
 
 When installing the app you would see warning screens from the Operating System like:
 
-in Windows
-
 `Microsoft Defender SmartScreen prevented an unrecognised app from starting. Running this app might put your PC at risk.`
 
+or
+
+`Ontime can't be opened because it is from an unidentified developer`
+
 or in Linux
 
 `Could Not Display "ontime-linux.AppImage`
 
-We currently only sign MacOS releases. \
-Purchasing the certificates for both Mac and Windows would mean a recurrent expense which we are not able to cover.
-
 You can circumvent this by allowing the execution of the app manually.
 
-- In Windows: click `more` -> `Run Anyway`
-- In Linux: right-click the AppImage file: `Properties` -> `Permissions` -> `Allow Executing File as a Program`
+- In Windows: click more and select "Run Anyway"
+- in macOS: the solution in macOS is different across versions, please refer to the [apple documentation](https://support.apple.com/en-gb/guide/mac-help/mh40616/mac)
+- In Linux: right-click the AppImage file -> Properties -> Permissions -> select Allow Executing
+  File as a Program
 
-If you have tips on how to improve this or would like to sponsor the code signing,
+Long story short: Ontime app is unsigned. </br>Purchasing the certificates for both Mac and Windows
+would mean a recurrent expense and is not a priority. This is unlikely to change in future. If you
+have tips on how to improve this or would like to sponsor the code signing,
 please [open an issue](https://github.com/cpvalente/ontime/issues/new)
 
-## Contributing
+#### Safari
+
+There are known issues with Safari versions lower than 13:
+
+- Spacing and text styles might have small inconsistencies
+- Table view does not work
+
+There is no plan for any further work on this.
+
+# Contributing
 
 Looking to contribute? All types of help are appreciated, from coding to testing and feature specification.
-
-If you are a developer and would like to contribute with code, please open an issue to discuss before opening a Pull Request.
-
+<br /><br />
+If you are a developer and would like to contribute with some code, please open an issue to discuss before opening a
+Pull Request.
+<br />
 Information about the project setup can be found in the [development documentation](./DEVELOPMENT.md)
 
-## Links
-- [Ontime website](https://getontime.no) 
-- [Documentation](https://docs.getontime.no)
-- [Ontime discord server](https://discord.com/invite/eje3CSUEXm)
+# Help
 
-## License
+Help is underway! ... and can be found [here](https://ontime.gitbook.io)
+
+# License
 
 This project is licensed under the terms of the GNU GPL v3
-
-## Sponsor
-
-You can help the development of this project or say thank you with a one time donation. \
-See [the terms of donations](https://github.com/cpvalente/ontime/blob/master/.github/FUNDING.md).
-
-<p align="center">
-<br>
-<a href="https://www.buymeacoffee.com/cpvalente" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" width="200"></a>
-</p>

SPONSOR.md

@@ -1,19 +0,0 @@
-# Terms of sponsorship
-Ontime does not exist as a fiscal entity. The sponsorship recipient is the project owner. In this light, contributors are funding the project owner's capacity to work on the project, not the project itself. As a contribution recipient, the code owner reserves the right to redistribute.
-
-## Why sponsor
-Ontime is and will remain free, regardless of your decision to contribute.
-Regardless, you may choose to provide a monetary contribution:
-
-### Improve user experience
-Certain parts of the application user experience are tied to our capacity to pay for services. App signing and Google Sheets integration are good examples of this.
-
-### Cool stuff
-We may choose not to implement some features. This could be related to the complexity required, to the skill set, or to the fact that we just feel it doesn't improve the app for a significant percentage of users. In those cases, a feature may be considered "not worth it," regardless of its pertinence.
-
-As a user, you can choose to sponsor a particular feature or donate to the app so that we can create bounties for features.
-
-### Priorities
-Monetary contributions are most immediately needed to offset the costs of presenting and distributing Ontime, i.e., hosting, domains, and certificates.
-
-Additional funding will be considered according to the needs at the time.

apps/cli/.eslintrc

@@ -1,16 +0,0 @@
-{
-  "parserOptions": {
-    "sourceType": "module"
-  },
-  "env": {
-    "browser": true,
-    "node": true
-  },
-  "extends": [
-    "eslint:recommended"
-  ],
-  "plugins": [],
-  "rules": {
-    "@typescript-eslint/no-var-requires": "off"
-  }
-}

apps/cli/.gitignore

@@ -1,3 +0,0 @@
-server
-external
-client

apps/cli/.prettierrc

@@ -1,9 +0,0 @@
-{
-  "endOfLine": "lf",
-  "trailingComma": "all",
-  "tabWidth": 2,
-  "semi": true,
-  "singleQuote": true,
-  "jsxSingleQuote": true,
-  "printWidth": 120
-}

apps/cli/README.md

@@ -1,44 +0,0 @@
-# Ontime CLI
-
-![Ontime](https://github.com/cpvalente/ontime/blob/9e63261b350e5b7b61c7ffb17c9e75a6c5a8c711/.github/aux-images/editor.png)
-> Ontime is an application for managing rundown and event timers.
-
-Congratulations! You got this far into Ontime's rabbit hole and want to manage your installation.
-
-The CLI tool is a fast and lightweight way of installing Ontime and is perfect for self-hosting and headless installs.
-
-## Getting started
-
-### Prerequisites
-You will need to have installed the correct version of node.js
-Please check [the app engines declaration](https://github.com/cpvalente/ontime/blob/master/package.json) for the correct version.
-
-### Running Ontime
-To get Ontime running, all you need to do is install it in your system using your package manager of choice:
-
-Install globally in your system 
-```bash
-npm install -g @getontime/cli
-```
-
-... and run using the installed script
-```bash
-ontime
-```
-
-Or install and run ontime (the installation here is temporary for the duration of the session)
-```bash
-npx install @getontime/cli
-```
-
-## Links
-- [Ontime's repository](https://github.com/cpvalente/ontime)
-- [Ontime's documentation](https://docs.getontime.no/)
-- [Ontime's website](https://getontime.no/)
-
-## Sponsoring
-You can help the development of this project or say thank you with a one time donation. \
-See the [terms of donations](https://github.com/cpvalente/ontime/blob/master/SPONSOR.md)
-
-[![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/cpvalente)
-[![](https://img.shields.io/static/v1?label=Buy%20me%20a%20coffee&message=%E2%9D%A4&logo=buymeacoffee&color=%23fe8e86)](https://www.buymeacoffee.com/cpvalente)

apps/cli/main.js

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-// NOTE: for now the following needs to be in place: ./server/index.cjs, ./client, ./external
-
-const ontimeServer = require('./server/index.cjs');
-const { initAssets, startServer, startIntegrations, shutdown } = ontimeServer;
-
-async function startOntime() {
-  await initAssets();
-
-  await startServer();
-
-  await startIntegrations();
-}
-
-startOntime();
-
-process.on(['SIGHUP', 'SIGINT', 'SIGTERM'], () => {
-  shutdown();
-});

apps/cli/package.json

@@ -1,27 +0,0 @@
-{
-    "name": "@getontime/cli",
-    "version": "3.16.1",
-    "author": "Carlos Valente",
-    "description": "Time keeping for live events",
-    "repository": "https://github.com/cpvalente/ontime",
-    "keywords": [
-        "lighdev",
-        "ontime",
-        "timer"
-    ],
-    "license": "AGPL-3.0-only",
-    "main": "main.js",
-    "bin": {
-        "ontime": "main.js"
-    },
-    "files": [
-        "client",
-        "external",
-        "server"
-    ],
-    "devDependencies": {
-        "eslint": "catalog:",
-        "eslint-config-prettier": "catalog:",
-        "prettier": "catalog:"
-    }
-}

apps/client/.eslintrc

@@ -15,6 +15,7 @@
   ],
   "plugins": [
     "react",
+    "testing-library",
     "simple-import-sort",
     "@tanstack/query"
   ],

apps/client/index.html

@@ -1,28 +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" />
-    <meta name="robots" content="noindex" />
-    <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>

apps/client/package.json

@@ -1,40 +1,36 @@
 {
   "name": "ontime-ui",
-  "version": "3.16.1",
+  "version": "2.21.3",
   "private": true,
-  "type": "module",
   "dependencies": {
     "@chakra-ui/react": "^2.7.0",
-    "@dnd-kit/core": "^6.1.0",
-    "@dnd-kit/sortable": "^8.0.0",
-    "@dnd-kit/utilities": "^3.2.2",
-    "@emotion/is-prop-valid": "^1.3.1",
+    "@dnd-kit/core": "^6.0.8",
+    "@dnd-kit/sortable": "^7.0.2",
+    "@dnd-kit/utilities": "^3.2.1",
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
-    "@fontsource/open-sans": "^5.0.28",
-    "@mantine/hooks": "^7.13.3",
-    "@sentry/react": "^8.43.0",
-    "@table-nav/react": "^0.0.7",
-    "@tanstack/react-query": "^5.62.7",
-    "@tanstack/react-query-devtools": "^5.62.7",
-    "@tanstack/react-table": "^8.21.3",
+    "@react-icons/all-files": "^4.1.0",
+    "@sentry/react": "^7.46.0",
+    "@sentry/tracing": "^7.46.0",
+    "@tanstack/react-query": "^5.8.4",
+    "@tanstack/react-query-devtools": "^5.8.4",
+    "@tanstack/react-table": "^8.9.2",
     "autosize": "^6.0.1",
     "axios": "^1.2.0",
     "color": "^4.2.3",
-    "csv-stringify": "^6.4.5",
+    "csv-stringify": "^6.2.3",
+    "deepmerge": "^4.3.0",
     "framer-motion": "^10.10.0",
-    "prismjs": "^1.29.0",
-    "react": "^18.3.1",
+    "react": "^18.2.0",
     "react-colorful": "^5.6.1",
-    "react-dom": "^18.3.1",
-    "react-fast-compare": "^3.2.2",
-    "react-hook-form": "^7.53.1",
-    "react-icons": "5.4.0",
-    "react-qr-code": "^2.0.12",
+    "react-dom": "^18.2.0",
+    "react-fast-compare": "^3.2.0",
+    "react-hook-form": "^7.43.5",
+    "react-qr-code": "^2.0.11",
     "react-router-dom": "^6.3.0",
-    "react-simple-code-editor": "^0.14.1",
+    "typeface-open-sans": "^1.1.13",
     "web-vitals": "^3.1.1",
-    "zustand": "^5.0.3"
+    "zustand": "^4.3.6"
   },
   "scripts": {
     "addversion": "node -p \"'export const ONTIME_VERSION = ' + JSON.stringify(require('../../package.json').version) + ';'\" > src/ONTIME_VERSION.js",
@@ -43,13 +39,12 @@
     "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:localdocker": "cross-env NODE_ENV=local vite build",
+    "build:docker": "vite build",
     "lint": "eslint . --quiet",
+    "lint-staged": "eslint",
     "test": "vitest",
     "test:pipeline": "vitest run",
-    "cleanup": "rm -rf .turbo && rm -rf node_modules && rm -rf build",
-    "analyse": "npx vite-bundle-visualizer"
+    "cleanup": "rm -rf .turbo && rm -rf node_modules && rm -rf build"
   },
   "browserslist": {
     "production": [
@@ -64,32 +59,36 @@
     ]
   },
   "devDependencies": {
-    "@sentry/vite-plugin": "^2.16.1",
+    "@sentry/vite-plugin": "^0.4.0",
     "@tanstack/eslint-plugin-query": "^5.8.4",
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^13.1.1",
+    "@testing-library/user-event": "^14.1.1",
     "@types/color": "^3.0.3",
-    "@types/prismjs": "^1.26.5",
     "@types/react": "^18.0.26",
     "@types/react-dom": "^18.0.10",
-    "@typescript-eslint/eslint-plugin": "catalog:",
-    "@typescript-eslint/parser": "catalog:",
-    "@vitejs/plugin-react": "4.5.1",
-    "eslint": "catalog:",
-    "eslint-config-prettier": "catalog:",
-    "eslint-plugin-jest": "^28.6.0",
-    "eslint-plugin-prettier": "catalog:",
+    "@types/testing-library__jest-dom": "^5.14.5",
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/parser": "^6.10.0",
+    "@vitejs/plugin-react": "^3.0.1",
+    "eslint": "^8.53.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-jest": "^27.6.0",
+    "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-react": "^7.32.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-simple-import-sort": "^8.0.0",
-    "happy-dom": "^16.7.2",
+    "eslint-plugin-testing-library": "^5.9.1",
+    "jsdom": "^21.1.0",
     "ontime-types": "workspace:*",
     "ontime-utils": "workspace:*",
-    "prettier": "catalog:",
+    "prettier": "^3.0.3",
     "sass": "^1.57.1",
-    "typescript": "catalog:",
-    "vite": "6.3.1",
-    "vite-plugin-compression2": "1.4.0",
-    "vite-plugin-svgr": "4.3.0",
-    "vite-tsconfig-paths": "5.1.4",
-    "vitest": "catalog:"
+    "typescript": "^5.2.2",
+    "vite": "^4.3.1",
+    "vite-plugin-compression2": "^0.9.0",
+    "vite-plugin-svgr": "^2.4.0",
+    "vite-tsconfig-paths": "^4.2.0",
+    "vitest": "^0.30.1"
   }
 }

apps/client/public/manifest.json

@@ -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": "/",

apps/client/public/site.webmanifest

@@ -1,10 +1 @@
-{
-  "name": "",
-  "short_name": "",
-  "icons": [
-    { "src": "/ontime-logo.png", "sizes": "295x295", "type": "image/png" }
-  ],
-  "theme_color": "#2B5ABC",
-  "background_color": "#101010",
-  "display": "standalone"
-}
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

apps/client/src/App.tsx

@@ -1,38 +1,68 @@
+import { useEffect } from 'react';
 import { BrowserRouter } from 'react-router-dom';
 import { ChakraProvider } from '@chakra-ui/react';
 import { QueryClientProvider } from '@tanstack/react-query';
 import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
 
+import { ContextMenu } from './common/components/context-menu/ContextMenu';
 import ErrorBoundary from './common/components/error-boundary/ErrorBoundary';
-import IdentifyOverlay from './common/components/identify-overlay/IdentifyOverlay';
 import { AppContextProvider } from './common/context/AppContext';
+import useElectronEvent from './common/hooks/useElectronEvent';
 import { ontimeQueryClient } from './common/queryClient';
+import { socketClientName } from './common/stores/connectionName';
 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();
+// Load Open Sans typeface
+// @ts-expect-error no types from font import
+import('typeface-open-sans');
+
+const preferredClientName = socketClientName.getState().name;
+connectSocket(preferredClientName);
 
 function App() {
+  const { isElectron, sendToElectron } = useElectronEvent();
+
+  useEffect(() => {
+    const handleKeyPress = (event: KeyboardEvent) => {
+      // handle held key
+      if (event.repeat) return;
+      // check if the alt key is pressed
+      if (event.altKey) {
+        if (event.code === 'KeyT') {
+          // ask to see debug
+          sendToElectron('set-window', 'show-dev');
+        }
+      }
+    };
+
+    if (isElectron) {
+      document.addEventListener('keydown', handleKeyPress);
+    }
+    return () => {
+      if (isElectron) {
+        document.removeEventListener('keydown', handleKeyPress);
+      }
+    };
+  }, [isElectron, sendToElectron]);
+
   return (
-    <ChakraProvider disableGlobalStyle resetCSS theme={theme}>
+    <ChakraProvider resetCSS theme={theme}>
       <QueryClientProvider client={ontimeQueryClient}>
         <AppContextProvider>
-          <BrowserRouter basename={baseURI}>
+          <BrowserRouter>
             <div className='App'>
               <ErrorBoundary>
                 <TranslationProvider>
-                  <IdentifyOverlay />
-                  <AppRouter />
+                  <ContextMenu>
+                    <AppRouter />
+                  </ContextMenu>
                 </TranslationProvider>
               </ErrorBoundary>
               <ReactQueryDevtools initialIsOpen={false} />
             </div>
-            <ErrorBoundary>
-              <div id='identify-portal' />
-            </ErrorBoundary>
           </BrowserRouter>
         </AppContextProvider>
       </QueryClientProvider>

apps/client/src/AppRouter.tsx

@@ -1,171 +1,72 @@
-import React from 'react';
-import {
-  createRoutesFromChildren,
-  matchRoutes,
-  Navigate,
-  Route,
-  Routes,
-  useLocation,
-  useNavigationType,
-} from 'react-router-dom';
-import * as Sentry from '@sentry/react';
+import { lazy, Suspense } from 'react';
+import { Navigate, Route, Routes } from 'react-router-dom';
 
-import { useClientPath } from './common/hooks/useClientPath';
-import Log from './features/log/Log';
-import withPreset from './features/PresetWrapper';
+import withAlias from './features/AliasWrapper';
 import withData from './features/viewers/ViewWrapper';
-import ViewLoader from './views/ViewLoader';
-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 Operator = React.lazy(() => import('./features/operator/OperatorExport'));
+const Editor = lazy(() => import('./features/editors/ProtectedEditor'));
+const Cuesheet = lazy(() => import('./features/cuesheet/ProtectedCuesheet'));
+const Operator = lazy(() => import('./features/operator/Operator'));
 
-const TimerView = React.lazy(() => import('./views/timer/Timer'));
-const MinimalTimerView = React.lazy(() => import('./features/viewers/minimal-timer/MinimalTimer'));
-const ClockView = React.lazy(() => import('./features/viewers/clock/Clock'));
-const Countdown = React.lazy(() => import('./features/viewers/countdown/Countdown'));
+const TimerView = lazy(() => import('./features/viewers/timer/Timer'));
+const MinimalTimerView = lazy(() => import('./features/viewers/minimal-timer/MinimalTimer'));
+const ClockView = lazy(() => import('./features/viewers/clock/Clock'));
+const Countdown = lazy(() => import('./features/viewers/countdown/Countdown'));
 
-const Backstage = React.lazy(() => import('./views/backstage/Backstage'));
-const Timeline = React.lazy(() => import('./views/timeline/TimelinePage'));
-const Public = React.lazy(() => import('./views/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 Backstage = lazy(() => import('./features/viewers/backstage/Backstage'));
+const Public = lazy(() => import('./features/viewers/public/Public'));
+const Lower = lazy(() => import('./features/viewers/lower-thirds/LowerWrapper'));
+const StudioClock = lazy(() => import('./features/viewers/studio/StudioClock'));
 
-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));
-const STimeline = withPreset(withData(Timeline));
-const PCuesheet = withPreset(Cuesheet);
-const POperator = withPreset(Operator);
+const STimer = withAlias(withData(TimerView));
+const SMinimalTimer = withAlias(withData(MinimalTimerView));
+const SClock = withAlias(withData(ClockView));
+const SCountdown = withAlias(withData(Countdown));
+const SBackstage = withAlias(withData(Backstage));
+const SPublic = withAlias(withData(Public));
+const SLowerThird = withAlias(withData(Lower));
+const SStudio = withAlias(withData(StudioClock));
 
-const EditorFeatureWrapper = React.lazy(() => import('./features/EditorFeatureWrapper'));
-const RundownPanel = React.lazy(() => import('./features/rundown/RundownExport'));
-const TimerControl = React.lazy(() => import('./features/control/playback/TimerControlExport'));
-const MessageControl = React.lazy(() => import('./features/control/message/MessageControlExport'));
-
-Sentry.init({
-  dsn: sentryDsn,
-  integrations: [
-    Sentry.reactRouterV6BrowserTracingIntegration({
-      useEffect: React.useEffect,
-      useLocation,
-      useNavigationType,
-      createRoutesFromChildren,
-      matchRoutes,
-    }),
-  ],
-  tracesSampleRate: 0.3,
-  release: ONTIME_VERSION,
-  enabled: import.meta.env.PROD,
-  ignoreErrors: [...sentryRecommendedIgnore, /Unable to preload CSS/i, /dynamically imported module/i],
-  denyUrls: [/extensions\//i, /^chrome:\/\//i, /^chrome-extension:\/\//i],
-});
-
-const SentryRoutes = Sentry.withSentryReactRouterV6Routing(Routes);
+const EditorFeatureWrapper = lazy(() => import('./features/EditorFeatureWrapper'));
+const RundownPanel = lazy(() => import('./features/rundown/RundownExport'));
+const TimerControl = lazy(() => import('./features/control/playback/TimerControlExport'));
+const MessageControl = lazy(() => import('./features/control/message/MessageControlExport'));
+const Info = lazy(() => import('./features/info/InfoExport'));
 
 export default function AppRouter() {
-  // handle client path changes
-  useClientPath();
-
   return (
-    <React.Suspense fallback={null}>
-      <SentryRoutes>
+    <Suspense fallback={null}>
+      <Routes>
         <Route path='/' element={<Navigate to='/timer' />} />
-        <Route
-          path='/timer'
-          element={
-            <ViewLoader>
-              <STimer />
-            </ViewLoader>
-          }
-        />
-        <Route
-          path='/public'
-          element={
-            <ViewLoader>
-              <SPublic />
-            </ViewLoader>
-          }
-        />
-        <Route
-          path='/minimal'
-          element={
-            <ViewLoader>
-              <SMinimalTimer />
-            </ViewLoader>
-          }
-        />
-        <Route
-          path='/clock'
-          element={
-            <ViewLoader>
-              <SClock />
-            </ViewLoader>
-          }
-        />
-        <Route
-          path='/countdown'
-          element={
-            <ViewLoader>
-              <SCountdown />
-            </ViewLoader>
-          }
-        />
-        <Route
-          path='/backstage'
-          element={
-            <ViewLoader>
-              <SBackstage />
-            </ViewLoader>
-          }
-        />
-        <Route
-          path='/studio'
-          element={
-            <ViewLoader>
-              <SStudio />
-            </ViewLoader>
-          }
-        />
-        {/*/!* Lower third cannot have a loading screen *!/*/}
+        <Route path='/speaker' element={<STimer />} />
+        <Route path='/presenter' element={<STimer />} />
+        <Route path='/stage' element={<STimer />} />
+        <Route path='/timer' element={<STimer />} />
+
+        <Route path='/minimal' element={<SMinimalTimer />} />
+        <Route path='/minimalTimer' element={<SMinimalTimer />} />
+        <Route path='/simpleTimer' element={<SMinimalTimer />} />
+
+        <Route path='/clock' element={<SClock />} />
+
+        <Route path='/countdown' element={<SCountdown />} />
+
+        <Route path='/sm' element={<SBackstage />} />
+        <Route path='/backstage' element={<SBackstage />} />
+
+        <Route path='/public' element={<SPublic />} />
+        <Route path='/studio' element={<SStudio />} />
+        {/*/!* Lower cannot have fallback *!/*/}
         <Route path='/lower' element={<SLowerThird />} />
-        <Route
-          path='/timeline'
-          element={
-            <ViewLoader>
-              <STimeline />
-            </ViewLoader>
-          }
-        />
-        <Route
-          path='/info'
-          element={
-            <ViewLoader>
-              <SProjectInfo />
-            </ViewLoader>
-          }
-        />
+
+        <Route path='/op' element={<Operator />} />
+        <Route path='/operator' element={<Operator />} />
 
         {/*/!* Protected Routes *!/*/}
         <Route path='/editor' element={<Editor />} />
-        <Route path='/cuesheet' element={<PCuesheet />} />
-        <Route
-          path='/op'
-          element={
-            <ViewLoader>
-              <POperator />
-            </ViewLoader>
-          }
-        />
+        <Route path='/cuesheet' element={<Cuesheet />} />
+        <Route path='/cuelist' element={<Cuesheet />} />
+        <Route path='/table' element={<Cuesheet />} />
 
         {/*/!* Protected Routes - Elements *!/*/}
         <Route
@@ -193,16 +94,16 @@ export default function AppRouter() {
           }
         />
         <Route
-          path='/log'
+          path='/info'
           element={
             <EditorFeatureWrapper>
-              <Log />
+              <Info />
             </EditorFeatureWrapper>
           }
         />
         {/*/!* Send to default if nothing found *!/*/}
         <Route path='*' element={<STimer />} />
-      </SentryRoutes>
-    </React.Suspense>
+      </Routes>
+    </Suspense>
   );
 }

apps/client/src/common/api/apiConstants.ts

@@ -0,0 +1,27 @@
+// REST stuff
+export const PROJECT_DATA = ['project'];
+export const ALIASES = ['aliases'];
+export const USERFIELDS = ['userFields'];
+export const RUNDOWN = ['rundown'];
+export const APP_INFO = ['appinfo'];
+export const OSC_SETTINGS = ['oscSettings'];
+export const HTTP_SETTINGS = ['httpSettings'];
+export const APP_SETTINGS = ['appSettings'];
+export const VIEW_SETTINGS = ['viewSettings'];
+export const RUNTIME = ['runtimeStore'];
+
+const location = window.location;
+const socketProtocol = location.protocol === 'https:' ? 'wss' : 'ws';
+export const isProduction = import.meta.env.MODE === 'production';
+
+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 projectDataURL = `${serverURL}/project`;
+export const rundownURL = `${serverURL}/events`;
+export const ontimeURL = `${serverURL}/ontime`;
+
+export const stylesPath = 'external/styles/override.css';
+export const overrideStylesURL = `${serverURL}/${stylesPath}`;

apps/client/src/common/api/apiUtils.ts

@@ -6,11 +6,6 @@ import { ontimeQueryClient } from '../queryClient';
 import { addLog } from '../stores/logger';
 import { nowInMillis } from '../utils/time';
 
-/**
- * Utility unrwap a potential axios error
- * @param error
- * @returns
- */
 export function maybeAxiosError(error: unknown) {
   if (axios.isAxiosError(error)) {
     const statusText = (error as AxiosError).response?.statusText ?? '';
@@ -23,8 +18,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);
@@ -33,11 +26,6 @@ export function maybeAxiosError(error: unknown) {
   }
 }
 
-/**
- * Utility unrwaps a potential axios error and sends to logger
- * @param prepend
- * @param error
- */
 export function logAxiosError(prepend: string, error: unknown) {
   const message = `${prepend}: ${maybeAxiosError(error)}`;
 
@@ -54,32 +42,12 @@ export function logAxiosError(prepend: string, error: unknown) {
  * Utility function invalidates react-query caches
  */
 export async function invalidateAllCaches() {
-  await ontimeQueryClient.invalidateQueries();
-}
-
-/**
- * Creates blob from content
- * @param fileContent
- * @param type
- * @returns
- */
-export function createBlob(fileContent: string, type: string): Blob {
-  return new Blob([fileContent], { type });
-}
-
-/**
- * downloads a blob
- * @param downloadUrl
- * @param fileName
- */
-export function downloadBlob(blob: Blob, fileName: string) {
-  const downloadUrl = URL.createObjectURL(blob);
-  const link = document.createElement('a');
-  link.setAttribute('href', downloadUrl);
-  link.setAttribute('download', fileName);
-  document.body.appendChild(link);
-  link.click();
-
-  // Clean up the URL.createObjectURL to release resources
-  URL.revokeObjectURL(downloadUrl);
+  await ontimeQueryClient.invalidateQueries({ queryKey: ['project'] });
+  await ontimeQueryClient.invalidateQueries({ queryKey: ['aliases'] });
+  await ontimeQueryClient.invalidateQueries({ queryKey: ['userFields'] });
+  await ontimeQueryClient.invalidateQueries({ queryKey: ['rundown'] });
+  await ontimeQueryClient.invalidateQueries({ queryKey: ['appinfo'] });
+  await ontimeQueryClient.invalidateQueries({ queryKey: ['oscSettings'] });
+  await ontimeQueryClient.invalidateQueries({ queryKey: ['appSettings'] });
+  await ontimeQueryClient.invalidateQueries({ queryKey: ['viewSettings'] });
 }

apps/client/src/common/api/assets.ts

@@ -1,30 +0,0 @@
-import axios from 'axios';
-
-import { apiEntryUrl } from './constants';
-
-const assetsPath = `${apiEntryUrl}/assets`;
-
-/**
- * HTTP request to get css contents
- */
-export async function getCSSContents(): Promise<string> {
-  const res = await axios.get(`${assetsPath}/css`);
-  return res.data;
-}
-
-/**
- * HTTP request to post css contents
- */
-export async function postCSSContents(css: string): Promise<void> {
-  await axios.post(`${assetsPath}/css`, {
-    css,
-  });
-}
-
-/**
- * HTTP request to restore default css
- */
-export async function restoreCSSContents(): Promise<string> {
-  const res = await axios.post(`${assetsPath}/css/restore`);
-  return res.data;
-}

apps/client/src/common/api/automation.ts

@@ -1,85 +0,0 @@
-import axios from 'axios';
-import type {
-  Automation,
-  AutomationDTO,
-  AutomationOutput,
-  AutomationSettings,
-  Trigger,
-  TriggerDTO,
-} from 'ontime-types';
-
-import { apiEntryUrl } from './constants';
-
-const automationsPath = `${apiEntryUrl}/automations`;
-
-/**
- * HTTP request to get the automations settings
- */
-export async function getAutomationSettings(): Promise<AutomationSettings> {
-  const res = await axios.get(automationsPath);
-  return res.data;
-}
-
-/**
- * HTTP request to edit the automations settings
- */
-export async function editAutomationSettings(
-  automationSettings: Partial<AutomationSettings>,
-): Promise<AutomationSettings> {
-  const res = await axios.post(automationsPath, automationSettings);
-  return res.data;
-}
-
-/**
- * HTTP request to create a new automation trigger
- */
-export async function addTrigger(trigger: TriggerDTO): Promise<Trigger> {
-  const res = await axios.post(`${automationsPath}/trigger`, trigger);
-  return res.data;
-}
-
-/**
- * HTTP request to update an automation trigger
- */
-export async function editTrigger(id: string, trigger: Trigger): Promise<Trigger> {
-  const res = await axios.put(`${automationsPath}/trigger/${id}`, trigger);
-  return res.data;
-}
-
-/**
- * HTTP request to delete an automation trigger
- */
-export function deleteTrigger(id: string): Promise<void> {
-  return axios.delete(`${automationsPath}/trigger/${id}`);
-}
-
-/**
- * HTTP request to create a new automation
- */
-export async function addAutomation(automation: AutomationDTO): Promise<Automation> {
-  const res = await axios.post(`${automationsPath}/automation`, automation);
-  return res.data;
-}
-
-/**
- * HTTP request to update a automation
- */
-export async function editAutomation(id: string, automation: Automation): Promise<Automation> {
-  const res = await axios.put(`${automationsPath}/automation/${id}`, automation);
-  return res.data;
-}
-
-/**
- * HTTP request to delete a automation
- */
-export function deleteAutomation(id: string): Promise<void> {
-  return axios.delete(`${automationsPath}/automation/${id}`);
-}
-
-/**
- * HTTP request to test automation output
- * The return is irrelevant as we care for the resolution of the promise
- */
-export function testOutput(output: AutomationOutput): Promise<void> {
-  return axios.post(`${automationsPath}/test`, output);
-}

apps/client/src/common/api/constants.ts

@@ -1,29 +0,0 @@
-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 AUTOMATION = ['automation'];
-export const CUSTOM_FIELDS = ['customFields'];
-export const PROJECT_DATA = ['project'];
-export const PROJECT_LIST = ['projectList'];
-export const RUNDOWN = ['rundown'];
-export const RUNTIME = ['runtimeStore'];
-export const SHEET_STATE = ['sheetState'];
-export const URL_PRESETS = ['urlpresets'];
-export const VIEW_SETTINGS = ['viewSettings'];
-export const CLIENT_LIST = ['clientList'];
-export const REPORT = ['report'];
-
-// API URLs
-export const apiEntryUrl = `${serverURL}/data`;
-
-export const projectDataURL = `${serverURL}/project`;
-export const rundownURL = `${serverURL}/events`;
-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`;

apps/client/src/common/api/customFields.ts

@@ -1,38 +0,0 @@
-import axios from 'axios';
-import { CustomField, CustomFieldLabel, CustomFields } from 'ontime-types';
-
-import { apiEntryUrl } from './constants';
-
-const customFieldsPath = `${apiEntryUrl}/custom-fields`;
-
-/**
- * Requests list of known custom fields
- */
-export async function getCustomFields(): Promise<CustomFields> {
-  const res = await axios.get(customFieldsPath);
-  return res.data;
-}
-
-/**
- * Sets list of known custom fields
- */
-export async function postCustomField(newField: CustomField): Promise<CustomFields> {
-  const res = await axios.post(customFieldsPath, { ...newField });
-  return res.data;
-}
-
-/**
- * Edits single custom field
- */
-export async function editCustomField(label: CustomFieldLabel, newField: CustomField): Promise<CustomFields> {
-  const res = await axios.put(`${customFieldsPath}/${label}`, { ...newField });
-  return res.data;
-}
-
-/**
- * Deletes single custom field
- */
-export async function deleteCustomField(label: CustomFieldLabel): Promise<CustomFields> {
-  const res = await axios.delete(`${customFieldsPath}/${label}`);
-  return res.data;
-}

apps/client/src/common/api/db.ts

@@ -1,177 +0,0 @@
-import axios, { AxiosResponse } from 'axios';
-import { DatabaseModel, MessageResponse, ProjectData, ProjectFileListResponse, QuickStartData } from 'ontime-types';
-
-import { makeTable } from '../../views/cuesheet/cuesheet.utils';
-import { makeCSVFromArrayOfArrays } from '../utils/csv';
-
-import { apiEntryUrl } from './constants';
-import { createBlob, downloadBlob } from './utils';
-
-const dbPath = `${apiEntryUrl}/db`;
-
-/**
- * HTTP request to the current DB
- */
-export function getDb(filename: string): Promise<AxiosResponse<DatabaseModel>> {
-  return axios.post(`${dbPath}/download`, { filename });
-}
-
-/**
- * Request download of the current project file
- * @param fileName
- */
-export async function downloadProject(fileName: string) {
-  try {
-    const { data, name } = await fileDownload(fileName);
-
-    const fileContent = JSON.stringify(data, null, 2);
-
-    const blob = createBlob(fileContent, 'application/json;charset=utf-8;');
-    downloadBlob(blob, `${name}.json`);
-  } catch (error) {
-    console.error(error);
-  }
-}
-
-/**
- * Request download of the current rundown as a CSV file
- * @param fileName
- */
-export async function downloadCSV(fileName: string = 'rundown') {
-  try {
-    const { data, name } = await fileDownload(fileName);
-    const { project, rundown, customFields } = data;
-
-    const sheetData = makeTable(project, rundown, customFields);
-    const fileContent = makeCSVFromArrayOfArrays(sheetData);
-
-    const blob = createBlob(fileContent, 'text/csv;charset=utf-8;');
-    downloadBlob(blob, `${name}.csv`);
-  } catch (error) {
-    console.error(error);
-  }
-}
-
-/**
- * HTTP request to upload project file
- */
-export async function uploadProjectFile(file: File): Promise<MessageResponse> {
-  const formData = new FormData();
-  formData.append('project', file);
-  const response = await axios.post(`${dbPath}/upload`, formData, {
-    headers: {
-      'Content-Type': 'multipart/form-data',
-    },
-  });
-  return response.data;
-}
-
-/**
- * Make patch changes to the objects in the db
- */
-export async function patchData(patchDb: Partial<DatabaseModel>): Promise<AxiosResponse<DatabaseModel>> {
-  return await axios.patch(dbPath, patchDb);
-}
-
-/**
- * HTTP request to create a project file
- */
-export async function createProject(
-  project: Partial<
-    ProjectData & {
-      filename: string;
-    }
-  >,
-): Promise<MessageResponse> {
-  const res = await axios.post(`${dbPath}/new`, project);
-  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
- */
-export async function getProjects(): Promise<ProjectFileListResponse> {
-  const res = await axios.get(`${dbPath}/all`);
-  return res.data;
-}
-
-/**
- * HTTP request to load a project file
- */
-export async function loadProject(filename: string): Promise<MessageResponse> {
-  const res = await axios.post(`${dbPath}/load`, {
-    filename,
-  });
-  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
- */
-export async function duplicateProject(filename: string, newFilename: string): Promise<MessageResponse> {
-  const url = `${dbPath}/${filename}/duplicate`;
-  const decodedUrl = decodeURIComponent(url);
-  const res = await axios.post(decodedUrl, {
-    newFilename,
-  });
-  return res.data;
-}
-
-/**
- * HTTP request to rename a project file
- */
-export async function renameProject(filename: string, newFilename: string): Promise<MessageResponse> {
-  const url = `${dbPath}/${filename}/rename`;
-  const decodedUrl = decodeURIComponent(url);
-  const res = await axios.put(decodedUrl, {
-    newFilename,
-  });
-  return res.data;
-}
-
-/**
- * HTTP request to delete a project file
- */
-export async function deleteProject(filename: string): Promise<MessageResponse> {
-  const url = `${dbPath}/${filename}`;
-  const decodedUrl = decodeURIComponent(url);
-  const res = await axios.delete(decodedUrl);
-  return res.data;
-}
-
-/**
- * Utility function gets project from db
- * @param fileName
- * @returns
- */
-async function fileDownload(fileName: string): Promise<{ data: DatabaseModel; name: string }> {
-  const response = await getDb(fileName);
-
-  const headerLine = response.headers['Content-Disposition'];
-
-  // try and get the filename from the response
-  let name = fileName;
-  if (headerLine != null) {
-    const startFileNameIndex = headerLine.indexOf('"') + 1;
-    const endFileNameIndex = headerLine.lastIndexOf('"');
-    name = headerLine.substring(startFileNameIndex, endFileNameIndex);
-  }
-
-  return { data: response.data, name };
-}

apps/client/src/common/api/eventsApi.ts

@@ -0,0 +1,90 @@
+import axios from 'axios';
+import { GetRundownCached, OntimeRundown, OntimeRundownEntry } from 'ontime-types';
+
+import { rundownURL } from './apiConstants';
+
+/**
+ * @description HTTP request to fetch all events
+ * @return {Promise}
+ */
+export async function fetchCachedRundown(): Promise<GetRundownCached> {
+  const res = await axios.get(`${rundownURL}/cached`);
+  return res.data;
+}
+
+/**
+ * @deprecated use fetchCachedRundown instead
+ * @description HTTP request to fetch all events
+ * @return {Promise}
+ */
+export async function fetchRundown(): Promise<OntimeRundown> {
+  const res = await axios.get(rundownURL);
+  return res.data;
+}
+
+/**
+ * @description HTTP request to post new event
+ * @return {Promise}
+ */
+export async function requestPostEvent(data: OntimeRundownEntry) {
+  return axios.post(rundownURL, data);
+}
+
+/**
+ * @description HTTP request to put new event
+ * @return {Promise}
+ */
+export async function requestPutEvent(data: Partial<OntimeRundownEntry>) {
+  return axios.put(rundownURL, data);
+}
+
+export type ReorderEntry = {
+  eventId: string;
+  from: number;
+  to: number;
+};
+
+/**
+ * @description HTTP request to reorder events
+ * @return {Promise}
+ */
+export async function requestReorderEvent(data: ReorderEntry) {
+  return axios.patch(`${rundownURL}/reorder`, data);
+}
+
+/**
+ * @description HTTP request to request application of delay
+ * @return {Promise}
+ */
+export async function requestApplyDelay(eventId: string) {
+  return axios.patch(`${rundownURL}/applydelay/${eventId}`);
+}
+
+export type SwapEntry = {
+  from: string;
+  to: string;
+};
+
+/**
+ * @description HTTP request to swap two events
+ * @return {Promise}
+ */
+export async function requestEventSwap(data: SwapEntry) {
+  return axios.patch(`${rundownURL}/swap`, data);
+}
+
+/**
+ * @description HTTP request to delete given event
+ * @return {Promise}
+ */
+export async function requestDelete(eventId: string) {
+  return axios.delete(`${rundownURL}/${eventId}`);
+}
+
+/**
+ * @description HTTP request to delete all events
+ * @return {Promise}
+ */
+export async function requestDeleteAll() {
+  return axios.delete(`${rundownURL}/all`);
+}

apps/client/src/common/api/excel.ts

@@ -1,42 +0,0 @@
-import axios, { AxiosResponse } from 'axios';
-import { CustomFields, OntimeRundown } from 'ontime-types';
-import { ImportMap } from 'ontime-utils';
-
-import { apiEntryUrl } from './constants';
-
-const excelPath = `${apiEntryUrl}/excel`;
-
-type PreviewSpreadsheetResponse = {
-  rundown: OntimeRundown;
-  customFields: CustomFields;
-};
-
-/**
- * upload Excel file to server
- * @return string - file ID op the uploaded file
- */
-export async function upload(file: File) {
-  const formData = new FormData();
-  formData.append('excel', file);
-  await axios.post(`${excelPath}/upload`, formData, {
-    headers: {
-      'Content-Type': 'multipart/form-data',
-    },
-  });
-}
-
-/**
- * Get Worksheet names
- * @return string[] - array of available worksheets
- */
-export async function getWorksheetNames(): Promise<string[]> {
-  const response: AxiosResponse<string[]> = await axios.get(`${excelPath}/worksheets`);
-  return response.data;
-}
-
-export async function importRundownPreview(options: ImportMap): Promise<PreviewSpreadsheetResponse> {
-  const response: AxiosResponse<PreviewSpreadsheetResponse> = await axios.post(`${excelPath}/preview`, {
-    options,
-  });
-  return response.data;
-}

apps/client/src/common/api/external.ts

@@ -1,19 +0,0 @@
-import axios from 'axios';
-
-import { apiRepoLatest } from '../../externals';
-
-export type HasUpdate = {
-  url: string;
-  version: string;
-};
-
-/**
- * HTTP request to get the latest version and url from github
- */
-export async function getLatestVersion(): Promise<HasUpdate> {
-  const res = await axios.get(`${apiRepoLatest}`);
-  return {
-    url: res.data.html_url as string,
-    version: res.data.tag_name as string,
-  };
-}

apps/client/src/common/api/ontimeApi.ts

@@ -0,0 +1,308 @@
+import axios, { AxiosResponse } from 'axios';
+import {
+  Alias,
+  DatabaseModel,
+  GetInfo,
+  GoogleSheet,
+  GoogleSheetState,
+  HttpSettings,
+  OntimeRundown,
+  OSCSettings,
+  OscSubscription,
+  ProjectData,
+  Settings,
+  UserFields,
+  ViewSettings,
+} from 'ontime-types';
+import { ExcelImportMap } from 'ontime-utils';
+
+import { apiRepoLatest } from '../../externals';
+import fileDownload from '../utils/fileDownload';
+
+import { ontimeURL } from './apiConstants';
+
+/**
+ * @description HTTP request to retrieve application settings
+ * @return {Promise}
+ */
+export async function getSettings(): Promise<Settings> {
+  const res = await axios.get(`${ontimeURL}/settings`);
+  return res.data;
+}
+
+/**
+ * @description HTTP request to mutate application settings
+ * @return {Promise}
+ */
+export async function postSettings(data: Settings) {
+  return axios.post(`${ontimeURL}/settings`, data);
+}
+
+/**
+ * @description HTTP request to retrieve application info
+ * @return {Promise}
+ */
+export async function getInfo(): Promise<GetInfo> {
+  const res = await axios.get(`${ontimeURL}/info`);
+  return res.data;
+}
+
+/**
+ * @description HTTP request to retrieve view settings
+ * @return {Promise}
+ */
+export async function getView(): Promise<ViewSettings> {
+  const res = await axios.get(`${ontimeURL}/views`);
+  return res.data;
+}
+
+/**
+ * @description HTTP request to mutate view settings
+ * @return {Promise}
+ */
+export async function postViewSettings(data: ViewSettings) {
+  return axios.post(`${ontimeURL}/views`, data);
+}
+
+/**
+ * @description HTTP request to retrieve aliases
+ * @return {Promise}
+ */
+export async function getAliases(): Promise<Alias[]> {
+  const res = await axios.get(`${ontimeURL}/aliases`);
+  return res.data;
+}
+
+/**
+ * @description HTTP request to mutate aliases
+ * @return {Promise}
+ */
+export async function postAliases(data: Alias[]) {
+  return axios.post(`${ontimeURL}/aliases`, data);
+}
+
+/**
+ * @description HTTP request to retrieve user fields
+ * @return {Promise}
+ */
+export async function getUserFields(): Promise<UserFields> {
+  const res = await axios.get(`${ontimeURL}/userfields`);
+  return res.data;
+}
+
+/**
+ * @description HTTP request to mutate user fields
+ * @return {Promise}
+ */
+export async function postUserFields(data: UserFields) {
+  return axios.post(`${ontimeURL}/userfields`, data);
+}
+
+/**
+ * @description HTTP request to retrieve osc settings
+ * @return {Promise}
+ */
+export async function getOSC(): Promise<OSCSettings> {
+  const res = await axios.get(`${ontimeURL}/osc`);
+  return res.data;
+}
+
+/**
+ * @description HTTP request to retrieve http settings
+ * @return {Promise}
+ */
+export async function getHTTP(): Promise<HttpSettings> {
+  const res = await axios.get(`${ontimeURL}/http`);
+  return res.data;
+}
+
+/**
+ * @description HTTP request to mutate http settings
+ * @return {Promise}
+ */
+export async function postHTTP(data: HttpSettings) {
+  return axios.post(`${ontimeURL}/http`, data);
+}
+
+/**
+ * @description HTTP request to mutate osc settings
+ * @return {Promise}
+ */
+export async function postOSC(data: OSCSettings) {
+  return axios.post(`${ontimeURL}/osc`, data);
+}
+
+/**
+ * @description HTTP request to mutate osc subscriptions
+ * @return {Promise}
+ */
+export async function postOscSubscriptions(data: OscSubscription) {
+  return axios.post(`${ontimeURL}/osc-subscriptions`, data);
+}
+
+/**
+ * @description HTTP request to download db in CSV format
+ */
+export const downloadCSV = () => {
+  return fileDownload(ontimeURL, { name: 'rundown', type: 'csv' }, { type: 'text/csv;charset=utf-8;' });
+};
+
+/**
+ * @description HTTP request to download db in JSON format
+ */
+export const downloadRundown = () => {
+  return fileDownload(ontimeURL, { name: 'rundown', type: 'json' }, { type: 'application/json;charset=utf-8;' });
+};
+
+// TODO: should this be extracted to shared code?
+export type ProjectFileImportOptions = {
+  onlyRundown: boolean;
+};
+
+/**
+ * @description HTTP request to upload events db
+ * @return {Promise}
+ */
+export const uploadProjectFile = async (
+  file: File,
+  setProgress: (value: number) => void,
+  options?: Partial<ProjectFileImportOptions>,
+) => {
+  const formData = new FormData();
+  formData.append('userFile', file);
+
+  const onlyRundown = Boolean(options?.onlyRundown);
+
+  await axios
+    .post(`${ontimeURL}/db?onlyRundown=${onlyRundown}`, formData, {
+      headers: {
+        'Content-Type': 'multipart/form-data',
+      },
+      onUploadProgress: (progressEvent) => {
+        const complete = progressEvent?.total ? Math.round((progressEvent.loaded * 100) / progressEvent.total) : 0;
+        setProgress(complete);
+      },
+    })
+    .then((response) => response.data.id);
+};
+
+/**
+ * @description Make patch changes to the objects in the db
+ * @return {Promise}
+ */
+export async function patchData(patchDb: Partial<DatabaseModel>) {
+  const response = await axios.patch(`${ontimeURL}/db`, patchDb);
+  return response;
+}
+
+type PostPreviewExcelResponse = {
+  rundown: OntimeRundown;
+  project: ProjectData;
+  userFields: UserFields;
+};
+
+/**
+ * @description Make patch changes to the objects in the db
+ * @return {Promise} - returns parsed rundown and userfields
+ */
+export async function postPreviewExcel(file: File, setProgress: (value: number) => void, options?: ExcelImportMap) {
+  const formData = new FormData();
+  formData.append('userFile', file);
+  formData.append('options', JSON.stringify(options));
+
+  const response: AxiosResponse<PostPreviewExcelResponse> = await axios.post(
+    `${ontimeURL}/preview-spreadsheet`,
+    formData,
+    {
+      headers: {
+        'Content-Type': 'multipart/form-data',
+      },
+      onUploadProgress: (progressEvent) => {
+        const complete = progressEvent?.total ? Math.round((progressEvent.loaded * 100) / progressEvent.total) : 0;
+        setProgress(complete);
+      },
+    },
+  );
+
+  return response;
+}
+
+export type HasUpdate = {
+  url: string;
+  version: string;
+};
+
+/**
+ * @description HTTP request to get the latest version and url from github
+ * @return {Promise}
+ */
+export async function getLatestVersion(): Promise<HasUpdate> {
+  const res = await axios.get(`${apiRepoLatest}`);
+  return {
+    url: res.data.html_url as string,
+    version: res.data.tag_name as string,
+  };
+}
+
+export async function postNew(initialData: Partial<ProjectData>) {
+  return axios.post(`${ontimeURL}/new`, initialData);
+}
+
+/**
+ * @description sheet Client File
+ * @return {Promise}
+ */
+export const uploadSheetClientFile = async (file: File) => {
+  const formData = new FormData();
+  formData.append('userFile', file);
+  const res = await axios
+    .post(`${ontimeURL}/sheet-clientsecrect`, formData, {
+      headers: {
+        'Content-Type': 'multipart/form-data',
+      },
+    })
+    .then((response) => response.data.id);
+  return res;
+};
+
+export const getSheetsAuthUrl = async () => {
+  const res = await axios.get(`${ontimeURL}/sheet-authurl`);
+  return res.data;
+};
+
+export const postPreviewSheet = async () => {
+  const response = await axios.post(`${ontimeURL}/sheet-preview`);
+  return response.data.data;
+};
+
+export const postPushSheet = async () => {
+  const response = await axios.post(`${ontimeURL}/sheet-push`);
+  return response.data.data;
+};
+
+/**
+ * @description HTTP request to retrieve google sheets settings
+ * @return {Promise}
+ */
+export async function getSheetSettings(): Promise<GoogleSheet> {
+  const res = await axios.get(`${ontimeURL}/sheet-settings`);
+  return res.data;
+}
+
+/**
+ * @description HTTP request to mutate google sheets settings
+ * @return {Promise}
+ */
+export async function postSheetSettings(data: GoogleSheet): Promise<GoogleSheet> {
+  const res = await axios.post(`${ontimeURL}/sheet-settings`, data);
+  return res.data;
+}
+
+/**
+ * @description HTTP request to retrieve google sheets state
+ * @return {Promise}
+ */
+export async function getSheetstate(): Promise<GoogleSheetState> {
+  const res = await axios.get(`${ontimeURL}/sheet-state`);
+  return res.data;
+}

apps/client/src/common/api/project.ts

@@ -1,36 +0,0 @@
-import axios, { AxiosResponse } from 'axios';
-import { ProjectData, ProjectLogoResponse } from 'ontime-types';
-
-import { apiEntryUrl } from './constants';
-
-const projectPath = `${apiEntryUrl}/project`;
-
-/**
- * HTTP request to fetch project data
- */
-export async function getProjectData(): Promise<ProjectData> {
-  const res = await axios.get(projectPath);
-  return res.data;
-}
-
-/**
- * HTTP request to mutate project data
- */
-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;
-}

apps/client/src/common/api/projectDataApi.ts

@@ -0,0 +1,21 @@
+import axios from 'axios';
+import { ProjectData } from 'ontime-types';
+
+import { projectDataURL } from './apiConstants';
+
+/**
+ * @description HTTP request to fetch project data
+ * @return {Promise}
+ */
+export async function getProjectData(): Promise<ProjectData> {
+  const res = await axios.get(projectDataURL);
+  return res.data;
+}
+
+/**
+ * @description HTTP request to mutate project data
+ * @return {Promise}
+ */
+export async function postProjectData(data: ProjectData) {
+  return axios.post(projectDataURL, data);
+}

apps/client/src/common/api/report.ts

@@ -1,26 +0,0 @@
-import axios from 'axios';
-import { OntimeReport } from 'ontime-types';
-
-import { ontimeQueryClient } from '../../common/queryClient';
-
-import { apiEntryUrl, REPORT } from './constants';
-
-export const reportUrl = `${apiEntryUrl}/report`;
-
-/**
- * HTTP request to fetch all reports
- */
-export async function fetchReport(): Promise<OntimeReport> {
-  const res = await axios.get(`${reportUrl}/`);
-  return res.data;
-}
-
-export async function deleteReport(id: string) {
-  await axios.delete(`${reportUrl}/${id}`);
-  await ontimeQueryClient.invalidateQueries({ queryKey: REPORT });
-}
-
-export async function deleteAllReport() {
-  await axios.delete(`${reportUrl}/all`);
-  await ontimeQueryClient.invalidateQueries({ queryKey: REPORT });
-}

apps/client/src/common/api/rundown.ts

@@ -1,86 +0,0 @@
-import axios, { AxiosResponse } from 'axios';
-import { MessageResponse, OntimeEvent, OntimeRundownEntry, RundownCached, TransientEventPayload } from 'ontime-types';
-
-import { apiEntryUrl } from './constants';
-
-const rundownPath = `${apiEntryUrl}/rundown`;
-
-/**
- * HTTP request to fetch all events
- */
-export async function fetchNormalisedRundown(): Promise<RundownCached> {
-  const res = await axios.get(`${rundownPath}/normalised`);
-  return res.data;
-}
-
-/**
- * HTTP request to post new event
- */
-export async function requestPostEvent(data: TransientEventPayload): Promise<AxiosResponse<OntimeRundownEntry>> {
-  return axios.post(rundownPath, data);
-}
-
-/**
- * HTTP request to put new event
- */
-export async function requestPutEvent(data: Partial<OntimeRundownEntry>): Promise<AxiosResponse<OntimeRundownEntry>> {
-  return axios.put(rundownPath, data);
-}
-
-type BatchEditEntry = {
-  data: Partial<OntimeEvent>;
-  ids: string[];
-};
-
-/**
- * HTTP request to put multiple events
- */
-export async function requestBatchPutEvents(data: BatchEditEntry): Promise<AxiosResponse<MessageResponse>> {
-  return axios.put(`${rundownPath}/batch`, data);
-}
-
-export type ReorderEntry = {
-  eventId: string;
-  from: number;
-  to: number;
-};
-
-/**
- * HTTP request to reorder events
- */
-export async function requestReorderEvent(data: ReorderEntry): Promise<AxiosResponse<OntimeRundownEntry>> {
-  return axios.patch(`${rundownPath}/reorder`, data);
-}
-
-export type SwapEntry = {
-  from: string;
-  to: string;
-};
-
-/**
- * HTTP request to swap two events
- */
-export async function requestEventSwap(data: SwapEntry): Promise<AxiosResponse<MessageResponse>> {
-  return axios.patch(`${rundownPath}/swap`, data);
-}
-
-/**
- * HTTP request to request application of delay
- */
-export async function requestApplyDelay(eventId: string): Promise<AxiosResponse<MessageResponse>> {
-  return axios.patch(`${rundownPath}/applydelay/${eventId}`);
-}
-
-/**
- * HTTP request to delete given event
- */
-export async function requestDelete(eventIds: string[]): Promise<AxiosResponse<MessageResponse>> {
-  return axios.delete(rundownPath, { data: { ids: eventIds } });
-}
-
-/**
- * HTTP request to delete all events
- */
-export async function requestDeleteAll(): Promise<AxiosResponse<MessageResponse>> {
-  return axios.delete(`${rundownPath}/all`);
-}

apps/client/src/common/api/session.ts

@@ -1,27 +0,0 @@
-import axios from 'axios';
-import { GetInfo } from 'ontime-types';
-
-import { apiEntryUrl } from './constants';
-
-const sessionPath = `${apiEntryUrl}/session`;
-
-/**
- * HTTP request to retrieve application info
- */
-export async function getInfo(): Promise<GetInfo> {
-  const res = await axios.get(`${sessionPath}/info`);
-  return res.data;
-}
-
-/**
- * HTTP request to get a pre-authenticated URL
- */
-export async function generateUrl(
-  baseUrl: string,
-  path: string,
-  lock: boolean,
-  authenticate: boolean,
-): Promise<string> {
-  const res = await axios.post(`${sessionPath}/url`, { baseUrl, path, lock, authenticate });
-  return res.data.url;
-}

apps/client/src/common/api/settings.ts

@@ -1,28 +0,0 @@
-import axios, { AxiosResponse } from 'axios';
-import { Settings } from 'ontime-types';
-
-import { apiEntryUrl } from './constants';
-
-const settingsPath = `${apiEntryUrl}/settings`;
-
-/**
- * HTTP request to retrieve application settings
- */
-export async function getSettings(): Promise<Settings> {
-  const res = await axios.get(settingsPath);
-  return res.data;
-}
-
-/**
- * HTTP request to mutate application settings
- */
-export async function postSettings(data: Settings): Promise<AxiosResponse<Settings>> {
-  return axios.post(settingsPath, data);
-}
-
-/**
- * Allows setting the welcome modal dialog state from the clients
- */
-export async function postShowWelcomeDialog(show: boolean) {
-  axios.post(`${settingsPath}/welcomedialog`, { show });
-}

apps/client/src/common/api/sheets.ts

@@ -1,75 +0,0 @@
-import axios, { AxiosResponse } from 'axios';
-import { AuthenticationStatus, CustomFields, OntimeRundown } from 'ontime-types';
-import { ImportMap } from 'ontime-utils';
-
-import { apiEntryUrl } from './constants';
-
-const sheetsPath = `${apiEntryUrl}/sheets`;
-
-/**
- * HTTP request to verify whether we are authenticated with Google Sheet service
- */
-export const verifyAuthenticationStatus = async (): Promise<{
-  authenticated: AuthenticationStatus;
-  sheetId: string;
-}> => {
-  const response = await axios.get(`${sheetsPath}/connect`);
-  return response.data;
-};
-
-/**
- * HTTP request to initiate the authentication service with google
- */
-export const requestConnection = async (
-  file: File,
-  sheetId: string,
-): Promise<{
-  verification_url: string;
-  user_code: string;
-}> => {
-  const formData = new FormData();
-  formData.append('client_secret', file);
-
-  const response = await axios.post(`${sheetsPath}/${sheetId}/connect`, formData, {
-    headers: {
-      'Content-Type': 'multipart/form-data',
-    },
-  });
-
-  return response.data;
-};
-
-/**
- * HTTP request to revoke authentication to google sheet
- */
-export const revokeAuthentication = async (): Promise<{ authenticated: AuthenticationStatus }> => {
-  const response = await axios.post(`${sheetsPath}/revoke`);
-  return response.data;
-};
-
-/**
- * HTTP request to upload preview the contents of a google sheet as rundown
- */
-export const previewRundown = async (
-  sheetId: string,
-  options: ImportMap,
-): Promise<{
-  rundown: OntimeRundown;
-  customFields: CustomFields;
-}> => {
-  const response = await axios.post(`${sheetsPath}/${sheetId}/read`, { options });
-  return response.data;
-};
-
-export const getWorksheetNames = async (sheetId: string): Promise<string[]> => {
-  const response: AxiosResponse<string[]> = await axios.post(`${sheetsPath}/${sheetId}/worksheets`);
-  return response.data;
-};
-
-/**
- * HTTP request to upload the rundown to a google sheet
- */
-export const uploadRundown = async (sheetId: string, options: ImportMap): Promise<void> => {
-  const response = await axios.post(`${sheetsPath}/${sheetId}/write`, { options });
-  return response.data;
-};

apps/client/src/common/api/urlPresets.ts

@@ -1,21 +0,0 @@
-import axios from 'axios';
-import { URLPreset } from 'ontime-types';
-
-import { apiEntryUrl } from './constants';
-
-const urlPresetsPath = `${apiEntryUrl}/url-presets`;
-
-/**
- * HTTP request to retrieve aliases
- */
-export async function getUrlPresets(): Promise<URLPreset[]> {
-  const res = await axios.get(urlPresetsPath);
-  return res.data;
-}
-
-/**
- * HTTP request to mutate aliases
- */
-export async function postUrlPresets(data: URLPreset[]): Promise<URLPreset[]> {
-  return axios.post(urlPresetsPath, data);
-}

apps/client/src/common/api/viewSettings.ts

@@ -1,21 +0,0 @@
-import axios from 'axios';
-import { ViewSettings } from 'ontime-types';
-
-import { apiEntryUrl } from './constants';
-
-const viewSettingsPath = `${apiEntryUrl}/view-settings`;
-
-/**
- * HTTP request to retrieve view settings
- */
-export async function getView(): Promise<ViewSettings> {
-  const res = await axios.get(viewSettingsPath);
-  return res.data;
-}
-
-/**
- * HTTP request to mutate view settings
- */
-export async function postViewSettings(data: ViewSettings) {
-  return axios.post(viewSettingsPath, data);
-}

apps/client/src/common/components/buttons/IconButton.module.scss

@@ -1,26 +0,0 @@
-.subtle {
-  aspect-ratio: 1;
-  height: 2rem;
-  height: 2rem;
-  display: grid;
-  place-content: center;
-
-  background: $gray-1050;
-  color: $blue-400;
-  border: 1px solid transparent;
-  border-radius: 3px;
-
-  &:hover:not(:disabled):not(:active) {
-    background: $gray-1000;
-    color: $blue-500;
-  }
-
-  &:active {
-    background: $gray-1100;
-    border-color: $gray-1250;
-  }
-
-  &:disabled {
-    background: $gray-1050;
-  }
-}

apps/client/src/common/components/buttons/IconButton.tsx

@@ -1,14 +0,0 @@
-import { ButtonHTMLAttributes } from 'react';
-
-import { cx } from '../../utils/styleUtils';
-
-import style from './IconButton.module.scss';
-
-export default function IconButton(props: ButtonHTMLAttributes<HTMLButtonElement>) {
-  const { className, children, ...buttonProps } = props;
-  return (
-    <button className={cx([style.subtle, className])} {...buttonProps}>
-      {children}
-    </button>
-  );
-}

apps/client/src/common/components/buttons/QuitIconBtn.tsx

@@ -0,0 +1,98 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+import {
+  AlertDialog,
+  AlertDialogBody,
+  AlertDialogContent,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogOverlay,
+  Button,
+  IconButton,
+  Tooltip,
+} from '@chakra-ui/react';
+import { FiPower } from '@react-icons/all-files/fi/FiPower';
+
+import { Size } from '../../models/Util.type';
+import { useEmitLog } from '../../stores/logger';
+
+interface QuitIconBtnProps {
+  clickHandler: () => void;
+  size?: Size;
+  disabled?: boolean;
+}
+
+const quitBtnStyle = {
+  color: '#D20300', // $red-700
+  borderColor: '#D20300', // $red-700
+  _focus: { boxShadow: 'none' },
+  _hover: {
+    background: '#D20300', // $red-700
+    color: 'white',
+    _disabled: {
+      color: '#D20300', // $red-700
+      background: 'none',
+    },
+  },
+  _active: {
+    background: '#9A0000', // $red-1000
+    color: 'white',
+  },
+  variant: 'outline',
+  isRound: true,
+};
+
+export default function QuitIconBtn(props: QuitIconBtnProps) {
+  const { clickHandler, size = 'lg', disabled, ...rest } = props;
+  const [isOpen, setIsOpen] = useState(false);
+  const { emitInfo } = useEmitLog();
+  const onClose = () => setIsOpen(false);
+  const cancelRef = useRef<HTMLButtonElement | null>(null);
+
+  useEffect(() => {
+    if (window.process?.type === 'renderer') {
+      window.ipcRenderer.on('user-request-shutdown', () => {
+        emitInfo('Shutdown request');
+        setIsOpen(true);
+      });
+    }
+  }, [emitInfo]);
+
+  const handleShutdown = useCallback(() => {
+    onClose();
+    clickHandler();
+  }, [clickHandler]);
+
+  return (
+    <>
+      <Tooltip label='Quit Application'>
+        <IconButton
+          aria-label='Quit Application'
+          size={size}
+          icon={<FiPower />}
+          onClick={() => setIsOpen(true)}
+          isDisabled={disabled}
+          {...quitBtnStyle}
+          {...rest}
+        />
+      </Tooltip>
+      <AlertDialog isOpen={isOpen} leastDestructiveRef={cancelRef} onClose={onClose}>
+        <AlertDialogOverlay>
+          <AlertDialogContent>
+            <AlertDialogHeader fontSize='lg' fontWeight='bold'>
+              Ontime Shutdown
+            </AlertDialogHeader>
+            <AlertDialogBody>This will shutdown the program and all running servers. Are you sure?</AlertDialogBody>
+            <AlertDialogFooter>
+              <Button ref={cancelRef} onClick={onClose} variant='ghost'>
+                Cancel
+              </Button>
+              <Button colorScheme='red' onClick={handleShutdown} ml={3}>
+                Shutdown
+              </Button>
+            </AlertDialogFooter>
+          </AlertDialogContent>
+        </AlertDialogOverlay>
+      </AlertDialog>
+    </>
+  );
+}

apps/client/src/common/components/buttons/TooltipActionBtn.tsx

@@ -2,7 +2,7 @@ import { MouseEvent } from 'react';
 import { IconButton, IconButtonProps, Tooltip } from '@chakra-ui/react';
 
 interface TooltipActionBtnProps extends IconButtonProps {
-  clickHandler: (event: MouseEvent) => void | Promise<void>;
+  clickHandler: (event?: MouseEvent) => void | Promise<void>;
   tooltip: string;
   openDelay?: number;
 }

apps/client/src/common/components/client-modal/RedirectClientModal.module.scss

@@ -1,24 +0,0 @@
-.textEntry {
-  grid-area: input;
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-  color: $label-gray;
-}
-
-.inlineEntry {
-  display: grid;
-  grid-template-areas:
-    'label label'
-    'input btn';
-  grid-template-columns: 1fr auto;
-  column-gap: 0.5rem;
-}
-
-.redirect {
-  grid-area: btn;
-}
-
-.label {
-  color: $label-gray;
-}

apps/client/src/common/components/client-modal/RedirectClientModal.tsx

@@ -1,126 +0,0 @@
-import { useState } from 'react';
-import { IoArrowForward } from 'react-icons/io5';
-import {
-  IconButton,
-  Input,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalHeader,
-  ModalOverlay,
-  Select,
-} from '@chakra-ui/react';
-
-import { navigatorConstants } from '../../../viewerConfig';
-import { setClientRemote } from '../../hooks/useSocket';
-import useUrlPresets from '../../hooks-query/useUrlPresets';
-import Info from '../info/Info';
-import AppLink from '../link/app-link/AppLink';
-
-import style from './RedirectClientModal.module.scss';
-
-interface RedirectClientModalProps {
-  id: string;
-  name: string;
-  currentPath: string;
-  origin: string;
-  isOpen: boolean;
-  onClose: () => void;
-}
-
-export function RedirectClientModal(props: RedirectClientModalProps) {
-  const { id, isOpen, name, currentPath, origin, onClose } = props;
-  const { data } = useUrlPresets();
-  const [path, setPath] = useState(currentPath);
-  const [selected, setSelected] = useState('/');
-
-  const { setRedirect } = setClientRemote;
-
-  const handleRedirect = (newPath: string) => {
-    if (newPath === '/' || newPath === currentPath) {
-      return;
-    }
-    setRedirect({ target: id, redirect: newPath });
-    onClose();
-  };
-
-  const enabledPresets = data.filter((preset) => preset.enabled);
-
-  return (
-    <Modal isOpen={isOpen} onClose={onClose} variant='ontime'>
-      <ModalOverlay />
-      <ModalContent maxWidth='max(480px, 35vw)'>
-        <ModalHeader>Redirect: {name}</ModalHeader>
-        <ModalCloseButton />
-        <ModalBody>
-          <Info>
-            Remotely redirect the client to a different URL. <br />
-            Either by selecting a URL Preset or entering a custom path.
-            <br />
-            <br />
-            <AppLink search='settings=feature_settings__urlpresets'>Manage URL Presets</AppLink>
-          </Info>
-          <div>
-            <span className={style.label}>Select View or URL Preset</span>
-            <div className={style.textEntry}>
-              <Select
-                size='md'
-                variant='ontime'
-                isDisabled={enabledPresets.length === 0}
-                onChange={(event) => setSelected(event.target.value)}
-              >
-                <option value='/'>Select view or preset</option>
-                {navigatorConstants.map((view) => {
-                  return (
-                    <option key={view.url} value={`/${view.url}`}>
-                      {view.label}
-                    </option>
-                  );
-                })}
-                {enabledPresets.map((preset) => {
-                  return (
-                    <option key={preset.pathAndParams} value={preset.pathAndParams}>
-                      {`Preset: ${preset.alias}`}
-                    </option>
-                  );
-                })}
-              </Select>
-              <IconButton
-                variant='ontime-filled'
-                size='md'
-                aria-label='Redirect to preset'
-                className={style.redirect}
-                icon={<IoArrowForward />}
-                isDisabled={enabledPresets.length === 0 || selected === '/'}
-                onClick={() => handleRedirect(selected)}
-              />
-            </div>
-          </div>
-          <div className={style.inlineEntry}>
-            <span className={style.label}>Enter custom path</span>
-            <label className={style.textEntry}>
-              {origin}
-              <Input
-                variant='ontime-filled'
-                size='md'
-                placeholder='eg. /minimal?key=0000ffff'
-                value={path}
-                onChange={(event) => setPath(event.target.value)}
-              />
-            </label>
-            <IconButton
-              variant='ontime-filled'
-              size='md'
-              aria-label='Redirect'
-              isDisabled={path === currentPath || path === ''}
-              className={style.redirect}
-              icon={<IoArrowForward />}
-              onClick={() => handleRedirect(path)}
-            />
-          </div>
-        </ModalBody>
-      </ModalContent>
-    </Modal>
-  );
-}

apps/client/src/common/components/client-modal/RenameClientModal.tsx

@@ -1,64 +0,0 @@
-import { useState } from 'react';
-import {
-  Button,
-  Input,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-} from '@chakra-ui/react';
-
-import { setClientRemote } from '../../hooks/useSocket';
-
-interface RenameClientModalProps {
-  id: string;
-  name?: string;
-  isOpen: boolean;
-  onClose: () => void;
-}
-
-export function RenameClientModal(props: RenameClientModalProps) {
-  const { id, name: currentName = '', isOpen, onClose } = props;
-  const [name, setName] = useState(currentName);
-
-  const { setClientName } = setClientRemote;
-
-  const handleRename = () => {
-    if (name !== currentName && name !== '') {
-      setClientName({ target: id, rename: name });
-    }
-    onClose();
-  };
-
-  const canSubmit = name !== currentName && name !== '';
-
-  return (
-    <Modal isOpen={isOpen} onClose={onClose} variant='ontime'>
-      <ModalOverlay />
-      <ModalContent>
-        <ModalHeader>Rename: {currentName}</ModalHeader>
-        <ModalCloseButton />
-        <ModalBody>
-          <Input
-            variant='ontime-filled'
-            size='md'
-            placeholder='new name'
-            value={name}
-            onChange={(event) => setName(event.target.value)}
-          />
-        </ModalBody>
-        <ModalFooter>
-          <Button size='md' variant='ontime-subtle' onClick={onClose}>
-            Cancel
-          </Button>
-          <Button size='md' variant='ontime-filled' onClick={handleRename} isDisabled={!canSubmit}>
-            Submit
-          </Button>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  );
-}

apps/client/src/common/components/collapse-bar/CollapseBar.module.scss

@@ -0,0 +1,24 @@
+@use '../../../theme/v2Styles' as *;
+
+.header {
+  font-size: $inner-section-text-size;
+  font-weight: 600;
+  display: flex;
+  justify-content: space-between;
+  color: $section-white;
+  margin-top: $main-spacing;
+  border-bottom: 1px solid $border-color-ondark;
+  padding-bottom: $element-inner-spacing;
+  margin-bottom: $element-spacing;
+  cursor: pointer;
+}
+
+.moreExpanded {
+  transform: scaleY(-1);
+  transition: transform $transition-time-feedback;
+}
+
+.moreCollapsed {
+  transform: scaleY(1);
+  transition: transform $transition-time-feedback;
+}

apps/client/src/common/components/collapse-bar/CollapseBar.tsx

@@ -0,0 +1,20 @@
+import { FiChevronUp } from '@react-icons/all-files/fi/FiChevronUp';
+
+import style from './CollapseBar.module.scss';
+
+interface CollapseBarProps {
+  title: string;
+  isCollapsed: boolean;
+  onClick: () => void;
+}
+
+export default function CollapseBar(props: CollapseBarProps) {
+  const { title = 'Collapse bar', isCollapsed, onClick } = props;
+
+  return (
+    <div className={style.header} onClick={onClick}>
+      {title}
+      <FiChevronUp className={isCollapsed ? style.moreCollapsed : style.moreExpanded} />
+    </div>
+  );
+}

apps/client/src/common/components/context-menu/ContextMenu.module.scss

@@ -1,5 +1,6 @@
 .contextMenuButton {
   position: absolute;
+  cursor: pointer;
 }
 
 .contextMenuBackdrop {

apps/client/src/common/components/context-menu/ContextMenu.tsx

@@ -1,13 +1,11 @@
 // logic (with some modifications) culled from:
 // https://github.com/lukasbach/chakra-ui-contextmenu/blob/main/src/ContextMenu.tsx
 
-import { ReactElement } from 'react';
-import { IconType } from 'react-icons';
-import { Menu, MenuButton, MenuGroup, MenuList } from '@chakra-ui/react';
+import { Fragment, ReactElement } from 'react';
+import { Menu, MenuButton, MenuDivider, MenuItem, MenuList } from '@chakra-ui/react';
+import { IconType } from '@react-icons/all-files';
 import { create } from 'zustand';
 
-import { ContextMenuOption } from './ContextMenuOption';
-
 import style from './ContextMenu.module.scss';
 
 type ContextMenuCoords = {
@@ -15,23 +13,14 @@ type ContextMenuCoords = {
   y: number;
 };
 
-export type OptionWithoutGroup = {
+export type Option = {
   label: string;
-  isDisabled?: boolean;
   icon: IconType;
   onClick: () => void;
   withDivider?: boolean;
+  isDisabled?: boolean;
 };
 
-export type OptionWithGroup = {
-  label: string;
-  group: Omit<OptionWithoutGroup, 'isGroup'>[];
-};
-
-export type Option = OptionWithoutGroup | OptionWithGroup;
-
-const isOptionWithGroup = (option: Option): option is OptionWithGroup => 'group' in option;
-
 type ContextMenuStore = {
   coords: ContextMenuCoords;
   options: Option[];
@@ -68,30 +57,26 @@ export const ContextMenu = ({ children }: ContextMenuProps) => {
     <>
       {children}
       <div className={style.contextMenuBackdrop} />
-      <Menu isOpen size='sm' gutter={0} onClose={onClose} isLazy lazyBehavior='unmount' variant='ontime-on-dark'>
+      <Menu isOpen gutter={0} onClose={onClose} isLazy lazyBehavior='unmount' variant='ontime-on-dark'>
         <MenuButton
           className={style.contextMenuButton}
           aria-hidden
           w={1}
           h={1}
           style={{
-            position: 'fixed',
             left: coords.x,
             top: coords.y,
           }}
         />
         <MenuList>
-          {options.map((option) =>
-            isOptionWithGroup(option) ? (
-              <MenuGroup key={option.label} title={option.label}>
-                {option.group.map((groupOption) => (
-                  <ContextMenuOption key={groupOption.label} {...groupOption} />
-                ))}
-              </MenuGroup>
-            ) : (
-              <ContextMenuOption key={option.label} {...option} />
-            ),
-          )}
+          {options.map(({ label, icon: Icon, onClick, withDivider, isDisabled }, i) => (
+            <Fragment key={label}>
+              {withDivider && <MenuDivider />}
+              <MenuItem key={i} icon={<Icon />} onClick={onClick} isDisabled={isDisabled}>
+                {label}
+              </MenuItem>
+            </Fragment>
+          ))}
         </MenuList>
       </Menu>
     </>

apps/client/src/common/components/context-menu/ContextMenuOption.tsx

@@ -1,12 +0,0 @@
-import { MenuDivider, MenuItem } from '@chakra-ui/react';
-
-import { OptionWithoutGroup } from './ContextMenu';
-
-export const ContextMenuOption = ({ label, onClick, isDisabled, icon: Icon, withDivider }: OptionWithoutGroup) => (
-  <>
-    {withDivider && <MenuDivider />}
-    <MenuItem icon={<Icon style={{ fontSize: '1rem' }} />} onClick={onClick} isDisabled={isDisabled}>
-      {label}
-    </MenuItem>
-  </>
-);

apps/client/src/common/components/copy-tag/CopyTag.tsx

@@ -1,46 +1,29 @@
-import { PropsWithChildren, useState } from 'react';
-import { IoCheckmark } from 'react-icons/io5';
-import { IoCopy } from 'react-icons/io5';
+import { PropsWithChildren } from 'react';
 import { Button, ButtonGroup, IconButton, Tooltip } from '@chakra-ui/react';
+import { IoCopy } from '@react-icons/all-files/io5/IoCopy';
 
 import { tooltipDelayFast } from '../../../ontimeConfig';
 import { Size } from '../../models/Util.type';
 import copyToClipboard from '../../utils/copyToClipboard';
 
 interface CopyTagProps {
-  copyValue: string;
   label: string;
+  className?: string;
   size?: Size;
-  disabled?: boolean;
-  onClick?: () => void;
 }
 
 export default function CopyTag(props: PropsWithChildren<CopyTagProps>) {
-  const { copyValue, label, size = 'xs', disabled, children, onClick } = props;
-  const [copied, setCopied] = useState(false);
+  const { label, className, size = 'xs', children } = props;
 
-  const handleClick = () => {
-    copyToClipboard(copyValue);
-    setCopied(true);
-
-    // reset copied state
-    setTimeout(() => setCopied(false), 1000);
-  };
+  const handleClick = () => copyToClipboard(children as string);
 
   return (
     <Tooltip label={label} openDelay={tooltipDelayFast}>
-      <ButtonGroup size={size} isAttached>
-        <Button variant='ontime-subtle' tabIndex={-1} onClick={onClick} isDisabled={disabled}>
+      <ButtonGroup size={size} isAttached className={className}>
+        <Button variant='ontime-subtle' tabIndex={-1}>
           {children}
         </Button>
-        <IconButton
-          aria-label={label}
-          icon={copied ? <IoCheckmark /> : <IoCopy />}
-          variant='ontime-filled'
-          tabIndex={-1}
-          onClick={handleClick}
-          isDisabled={disabled}
-        />
+        <IconButton aria-label={label} icon={<IoCopy />} variant='ontime-filled' tabIndex={-1} onClick={handleClick} />
       </ButtonGroup>
     </Tooltip>
   );

apps/client/src/common/components/delay-indicator/DelayIndicator.module.scss

@@ -1,3 +1,5 @@
+@use '../../../theme/v2Styles' as *;
+
 .delaySymbol {
   svg {
     font-size: 1.5rem;

apps/client/src/common/components/delay-indicator/DelayIndicator.tsx

@@ -1,5 +1,6 @@
-import { IoChevronDown, IoChevronUp } from 'react-icons/io5';
 import { Tooltip } from '@chakra-ui/react';
+import { IoChevronDown } from '@react-icons/all-files/io5/IoChevronDown';
+import { IoChevronUp } from '@react-icons/all-files/io5/IoChevronUp';
 
 import { tooltipDelayFast } from '../../../ontimeConfig';
 import { millisToDelayString } from '../../utils/dateConfig';
@@ -8,23 +9,32 @@ import style from './DelayIndicator.module.scss';
 
 interface DelayIndicatorProps {
   delayValue?: number;
-  tooltipPrefix?: string;
 }
 
 export default function DelayIndicator(props: DelayIndicatorProps) {
-  const { delayValue, tooltipPrefix } = props;
+  const { delayValue } = props;
 
-  if (typeof delayValue !== 'number' || delayValue === 0) {
-    return null;
+  if (typeof delayValue === 'number') {
+    if (delayValue < 0) {
+      return (
+        <Tooltip openDelay={tooltipDelayFast} label={millisToDelayString(delayValue)}>
+          <span className={style.delaySymbol}>
+            <IoChevronDown />
+          </span>
+        </Tooltip>
+      );
+    }
+
+    if (delayValue > 0) {
+      return (
+        <Tooltip openDelay={tooltipDelayFast} label={millisToDelayString(delayValue)}>
+          <span className={style.delaySymbol}>
+            <IoChevronUp />
+          </span>
+        </Tooltip>
+      );
+    }
   }
 
-  const delayString = tooltipPrefix
-    ? `${tooltipPrefix} ${millisToDelayString(delayValue)}`
-    : millisToDelayString(delayValue);
-
-  return (
-    <Tooltip openDelay={tooltipDelayFast} label={delayString}>
-      <span className={style.delaySymbol}>{delayValue < 0 ? <IoChevronDown /> : <IoChevronUp />}</span>
-    </Tooltip>
-  );
+  return null;
 }

apps/client/src/common/components/error-boundary/ErrorBoundary.jsx

@@ -3,7 +3,7 @@ import React from 'react';
 // skipcq: JS-C1003 - sentry does not expose itself as an ES Module.
 import * as Sentry from '@sentry/react';
 
-import { runtimeStore } from '@/common/stores/runtime';
+import { runtime } from '@/common/stores/runtime';
 import { hasConnected, reconnectAttempts, shouldReconnect } from '@/common/utils/socket';
 
 import style from './ErrorBoundary.module.scss';
@@ -23,25 +23,18 @@ class ErrorBoundary extends React.Component {
 
   componentDidCatch(error, info) {
     this.setState({
-      error,
+      error: error,
       errorInfo: info,
     });
-    this.reportContent = `${error} ${info.componentStack}`;
-
-    const appState = runtimeStore.getState();
-    if (appState.ping < 0) {
-      return;
-    }
 
     Sentry.withScope((scope) => {
-      scope.setExtras({
-        error,
-        store: appState,
-        hasSocket: { hasConnected, shouldReconnect, reconnectAttempts },
-      });
+      scope.setExtras('error', error);
+      scope.setExtras('store', runtime.getState());
+      scope.setExtras('hasSocket', { hasConnected, shouldReconnect, reconnectAttempts });
       const eventId = Sentry.captureException(error);
       this.setState({ eventId, info });
     });
+    this.reportContent = `${error} ${info.componentStack}`;
   }
 
   render() {

apps/client/src/common/components/error-boundary/ErrorBoundary.module.scss

@@ -1,3 +1,5 @@
+@use '../../../theme/v2Styles' as *;
+
 .errorContainer {
   width: 100%;
   height: 100%;

apps/client/src/common/components/fit-text/FitText.tsx

@@ -1,63 +0,0 @@
-/**
- * Copied from
- * https://github.com/namhong2001/react-textfit/blob/master/index.tsx
- */
-
-import { HTMLAttributes, PropsWithChildren, useCallback, useEffect, useRef } from 'react';
-
-import { bsearch } from './fitText.utils';
-
-interface FitTextProps extends HTMLAttributes<HTMLDivElement> {
-  mode?: 'single' | 'multi';
-  min?: number; // inclusive
-  max?: number; // inclusive
-}
-
-export function FitText(props: PropsWithChildren<FitTextProps>) {
-  const { children, mode = 'multi', min = 16, max = 256, ...elementProps } = props;
-  const ref = useRef<HTMLDivElement>(null);
-
-  const isOverflown = useCallback(() => {
-    const el = ref.current;
-    if (!el) return false;
-    return el.scrollHeight > el.clientHeight || el.scrollWidth > el.clientWidth;
-  }, []);
-
-  const setFontSize = useCallback(() => {
-    const el = ref.current;
-    if (!el) return;
-
-    const originVisibility = el.style.visibility;
-
-    el.style.visibility = 'hidden';
-    const fontSize = bsearch(min, max + 1, (mid) => {
-      el.style.fontSize = `${mid}px`;
-      return !isOverflown();
-    });
-    el.style.fontSize = `${fontSize}px`;
-    el.style.visibility = originVisibility;
-  }, [isOverflown, min, max]);
-
-  useEffect(() => {
-    const el = ref.current;
-    if (!el) return;
-
-    setFontSize();
-    const observer = new ResizeObserver(setFontSize);
-    observer.observe(el);
-
-    return () => observer.disconnect();
-  }, [children, mode, setFontSize]);
-
-  return (
-    <div
-      ref={ref}
-      style={{
-        whiteSpace: mode === 'single' ? 'nowrap' : 'normal',
-      }}
-      {...elementProps}
-    >
-      {children}
-    </div>
-  );
-}

apps/client/src/common/components/fit-text/fitText.utils.ts

@@ -1,18 +0,0 @@
-/**
- * @param low inclusive, must be true on predicate function
- * @param high exclusive,
- * @param predicate predicate function
- */
-export const bsearch = (low: number, high: number, predicate: (mid: number) => boolean): number => {
-  while (low < high) {
-    const mid = Math.floor((low + high) / 2);
-    if (mid === low) break;
-
-    if (predicate(mid)) {
-      low = mid;
-    } else {
-      high = mid;
-    }
-  }
-  return low;
-};

apps/client/src/common/components/identify-overlay/IdentifyOverlay.module.scss

@@ -1,34 +0,0 @@
-.overlay {
-  position: absolute;
-  top: 0;
-  left: 0;
-  margin: 0;
-  width: 100vw;
-  height: 100vh;
-  padding: 0;
-  box-sizing: border-box;
-
-  border: 10px solid $ui-white;
-  background-color: $ui-black;
-
-  color: $ui-white;
-  display: grid;
-  place-content: center;
-  text-align: center;
-  z-index: 100;
-  cursor: pointer;
-}
-
-.name {
-  font-weight: 600;
-  margin-top: -10vh;
-  line-height: 1em;
-  font-size: 12vw;
-  text-transform: uppercase;
-}
-
-.message {
-  color: $label-gray;
-  line-height: 2em;
-  font-size: 3vw;
-}

apps/client/src/common/components/identify-overlay/IdentifyOverlay.tsx

@@ -1,63 +0,0 @@
-import { useCallback, useEffect, useRef } from 'react';
-import { createPortal } from 'react-dom';
-import { MILLIS_PER_MINUTE } from 'ontime-utils';
-
-import { setClientRemote } from '../../hooks/useSocket';
-import { useClientStore } from '../../stores/clientStore';
-
-import style from './IdentifyOverlay.module.scss';
-
-export default function IdentifyOverlay() {
-  const clients = useClientStore((store) => store.clients);
-  const id = useClientStore((store) => store.id);
-  const showOverlay = clients[id]?.identify;
-
-  if (!showOverlay) {
-    return null;
-  }
-
-  const portalRoot = document.getElementById('identify-portal');
-
-  if (!portalRoot) {
-    return null;
-  }
-  return createPortal(<Overlay />, portalRoot);
-}
-
-function Overlay() {
-  const clients = useClientStore((store) => store.clients);
-  const id = useClientStore((store) => store.id);
-  const name = useClientStore((store) => store.name);
-
-  const timerRef = useRef<NodeJS.Timeout | null>(null);
-
-  const { setIdentify } = setClientRemote;
-  const showOverlay = clients[id]?.identify;
-
-  const handleClose = useCallback(() => {
-    if (timerRef.current) {
-      clearTimeout(timerRef.current);
-    }
-
-    setIdentify({ target: id, identify: false });
-  }, [id, setIdentify]);
-
-  // start a timer that will close the overlay after some time
-  useEffect(() => {
-    if (showOverlay) {
-      timerRef.current = setTimeout(handleClose, MILLIS_PER_MINUTE);
-    }
-    return () => {
-      if (timerRef.current) {
-        clearTimeout(timerRef.current);
-      }
-    };
-  }, [showOverlay, id, setIdentify, handleClose]);
-
-  return (
-    <div className={style.overlay} data-testid='identify-overlay' onClick={handleClose}>
-      <div className={style.name}>{name}</div>
-      <div className={style.message}>Click to close</div>
-    </div>
-  );
-}

apps/client/src/common/components/info/Info.module.scss

@@ -1,21 +0,0 @@
-.infoLabel {
-  display: flex;
-  align-items: center;
-  gap: $element-spacing;
-
-  background-color: $gray-1200;
-  border-radius: 3px;
-  font-size: $text-body-size;
-  padding: 1rem;
-
-  .content {
-    color: $gray-200;
-  }
-
-  svg {
-    min-width: 1.5rem;
-    align-self: start;
-    font-size: 1.5rem;
-    color: $info-blue;
-  }
-}

apps/client/src/common/components/info/Info.tsx

@@ -1,21 +0,0 @@
-import { PropsWithChildren } from 'react';
-import { IoAlertCircle } from 'react-icons/io5';
-
-import { cx } from '../../utils/styleUtils';
-
-import style from './Info.module.scss';
-
-interface InfoProps {
-  className?: string;
-}
-
-export default function Info(props: PropsWithChildren<InfoProps>) {
-  const { className, children } = props;
-
-  return (
-    <div className={cx([style.infoLabel, className])}>
-      <IoAlertCircle />
-      <div>{children}</div>
-    </div>
-  );
-}

apps/client/src/common/components/input/auto-text-area/AutoTextArea.tsx

@@ -1,25 +1,25 @@
-import { RefObject, useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 import { Textarea, TextareaProps } from '@chakra-ui/react';
 // @ts-expect-error no types from library
 import autosize from 'autosize/dist/autosize';
 
-export const AutoTextArea = (props: TextareaProps & { inputref: RefObject<unknown> }) => {
-  const { value, inputref } = props;
+export const AutoTextArea = (props: TextareaProps) => {
+  const ref = useRef<HTMLTextAreaElement>(null);
 
   useEffect(() => {
-    const node = inputref.current;
-    autosize(inputref.current);
+    const node = ref.current;
+    autosize(ref.current);
     return () => {
       autosize.destroy(node);
     };
-  }, [inputref, value]);
+  }, []);
 
   return (
     <Textarea
       overflow='hidden'
       w='100%'
-      ref={inputref}
       resize='none'
+      ref={ref}
       transition='height none'
       variant='ontime-transparent'
       {...props}

apps/client/src/common/components/input/colour-input/Swatch.tsx

@@ -1,4 +1,4 @@
-import { IoBan } from 'react-icons/io5';
+import { IoBan } from '@react-icons/all-files/io5/IoBan';
 
 import { cx } from '../../../utils/styleUtils';
 
@@ -6,24 +6,21 @@ import style from './SwatchSelect.module.scss';
 
 interface SwatchProps {
   color: string;
-  onClick?: (color: string) => void;
+  onClick: (color: string) => void;
   isSelected?: boolean;
 }
 
 export default function Swatch(props: SwatchProps) {
   const { color, isSelected, onClick } = props;
 
-  const handleClick = () => {
-    onClick?.(color);
-  };
-  const classes = cx([style.swatch, isSelected && style.selected, onClick && style.selectable]);
+  const classes = cx([style.swatch, isSelected ? style.selected : null]);
 
   if (!color) {
     return (
-      <div className={classes} onClick={handleClick}>
+      <div className={`${classes} ${style.center}`} onClick={() => onClick('')}>
         <IoBan />
       </div>
     );
   }
-  return <div className={classes} style={{ backgroundColor: `${color}` }} onClick={handleClick} />;
+  return <div className={classes} style={{ backgroundColor: `${color}` }} onClick={() => onClick(color)} />;
 }

apps/client/src/common/components/input/colour-input/SwatchPicker.tsx

@@ -1,60 +0,0 @@
-import { useCallback } from 'react';
-import { useController, UseControllerProps } from 'react-hook-form';
-import { IoEyedrop } from 'react-icons/io5';
-import { ViewSettings } from 'ontime-types';
-
-import { debounce } from '../../../utils/debounce';
-import { cx, getAccessibleColour } from '../../../utils/styleUtils';
-import PopoverPicker from '../popover-picker/PopoverPicker';
-
-import style from './SwatchSelect.module.scss';
-
-interface SwatchPickerProps {
-  color: string;
-  isSelected?: boolean;
-  onChange: (name: string) => void;
-  alwaysDisplayColor?: boolean;
-}
-
-export default function SwatchPicker(props: SwatchPickerProps) {
-  const { color, onChange, isSelected, alwaysDisplayColor } = props;
-
-  const debouncedOnChange = useCallback(
-    debounce((newValue: string) => {
-      onChange(newValue);
-    }, 500),
-    [onChange],
-  );
-
-  const displayColor = alwaysDisplayColor || isSelected ? color : '';
-  const { color: iconColor } = getAccessibleColour(displayColor);
-
-  return (
-    <PopoverPicker color={displayColor} onChange={debouncedOnChange}>
-      <div
-        className={cx([style.swatch, isSelected && style.selected, style.selectable])}
-        style={{ backgroundColor: displayColor }}
-      >
-        <IoEyedrop color={iconColor} />
-      </div>
-    </PopoverPicker>
-  );
-}
-
-export function SwatchPickerRHF(props: UseControllerProps<ViewSettings>) {
-  const { name, control } = props;
-  const {
-    field: { onChange, value },
-  } = useController({ control, name });
-
-  const displayColor = typeof value === 'string' ? value : '';
-  const { color: iconColor } = getAccessibleColour(displayColor);
-
-  return (
-    <PopoverPicker color={value as string} onChange={onChange}>
-      <div className={cx([style.swatch, style.selectable])} style={{ backgroundColor: displayColor }}>
-        <IoEyedrop color={iconColor} />
-      </div>
-    </PopoverPicker>
-  );
-}

apps/client/src/common/components/input/colour-input/SwatchSelect.module.scss

@@ -1,28 +1,24 @@
+
 .list {
   display: flex;
-  flex-wrap: wrap;
-  gap: 0.5rem;
+  gap: 4px;
 }
 
 .swatch {
+  cursor: pointer;
+  aspect-ratio: 1;
   width: 2rem;
   height: 2rem;
-  border-radius: 99px;
-  border: 2px solid $gray-1200;
-  color: $ui-white;
-
-  display: grid;
-  place-content: center;
+  border-radius: 16px;
+  border: 4px solid #262626;
 
   &.selected {
-    border: 2px solid $blue-500;
-  }
-
-  &.selectable {
-    cursor: pointer;
-
-    &:hover {
-      border: 2px solid $blue-300;
-    }
+    border: 2px solid #578AF4;
   }
 }
+
+.center {
+  display: grid;
+  place-content: center;
+  color: #578AF4;
+}

apps/client/src/common/components/input/colour-input/SwatchSelect.tsx

@@ -1,14 +1,15 @@
 import { useCallback } from 'react';
 
+import { EditorUpdateFields } from '../../../../features/event-editor/EventEditor';
+
 import Swatch from './Swatch';
-import SwatchPicker from './SwatchPicker';
 
 import style from './SwatchSelect.module.scss';
 
 interface ColourInputProps {
   value: string;
-  name: 'colour';
-  handleChange: (newValue: 'colour', name: string) => void;
+  name: EditorUpdateFields;
+  handleChange: (newValue: EditorUpdateFields, name: string) => void;
 }
 
 const colours = [
@@ -44,7 +45,6 @@ export default function SwatchSelect(props: ColourInputProps) {
       {colours.map((colour) => (
         <Swatch key={colour} color={colour} onClick={setColour} isSelected={value === colour} />
       ))}
-      <SwatchPicker color={value} onChange={setColour} isSelected={!colours.includes(value)} />
     </div>
   );
 }

apps/client/src/common/components/input/delay-input/DelayInput.module.scss

@@ -1,3 +1,5 @@
+@use '../../../../theme/v2Styles' as *;
+
 $input-font-size: 15px;
 
 .delayInput {

apps/client/src/common/components/input/delay-input/DelayInput.tsx

@@ -1,8 +1,9 @@
 import { KeyboardEvent, useEffect, useRef, useState } from 'react';
 import { Input, Radio, RadioGroup } from '@chakra-ui/react';
-import { millisToString, parseUserTime } from 'ontime-utils';
+import { millisToString } from 'ontime-utils';
 
 import { useEventAction } from '../../../hooks/useEventAction';
+import { forgivingStringToMillis } from '../../../utils/dateConfig';
 
 import style from './DelayInput.module.scss';
 
@@ -20,7 +21,6 @@ export default function DelayInput(props: DelayInputProps) {
   // avoid wrong submit on cancel
   let ignoreChange = false;
 
-  // set internal value on duration change
   useEffect(() => {
     if (typeof duration === 'undefined') {
       return;
@@ -39,7 +39,7 @@ export default function DelayInput(props: DelayInputProps) {
     }
 
     const isNegative = newValue.startsWith('-');
-    let newMillis = parseUserTime(newValue);
+    let newMillis = forgivingStringToMillis(newValue);
 
     if (isNegative) {
       newMillis = newMillis * -1;