fix: issue with timer migration (#223)

* fix: issue with timer migration

.deepsource.toml

@@ -0,0 +1,18 @@
+version = 1
+
+test_patterns = [
+  "__mocks__/**",
+  "__tests__/**",
+  "cypress/**",
+  "*.test.*",
+  "*.mock.*",
+  "*.spec.*"
+]
+
+[[analyzers]]
+  name = "javascript"
+  enabled = true
+
+  [analyzers.meta]
+    plugins = ["react"]
+    environment = ["nodejs","browser","jest"]

.dockerignore

@@ -0,0 +1,14 @@
+# Ignore config files
+.prettier*
+
+# Ignore install stuff
+**/yarn.lock
+**/yarn-error.log
+
+# Ignore test files
+**/__tests__/**
+**/**.test.js
+
+# Ignore git and cache folders
+.git
+.cache

.eslintrc

@@ -0,0 +1,34 @@
+{
+  "parserOptions": {
+    "ecmaVersion": 2020
+  },
+  "env": {
+    "es6": true,
+    "jest": true
+  },
+  "extends": [
+    "eslint:recommended"
+  ],
+  "rules": {
+    // disallow certain object properties
+    // https://eslint.org/docs/rules/no-restricted-properties
+    "no-restricted-properties": [
+      "error",
+      {
+        "object": "global",
+        "property": "isNaN",
+        "message": "Please use Number.isNaN instead"
+      },
+      {
+        "object": "self",
+        "property": "isNaN",
+        "message": "Please use Number.isNaN instead"
+      },
+      {
+        "object": "window",
+        "property": "isNaN",
+        "message": "Please use Number.isNaN instead"
+      }
+    ]
+  }
+}

.github/workflows/autobuild.yml

@@ -1,103 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: CI
-
-# Controls when the action will run.
-on:
-  push:
-    # Pattern matched against refs/tags
-    tags:
-    # Push events to every tag not containing /
-      - '*'
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # build a file for windows
-  buildwin:
-    # The type of runner that the job will run on
-    runs-on: windows-latest
-    env:
-      CI: ''
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      - name: Use Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: '14.x'
-
-      # install and build react
-      - name: Install React dependencies
-        run: yarn install
-        working-directory: ./client
-      - name: Build React App
-        run: yarn build
-        working-directory: ./client
-
-      # install node dependencies
-      - name: Install nodejs dependencies
-        run: yarn install
-        working-directory: ./server/src
-
-      # install and build electron
-      - name: Install Electron dependencies
-        run: yarn install
-        working-directory: ./server
-      - name: Build Electron App
-        run: yarn dist-win
-        working-directory: ./server
-
-      # release
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: ./server/dist/ontime-win64.exe
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- # build a file for mac
- # buildmac:
-    # The type of runner that the job will run on
- #   runs-on: macOS-latest
- #   env:
- #     CI: ''
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
- #   steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- #     - uses: actions/checkout@v2
-
- #     - name: Use Node.js
- #       uses: actions/setup-node@v1
- #       with:
- #         node-version: '14.x'
-
-      # install and build react
- #     - name: Install React dependencies
- #       run: yarn install
- #       working-directory: ./client
- #     - name: Build React App
- #       run: yarn build
- #       working-directory: ./client
-
-      # install and build electron
- #     - name: Install Electron + nodejs dependencies
- #       run: yarn install
- #       working-directory: ./server
- #     - name: Build Electron App
- #       run: yarn dist-win
- #       working-directory: ./server
-
-      # release
-  #    - name: Release
-  #      uses: softprops/action-gh-release@v1
-  #      with:
-  #       files: ./server/dist/ontime-macOS.dmg
-  #      env:
-  #        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build.yml

@@ -0,0 +1,190 @@
+name: Ontime build
+
+on:
+  push:
+    # run when a tag is created
+    tags:
+      - '*'
+  workflow_dispatch:
+
+jobs:
+  build_mac:
+    runs-on: macOS-latest
+    timeout-minutes: 20
+    env:
+      CI: ''
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14.x'
+
+      # React
+      - name: React - Install dependencies
+        run: yarn install --frozen-lockfile --network-timeout 300000
+        working-directory: ./client
+
+      - name: React - Build project
+        run: yarn build
+        working-directory: ./client
+
+      # Node server
+      - name: Server - Install dependencies
+        run: yarn install --frozen-lockfile --production --network-timeout 300000
+        working-directory: ./server/src
+
+      # App
+      - name: Electron - Install dependencies
+        shell: bash
+        run: yarn install --frozen-lockfile --network-timeout 300000 && yarn setdb
+        working-directory: ./server
+      - name: Electron - Build app
+        run: yarn dist-mac
+        working-directory: ./server
+
+      # Release
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: ./server/dist/ontime-macOS.dmg
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  build_win:
+    runs-on: windows-latest
+    timeout-minutes: 20
+    env:
+      CI: ''
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '14.x'
+
+      # React
+      - name: React - Install dependencies
+        run: yarn install --frozen-lockfile --network-timeout 300000
+        working-directory: ./client
+
+      - name: React - Build project
+        run: yarn build
+        working-directory: ./client
+
+      # Node server
+      - name: Server - Install dependencies
+        run: yarn install --frozen-lockfile --production --network-timeout 300000
+        working-directory: ./server/src
+
+      # App
+      - name: Electron - Install dependencies
+        shell: bash
+        run: yarn install --frozen-lockfile --network-timeout 300000 && yarn setdb
+        working-directory: ./server
+      - name: Electron - Build app
+        run: yarn dist-win
+        working-directory: ./server
+
+      # Release
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: ./server/dist/ontime-win64.exe
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  build_linux:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    env:
+      CI: ''
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '14.x'
+
+      # React
+      - name: React - Install dependencies
+        run: yarn install --frozen-lockfile --network-timeout 300000
+        working-directory: ./client
+
+      - name: React - Build project
+        run: yarn build
+        working-directory: ./client
+
+      # Node server
+      - name: Server - Install dependencies
+        run: yarn install --frozen-lockfile --production --network-timeout 300000
+        working-directory: ./server/src
+
+      # App
+      - name: Electron - Install dependencies
+        shell: bash
+        run: yarn install --frozen-lockfile --network-timeout 300000 && yarn setdb
+        working-directory: ./server
+      - name: Electron - Build app
+        run: yarn dist-linux
+        working-directory: ./server
+
+      # Release
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: ./server/dist/ontime-linux.AppImage
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  publish_docker:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    env:
+      CI: ''
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup env
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '14.x'
+
+      # React
+      - name: React - Install dependencies
+        run: yarn install --network-timeout 300000
+        working-directory: ./client
+
+      - name: React - Build project
+        run: yarn build
+        working-directory: ./client
+
+      # Node server
+      - name: Server - Install dependencies
+        run: yarn install --frozen-lockfile --production --network-timeout 300000
+        working-directory: ./server/src
+
+      # Login to docker
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      
+      # Prepare builder
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      # Build and push
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/ontime:${{ env.RELEASE_VERSION  }} , ${{ secrets.DOCKERHUB_USERNAME }}/ontime:latest

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '33 02 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/ontime_cy.yml

@@ -0,0 +1,54 @@
+# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: ontime_test_CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    env:
+      CI: ''
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14.x'
+
+      # React
+      - name: React - Install dependencies
+        run: yarn install
+        working-directory: ./client
+
+      - name: React - Run tests
+        run: yarn test:pipeline
+        working-directory: ./client
+
+      - name: React - Build project
+        run: yarn build
+        working-directory: ./client
+
+      # Node server
+      - name: Server - Install dependencies
+        run: yarn install
+        working-directory: ./server/src
+
+      # App
+      - name: Electron - Install dependencies
+        run: yarn install && yarn setdb
+        working-directory: ./server
+
+      - name: Electron - Run tests
+        run: yarn test
+        working-directory: ./server
+
+      - name: Cypress run
+        uses: cypress-io/github-action@v2
+        with:
+          working-directory: ./server
+          start: yarn cypress

.gitignore

@@ -7,6 +7,7 @@ node_modules/
 
 # testing
 coverage/
+*.mp4
 
 # production
 build/
@@ -23,13 +24,19 @@ dist/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-ontime.code-workspace
-TODO.md
 
 # working stuff
 _SS/
-.vscode/launch.json
-.eslintrc.json
 db backup.json
-server/src/data/db.json
+server/src/preloaded-db/db.json
 server/src/models/db.json
+TODO.md
+ontime-db/
+ontime-external/
+
+# vscode stuff
+.vscode/*
+ontime.code-workspace
+
+# webstorm stuff
+.idea/*

.idea/.gitignore

@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,51 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="CssUnknownProperty" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="myCustomPropertiesEnabled" value="true" />
+      <option name="myIgnoreVendorSpecificProperties" value="false" />
+      <option name="myCustomPropertiesList">
+        <value>
+          <list size="3">
+            <item index="0" class="java.lang.String" itemvalue="scrollbar-color" />
+            <item index="1" class="java.lang.String" itemvalue="scrollbar-width" />
+            <item index="2" class="java.lang.String" itemvalue="app-region" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="HttpUrlsUsage" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredUrls">
+        <list>
+          <option value="http://localhost" />
+          <option value="http://127.0.0.1" />
+          <option value="http://0.0.0.0" />
+          <option value="http://www.w3.org/" />
+          <option value="http://json-schema.org/draft" />
+          <option value="http://java.sun.com/" />
+          <option value="http://xmlns.jcp.org/" />
+          <option value="http://javafx.com/javafx/" />
+          <option value="http://javafx.com/fxml" />
+          <option value="http://maven.apache.org/xsd/" />
+          <option value="http://maven.apache.org/POM/" />
+          <option value="http://www.springframework.org/schema/" />
+          <option value="http://www.springframework.org/tags" />
+          <option value="http://www.springframework.org/security/tags" />
+          <option value="http://www.thymeleaf.org" />
+          <option value="http://www.jboss.org/j2ee/schema/" />
+          <option value="http://www.jboss.com/xml/ns/" />
+          <option value="http://www.ibm.com/webservices/xsd" />
+          <option value="http://activemq.apache.org/schema/" />
+          <option value="http://schema.cloudfoundry.org/spring/" />
+          <option value="http://schemas.xmlsoap.org/" />
+          <option value="http://cxf.apache.org/schemas/" />
+          <option value="http://primefaces.org/ui" />
+          <option value="http://tiles.apache.org/" />
+          <option value="http://__IP__" />
+        </list>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="Stylelint" enabled="true" level="ERROR" enabled_by_default="true" />
+  </profile>
+</component>

.prettierrc

@@ -0,0 +1,8 @@
+{
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": true,
+  "jsxSingleQuote": true,
+  "printWidth": 100
+}

Dockerfile

@@ -0,0 +1,20 @@
+FROM node:14-alpine
+
+WORKDIR /app/server
+
+# Prepare UI
+COPY /client/build ../client/build
+
+# Prepare Backend
+COPY /server/src ./
+
+# Export default ports Main - OSC IN
+EXPOSE 4001/tcp 8888/udp
+ENV NODE_ENV=production
+ENV ONTIME_DATA=/server/
+
+CMD ["yarn", "start:headless"]
+
+# Build an run commandsN
+# docker build -t getontime/ontime .
+# docker run -p 4001:4001 -p 10.0.0.12:8888:8888/udp --mount type=bind,source="$(pwd)/ontime-db",target=/server/preloaded-db getontime/ontime

README.md

@@ -1,101 +1,214 @@
+[![ontime_test_CI](https://github.com/cpvalente/ontime/actions/workflows/ontime_cy.yml/badge.svg)](https://github.com/cpvalente/ontime/actions/workflows/ontime_cy.yml) [![Ontime build](https://github.com/cpvalente/ontime/actions/workflows/build.yml/badge.svg)](https://github.com/cpvalente/ontime/actions/workflows/build.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://cpvalente.gitbook.io/ontime/)
 
+## Download the latest releases here
 
-Download the latest releases here
-- [Windows](https://gitreleases.dev/gh/cpvalente/ontime/latest/ontime-win64.exe)
+<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/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/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/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/dockerhub.png"/></a>
+</div>
 
 # Ontime
+
 Ontime is an application for managing event rundowns and running stage timers.
 
-It allows a center application to be able to distribute event information in the local network. This minimises needs for using Media Server outputs or expensive video distribution while allowing easy integration in workflows including OBS and d3.
+It allows a center application to be able to distribute event information in the local network. This
+minimises needs for using Media Server outputs or expensive video distribution while allowing easy
+integration in workflows including OBS and d3.
 
-![App Window](https://github.com/cpvalente/ontime/blob/master/.github/01_app.png)
+![App Window](https://github.com/cpvalente/ontime/blob/master/.github/app.jpg)
 
 ![Views](https://github.com/cpvalente/ontime/blob/master/.github/02_screentypes.png)
 
 ## Using Ontime
+
 Once installed and running, ontime starts a background server that is the heart of all processes.
-The app, is used to add / edit your running order in the event list, and running the timers using the Playback Control function.
+The app, is used to add / edit your running order in the event list, and running the timers using
+the Playback Control function.
 
-From here, any device in the same network with a browser is able to render the views as described. This is done by reaching the ontime server at the _default port 4001_ eg: `localhost:4001` or `192.168.1.3:4001`
-You can then use the ontime logo in the top right corner to select the desired view (event in the lower thirds view, where it is hidden).
+From here, any device in the same network with a browser is able to render the views as described.
+This is done by reaching the ontime server at the _default port 4001_ eg: `localhost:4001`
+or `192.168.1.3:4001`
+You can then use the ontime logo in the top right corner to select the desired view (event in the
+lower thirds view, where it is hidden).
 
-In case of unattended machines or automations, it is possible to use different URL to recall individual views
+In case of unattended machines or automations, it is possible to use different URL to recall
+individual views and extend with using the URL aliases feature
 
 ```
-IP.ADDRESS:4001           > Web server default to presenter timer view
-IP.ADDRESS:4001/preseter  > Presenter / Stage timer view
-IP.ADDRESS:4001/sm        > Stage Manager / Backstage view
-IP.ADDRESS:4001/public    > Public / Foyer view
-IP.ADDRESS:4001/pip       > Picture in Picture view
-IP.ADDRESS:4001/lower     > Lower Thirds
-IP.ADDRESS:4001/studio    > Studio Clock
+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/sm         > Stage Manager / Backstage view
+IP.ADDRESS:4001/public     > Public / Foyer view
+IP.ADDRESS:4001/pip        > Picture in Picture view
+IP.ADDRESS:4001/lower      > Lower Thirds
+IP.ADDRESS:4001/studio     > Studio Clock
+IP.ADDRESS:4001/cuesheet   > Cue Sheet
+
+...and for the editor (the control interface, same as the app)
+-------------------------------------------------------------
+IP.ADDRESS:4001/editor
+
 ```
 
 More documentation available [here](https://cpvalente.gitbook.io/ontime/)
+
 ## Feature List (in no specific order)
+
 - [x] Distribute Data over network and render in the browser
 - [x] Different screen types
-  - Stage Timer
-  - Backstage Info
-  - Public Info
-  - Picture in Picture
+    - Stage Timer
+    - Backstage Info
+    - Public Info
+    - Picture in Picture
+    - Studio Clock
+    - [Make your own?](#make-your-own-viewer)
 - [x] Configurable realtime Lower Thirds
+- [x] Cuesheets with additional custom fields
 - [x] Send live messages to different screen types
 - [x] Ability to differentiate between backstage and public data
 - [x] Manage delays workflow
 - [x] Open Sound Control (OSC) Control and Feedback
+- [x] Integrate with hardware using Companion or one of the APIs
 - [x] Roll mode: run independently using the system clock
 - [x] Import event list from Excel
+- [x] URL Aliases (define configurable aliases to ease onsite setup)
+- [x] Logging view
+- [x] Edit anywhere: run ontime in your local network and use any machine to reach the editor page (
+  same as app)
+- [x] Multi platform (available on Windows, MacOS and Linux)
+- [x] [Headless run](#headless-run) (run server only, configure from a browser locally)
+- [x] [Countdown to anything!](https://cpvalente.gitbook.io/ontime/views/countdown): ability to have
+  a countdown to any scheduled event
 
 ## Unopinionated
-We are not interested in forcing workflows and have made ontime, so it is flexible to whichever way you would like to work.
 
+We are not interested in forcing workflows and have made ontime, so it is flexible to whichever way
+you would like to work.
 
-- [x] You do not need an order list to use the timer. Create an empty event and the OSC API works just the same
+- [x] You do not need an order list to use the timer. Create an empty event and the OSC API works
+  just the same
 - [x] If you want just the info screens, no need to use the timer!
 - [x] Don't have or care for a schedule?
-  - [x] a single event with no data is enough to use the OSC API and get going
-  - [x] use the order list to create a set of quick timers by setting the beginning and start times to 00:00 and 00:10 (**BAM**! 10 minute timer). You can quickly recall this with OSC as always
+    - [x] a single event with no data is enough to use the OSC API and get going
+    - [x] use the order list to create a set of quick timers by setting the beginning and start
+      times to 00:00 and 00:10 (**BAM**! 10 minute timer). You can quickly recall this with OSC as
+      always
 
-## Integrations and Workflow
-The app is being currently developed to a wide user base, from broadcast to entertainment and conference halls.
+## Rich APIs for workflow integrations
 
-Taking advantage of the integrations in Ontime, we currently use Ontime with: 
-- `disguise`: trigger ontime from d3's timeline using the **OSC API**, **render views** using d3's webmodule
+The app is being currently developed to a wide user base, from broadcast to entertainment and
+conference halls.
+
+Taking advantage of the integrations in Ontime, we currently use Ontime with:
+
+- `disguise`: trigger ontime from d3's timeline using the **OSC API**, **render views** using d3's
+  webmodule
 - `OBS`: **render views** using the Browser Module
 - `QLab`: trigger ontime using **OSC API**
-- `Companion`: trigger ontime and manipulate timer 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 build your own viewers by leveranging
+basic knowledge of HTML + CSS + Javascript (or any other language that can run in the browser).
+
+See [this repository](https://github.com/cpvalente/ontime-viewer-template) with a small template on
+how to get you started and read the docs about
+the [Websocket API](https://app.gitbook.com/s/-Mc0giSOToAhq0ROd0CR/control-and-feedback/websocket-api)
+
+### Headless run️
+
+You can self host and run ontime in a docker image, the run command should:
+
+- expose the necessary ports (listen in Dockerfile)
+- mount a local file to persist your data (in the example: ````$(pwd)/local-data````)
+- the image name __getontime/ontime__
+
+The docker image is
+in [available Docker Hub at getontime/ontime](https://hub.docker.com/r/getontime/ontime)
+
+```bash
+docker pull getontime/ontime
+```
+
+```bash
+# Port 4001 - ontime server port
+# Port 8888 - OSC input, bound to localhost IP Address 
+docker run -p 4001:4001 -p 127.0.0.1:8888:8888/udp --mount type=bind,source="$(pwd)/ontime-db",target=/server/preloaded-db getontime/ontime
+```
+
+or if running from the docker compose
+
+```bash
+docker-compose up
+```
 
 ## Roadmap
-### Continued development
-There are several features planned in the roadmap. 
-These will be implemented in a development friendly order unless there is user demand to bump any of them.
-- [ ] Linux version
-- [ ] Headless version (run server only anywhere, configure from a browser locally)
-- [ ] Companion module
-- [ ] Lower Third Manager
-- [ ] Note only event
-- [ ] URL Aliases (define configurable aliases to ease onsite setup)
-- [ ] Logging view
-- [ ] Reach Schedule: way to speedup timer to meet a deadline
-- [ ] vMix integration
 
-### For version 1
-Almost reaching a feature set that we can call v1. Before that:
-- [ ] Mac OS version
+### Continued development
+
+There are several features planned in the roadmap. These will be implemented in a development
+friendly order unless there is user demand to bump any of them.
+
+- [ ] HTTP Server (vMix integration)
+- [ ] Improvements in event interface
+- [ ] Moderator view
+- [ ] New playback mode for [cumulative time keeping](https://github.com/cpvalente/ontime/issues/100)
+- [ ] Lower Third Manager
+- [ ] Reach Schedule: way to speedup timer to meet a deadline
 
 ### Issues
-The app is still in pre-release and there are a few issues, mainly concerning style.
-This will be receiving attention as we near v1 release
 
-#### Style
-- [ ] App needs improvement on handling zoomed interfaces: Please ensure that windows settings have no display zoom (it is 125% by default)
-- [ ] Very long titles might cause interface to shift
+If you come across any bugs, [please open an issue]((https://github.com/cpvalente/ontime/issues/new)). Usually bugs get fixed pretty quickly when reported 
+
+#### Unsigned App
+
+When installing the app you would see warning screens from the Operating System like:
+
+```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```
+
+You can circumvent this by allowing the execution of the app manually.
+
+- In Windows: click more and select "Run Anyway"
+- in macOS: after attempting to run the installer, navigate to System Preferences ->  Security &
+  Privacy and allow the execution of the app
+- In Linux: right-click the AppImage file -> Properties -> Permissions -> select Allow Executing
+  File as a Program
+
+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, so we can discuss it](https://github.com/cpvalente/ontime/issues/new)
+
+#### Safari
+
+There are some 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 since the breaking code belongs to third party
+libraries.
 
 # Help
+
 Help is underway! ... and can be viewed [here](https://cpvalente.gitbook.io/ontime/)
 
 # License
+
 This project is licensed under the terms of the GNU GPL v3

client/.eslintignore

@@ -0,0 +1,2 @@
+node_modules
+build

client/.eslintrc

@@ -0,0 +1,143 @@
+{
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
+  },
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended",
+    "plugin:@typescript-eslint/recommended",
+    "eslint-config-prettier"
+  ],
+  "plugins": [
+    "react",
+    "testing-library",
+    "simple-import-sort"
+  ],
+  "rules": {
+    "no-useless-concat": "warn",
+    "prefer-template": "warn",
+    "react/jsx-no-bind": [
+      "error",
+      {
+        "ignoreRefs": true,
+        "allowArrowFunctions": true,
+        "allowFunctions": false,
+        "allowBind": false,
+        "ignoreDOMComponents": true
+      }
+    ],
+    "react/jsx-boolean-value": [
+      "error",
+      "never",
+      {
+        "always": []
+      }
+    ],
+    "react/jsx-handler-names": [
+      "off",
+      {
+        "eventHandlerPrefix": "handle",
+        "eventHandlerPropPrefix": "on"
+      }
+    ],
+    "react/no-danger": "warn",
+    "react/no-deprecated": [
+      "error"
+    ],
+    "react/jsx-uses-react": "off",
+    "react/react-in-jsx-scope": "off",
+    "react/jsx-no-undef": "error",
+    "react/jsx-closing-tag-location": "warn",
+    "react/jsx-no-useless-fragment": "warn",
+    "react/no-unescaped-entities": "error",
+    "react/jsx-tag-spacing": [
+      "error",
+      {
+        "closingSlash": "never",
+        "beforeSelfClosing": "always",
+        "afterOpening": "never",
+        "beforeClosing": "never"
+      }
+    ],
+    "react/jsx-space-before-closing": [
+      "off",
+      "always"
+    ],
+    "react/jsx-curly-brace-presence": [
+      "error",
+      {
+        "props": "never",
+        "children": "never"
+      }
+    ],
+    "react/destructuring-assignment": [
+      "error",
+      "always"
+    ],
+    "react/no-unsafe": "off",
+    "react/prop-types": [
+      "error",
+      {
+        "ignore": [],
+        "customValidators": [],
+        "skipUndeclared": true
+      }
+    ],
+    "simple-import-sort/imports": "warn",
+    "simple-import-sort/exports": "warn"
+  },
+  "overrides": [
+    // override "simple-import-sort" config
+    {
+      "files": [
+        "*.js",
+        "*.jsx",
+        "*.ts",
+        "*.tsx"
+      ],
+      "rules": {
+        "simple-import-sort/imports": [
+          "error",
+          {
+            "groups": [
+              // Packages `react` related packages come first.
+              [
+                "^react",
+                "^@?\\w"
+              ],
+              // Internal packages.
+              [
+                "^(@|components)(/.*|$)"
+              ],
+              // Side effect imports.
+              [
+                "^\\u0000"
+              ],
+              // Parent imports. Put `..` last.
+              [
+                "^\\.\\.(?!/?$)",
+                "^\\.\\./?$"
+              ],
+              // Other relative imports. Put same-folder imports and `.` last.
+              [
+                "^\\./(?=.*/)(?!/?$)",
+                "^\\.(?!/?$)",
+                "^\\./?$"
+              ],
+              // Style imports.
+              [
+                "^.+\\.?(css)$"
+              ]
+            ]
+          }
+        ]
+      }
+    }
+  ]
+}

client/.stylelintrc

@@ -0,0 +1,6 @@
+{
+  "extends": [
+    "stylelint-config-standard-scss",
+    "stylelint-config-prettier"
+  ]
+}

client/index.html

@@ -0,0 +1,37 @@
+<!doctype html>
+<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.jsx'></script>
+</body>
+</html>

client/jsconfig.json

@@ -1,6 +0,0 @@
-{
-  "compilerOptions": {
-    "baseUrl": "src"
-  },
-  "include": ["src"]
-}

client/package.json

@@ -1,43 +1,41 @@
 {
-  "name": "ontime",
-  "version": "0.1.0",
+  "name": "ontime-ui",
+  "version": "1.9.1",
   "private": true,
   "dependencies": {
-    "@chakra-ui/react": "^1.7.1",
-    "@emotion/react": "^11.5.0",
-    "@emotion/styled": "^11.3.0",
-    "@testing-library/jest-dom": "^5.11.4",
-    "@testing-library/react": "^11.1.0",
-    "@testing-library/user-event": "^12.1.10",
-    "axios": "^0.21.1",
-    "framer-motion": "^4.1.6",
-    "jotai": "^0.16.5",
-    "react": "17.0.2",
+    "@chakra-ui/react": "^2.3.2",
+    "@dnd-kit/core": "^6.0.5",
+    "@dnd-kit/sortable": "^7.0.1",
+    "@dnd-kit/utilities": "^3.2.0",
+    "@emotion/react": "^11.10.4",
+    "@emotion/styled": "^11.10.4",
+    "@react-icons/all-files": "^4.1.0",
+    "@tanstack/react-query": "^4.1.3",
+    "@tanstack/react-query-devtools": "^4.0.10",
+    "autosize": "^5.0.1",
+    "axios": "^0.27.2",
+    "color": "^4.2.3",
+    "framer-motion": "^7.3.2",
+    "jotai": "^1.7.8",
+    "luxon": "^3.0.1",
+    "react": "^18.1.0",
     "react-beautiful-dnd": "^13.1.0",
-    "react-dom": "^17.0.1",
+    "react-dom": "^18.1.0",
     "react-fast-compare": "^3.2.0",
-    "react-icons": "^4.3.1",
-    "react-qr-code": "^2.0.2",
-    "react-query": "^3.13.5",
-    "react-router": "^5.2.0",
-    "react-router-dom": "^5.2.0",
-    "react-scripts": "4.0.3",
-    "socket.io-client": "^4.3.2",
+    "react-qr-code": "^2.0.5",
+    "react-router-dom": "^6.3.0",
+    "react-table": "^7.7.0",
+    "socket.io-client": "^4.5.1",
     "typeface-open-sans": "^1.1.13",
-    "use-fit-text": "^2.4.0",
-    "web-vitals": "^1.0.1"
+    "web-vitals": "^2.1.4"
   },
   "scripts": {
-    "start": "set BROWSER=none&&react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
-  },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
+    "start": "set BROWSER=none&&vite",
+    "build": "vite build",
+    "lint": "eslint .",
+    "stylelint": "npx stylelint \"**/*.scss\"\n",
+    "test": "vitest ",
+    "test:pipeline": "vitest run"
   },
   "browserslist": {
     "production": [
@@ -52,6 +50,34 @@
     ]
   },
   "devDependencies": {
-    "sass": "^1.44.0"
+    "@testing-library/jest-dom": "^5.16.4",
+    "@testing-library/react": "^13.1.1",
+    "@testing-library/react-hooks": "^8.0.0",
+    "@testing-library/user-event": "^14.1.1",
+    "@types/node": "^18.7.16",
+    "@types/react": "^18.0.19",
+    "@types/react-dom": "^18.0.6",
+    "@typescript-eslint/eslint-plugin": "^5.37.0",
+    "@typescript-eslint/parser": "^5.37.0",
+    "@vitejs/plugin-react": "^2.1.0",
+    "eslint": "^8.23.1",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-jest": "^27.0.4",
+    "eslint-plugin-react": "^7.31.8",
+    "eslint-plugin-simple-import-sort": "^7.0.0",
+    "eslint-plugin-testing-library": "^5.6.4",
+    "jsdom": "^20.0.0",
+    "prettier": "^2.7.1",
+    "prop-types": "^15.8.1",
+    "react-test-renderer": "^18.1.0",
+    "sass": "^1.51.0",
+    "stylelint": "^14.9.1",
+    "stylelint-config-prettier": "^9.0.3",
+    "stylelint-config-standard-scss": "^4.0.0",
+    "typescript": "^4.8.3",
+    "vite": "^3.1.1",
+    "vite-plugin-svgr": "^2.2.1",
+    "vite-tsconfig-paths": "^3.5.0",
+    "vitest": "^0.23.2"
   }
-}
+}

client/public/index.html

@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#121212" />
-    <meta name="onsite" content="onsite - event timer manager" />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <link
-      rel="icon"
-      type="image/png"
-      sizes="32x32"
-      href="%PUBLIC_URL%/favicon-32x32.png"
-    />
-    <link
-      rel="icon"
-      type="image/png"
-      sizes="16x16"
-      href="%PUBLIC_URL%/favicon-16x16.png"
-    />
-    <link rel="manifest" href="%PUBLIC_URL%/site.webmanifest" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>React App</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>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
-</html>

client/src/App.jsx

@@ -1,53 +1,30 @@
-import { lazy, Suspense, useCallback, useEffect } from 'react';
-import { Route, Switch } from 'react-router-dom';
-import './App.css';
-import { QueryClient, QueryClientProvider } from 'react-query';
-import SocketProvider from 'app/context/socketContext';
-import withSocket from 'features/viewers/ViewWrapper';
+import { Suspense, useCallback, useEffect } from 'react';
+import { BrowserRouter } from 'react-router-dom';
+import { ChakraProvider } from '@chakra-ui/react';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
 import ErrorBoundary from 'common/components/errorBoundary/ErrorBoundary';
 
-const Editor = lazy(() => import('features/editors/Editor'));
-const PresenterView = lazy(() =>
-  import('features/viewers/presenter/PresenterView')
-);
-const PresenterSimple = lazy(() =>
-  import('features/viewers/presenter/PresenterSimple')
-);
-const StageManager = lazy(() =>
-  import('features/viewers/backstage/StageManager')
-);
-const Public = lazy(() => import('features/viewers/foh/Public'));
-const Lower = lazy(() =>
-  import('features/viewers/production/lower/LowerWrapper')
-);
-const Pip = lazy(() => import('features/viewers/production/Pip'));
+import { AppContextProvider } from './common/context/AppContext';
+import SocketProvider from './common/context/socketContext';
+import theme from './theme/theme';
+import AppRouter from './AppRouter';
 
-const StudioClock = lazy(() => import('features/viewers/studio/StudioClock'));
-
-const queryClient = new QueryClient();
-// Seemed to cause issues
-// broadcastQueryClient({
-//   queryClient,
-//   broadcastChannel: 'ontime',
-// });
-
-const SPresenter = withSocket(PresenterView);
-const SPresenterSimple = withSocket(PresenterSimple);
-const SStageManager = withSocket(StageManager);
-const SPublic = withSocket(Public);
-const SLowerThird = withSocket(Lower);
-const SPip = withSocket(Pip);
-const SStudio = withSocket(StudioClock);
+// Load Open Sans typeface
+import('typeface-open-sans');
+export const ontimeQueryClient = new QueryClient();
 
 function App() {
+
   // Handle keyboard shortcuts
   const handleKeyPress = useCallback((e) => {
+    // handle held key
+    if (e.repeat) return;
     // check if the alt key is pressed
     if (e.altKey) {
       if (e.key === 't' || e.key === 'T') {
         // if we are in electron
-        if (window.process?.type === undefined) return;
-        if (window.process.type === 'renderer') {
+        if (window.process?.type === 'renderer') {
           // ask to see debug
           window.ipcRenderer.send('set-window', 'show-dev');
         }
@@ -66,32 +43,24 @@ function App() {
   }, [handleKeyPress]);
 
   return (
-    <SocketProvider>
-      <QueryClientProvider client={queryClient}>
-        <div className='App'>
-          <ErrorBoundary>
-            <Suspense fallback={null}>
-              <Switch>
-                <Route exact path='/' component={SPresenter} />
-                <Route exact path='/sm' component={SStageManager} />
-                <Route exact path='/speaker' component={SPresenter} />
-                <Route exact path='/presenter' component={SPresenter} />
-                <Route exact path='/stage' component={SPresenter} />
-                <Route exact path='/presentersimple' component={SPresenterSimple} />
-                <Route exact path='/editor' component={Editor} />
-                <Route exact path='/public' component={SPublic} />
-                <Route exact path='/pip' component={SPip} />
-                <Route exact path='/studio' component={SStudio} />
-                {/* Lower cannot have fallback */}
-                <Route exact path='/lower' component={SLowerThird} />
-                {/* Send to default if nothing found */}
-                <Route component={SPresenter} />
-              </Switch>
-            </Suspense>
-          </ErrorBoundary>
-        </div>
-      </QueryClientProvider>
-    </SocketProvider>
+    <ChakraProvider resetCSS theme={theme}>
+      <SocketProvider>
+        <QueryClientProvider client={ontimeQueryClient}>
+          <AppContextProvider>
+            <BrowserRouter>
+              <div className='App'>
+                <ErrorBoundary>
+                  <Suspense fallback={null}>
+                    <AppRouter />
+                  </Suspense>
+                </ErrorBoundary>
+                <ReactQueryDevtools initialIsOpen={false} />
+              </div>
+            </BrowserRouter>
+          </AppContextProvider>
+        </QueryClientProvider>
+      </SocketProvider>
+    </ChakraProvider>
   );
 }
 

client/src/App.test.js

@@ -1,8 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import App from './App';
-
-test('renders learn react link', () => {
-  render(<App />);
-  const linkElement = screen.getByText(/learn react/i);
-  expect(linkElement).toBeInTheDocument();
-});

client/src/AppRouter.jsx

@@ -0,0 +1,125 @@
+import { lazy, useEffect } from 'react';
+import { Route, Routes, useLocation, useNavigate } from 'react-router-dom';
+
+import { ALIASES } from './common/api/apiConstants';
+import { getAliases } from './common/api/ontimeApi';
+import { useFetch } from './common/hooks/useFetch';
+import { useSocketProvider } from './common/hooks/useSocketProvider';
+import withSocket from './features/viewers/ViewWrapper';
+
+const Editor = lazy(() => import('features/editors/ProtectedEditor'));
+const Table = lazy(() => import('features/table/ProtectedTable'));
+
+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 = lazy(() => import('features/viewers/backstage/Backstage'));
+const Public = lazy(() => import('features/viewers/public/Public'));
+const Lower = lazy(() => import('features/viewers/lower-thirds/LowerWrapper'));
+const Pip = lazy(() => import('features/viewers/picture-in-picture/Pip'));
+const StudioClock = lazy(() => import('features/viewers/studio/StudioClock'));
+
+const STimer = withSocket(TimerView);
+const SMinimalTimer = withSocket(MinimalTimerView);
+const SClock = withSocket(ClockView);
+const SCountdown = withSocket(Countdown);
+const SBackstage = withSocket(Backstage);
+const SPublic = withSocket(Public);
+const SLowerThird = withSocket(Lower);
+const SPip = withSocket(Pip);
+const SStudio = withSocket(StudioClock);
+
+const FeatureWrapper = lazy(() => import('features/FeatureWrapper'));
+const EventList = lazy(() => import('features/editors/list/EventListExport'));
+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() {
+  useSocketProvider();
+  const { data } = useFetch(ALIASES, getAliases);
+  const location = useLocation();
+  const navigate = useNavigate();
+
+  // navigate if is alias route
+  useEffect(() => {
+    if (!data) return;
+    for (const d of data) {
+      if (`/${d.alias}` === location.pathname && d.enabled) {
+        navigate(`/${d.pathAndParams}`);
+        break;
+      }
+    }
+  }, [data, location, navigate]);
+
+  return(
+    <Routes>
+      <Route path='/' element={<STimer />} />
+      <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='/pip' element={<SPip />} />
+      <Route path='/studio' element={<SStudio />} />
+      {/*/!* Lower cannot have fallback *!/*/}
+      <Route path='/lower' element={<SLowerThird />} />
+
+      {/*/!* Protected Routes *!/*/}
+      <Route path='/editor' element={<Editor />} />
+      <Route path='/cuesheet' element={<Table />} />
+      <Route path='/cuelist' element={<Table />} />
+      <Route path='/table' element={<Table />} />
+
+      {/*/!* Protected Routes - Elements *!/*/}
+      <Route
+        path='/eventlist'
+        element={
+          <FeatureWrapper>
+            <EventList />
+          </FeatureWrapper>
+        }
+      />
+      <Route
+        path='/timercontrol'
+        element={
+          <FeatureWrapper>
+            <TimerControl />
+          </FeatureWrapper>
+        }
+      />
+      <Route
+        path='/messagecontrol'
+        element={
+          <FeatureWrapper>
+            <MessageControl />
+          </FeatureWrapper>
+        }
+      />
+      <Route
+        path='/info'
+        element={
+          <FeatureWrapper>
+            <Info />
+          </FeatureWrapper>
+        }
+      />
+      {/* Send to default if nothing found */}
+      <Route path='*' element={<STimer />} />
+    </Routes>
+  )
+}

client/src/__mocks__/QueryClient.mock.js

@@ -0,0 +1,9 @@
+import { QueryClient } from '@tanstack/react-query';
+
+export const queryClientMock = new QueryClient({
+  defaultOptions: {
+    queries: {
+      retry: false,
+    },
+  },
+});

client/src/app/api/apiConstants.js

@@ -1,14 +0,0 @@
-export const NODE_PORT = 4001;
-export const EVENT_TABLE = 'event';
-export const EVENTS_TABLE = 'events';
-export const APP_TABLE = 'appinfo';
-
-const calculateServer = () => {
-  return window.location.origin.replace(window.location.port, `${NODE_PORT}/`);
-};
-
-export const serverURL = calculateServer();
-export const eventURL = serverURL + EVENT_TABLE;
-export const eventsURL = serverURL + EVENTS_TABLE;
-export const playbackURL = serverURL + 'playback';
-export const ontimeURL = serverURL + 'ontime';

client/src/app/api/eventApi.js

@@ -1,12 +0,0 @@
-import axios from 'axios';
-import { eventURL } from './apiConstants';
-
-export const fetchEvent = async () => {
-  const res = await axios.get(eventURL);
-  return res.data;
-};
-
-export const postEvent = async (data) => {
-  const res = await axios.post(eventURL, data);
-  return res;
-};

client/src/app/api/eventsApi.js

@@ -1,44 +0,0 @@
-import axios from 'axios';
-import { eventsURL } from '../api/apiConstants';
-
-export const fetchAllEvents = async () => {
-  const res = await axios.get(eventsURL);
-  return res.data;
-};
-
-export const requestPost = async (data) => {
-  const res = await axios.post(eventsURL, data);
-  return res;
-};
-
-export const requestPut = async (data) => {
-  const res = await axios.put(eventsURL, data);
-  return res;
-};
-
-export const requestPatch = async (data) => {
-  const res = await axios.patch(eventsURL, data);
-  return res;
-};
-
-export const requestReorder = async (data) => {
-  const action = 'reorder';
-  const res = await axios.patch(eventsURL + '/' + action, data);
-  return res;
-};
-
-export const requestApplyDelay = async (eventId) => {
-  const action = 'applydelay';
-  const res = await axios.patch(eventsURL + '/' + action + '/' + eventId);
-  return res;
-};
-
-export const requestDelete = async (eventId) => {
-  const res = await axios.delete(eventsURL + '/' + eventId);
-  return res;
-};
-
-export const requestDeleteAll = async () => {
-  const res = await axios.delete(eventsURL + '/all');
-  return res;
-};

client/src/app/api/ontimeApi.js

@@ -1,63 +0,0 @@
-import axios from 'axios';
-import { ontimeURL } from './apiConstants';
-
-export const ontimePlaceholderInfo = {
-  networkInterfaces: [],
-  version: '',
-  serverPort: 4001,
-  oscInPort: '',
-  oscOutPort: '',
-  oscOutIP: '',
-};
-
-export const getInfo = async () => {
-  const res = await axios.get(ontimeURL + '/info');
-  return res.data;
-};
-
-export const postInfo = async (data) => {
-  const res = await axios.post(ontimeURL + '/info', data);
-  return res;
-};
-
-export const downloadEvents = async () => {
-  await axios({
-    url: ontimeURL + '/db',
-    method: 'GET',
-    responseType: 'blob', // important
-  }).then((response) => {
-    let headerLine = response.headers['Content-Disposition'];
-    let filename = 'events.json';
-
-    // try and get the filename from the response
-    if (headerLine != null) {
-      let startFileNameIndex = headerLine.indexOf('"') + 1;
-      let endFileNameIndex = headerLine.lastIndexOf('"');
-      filename = headerLine.substring(startFileNameIndex, endFileNameIndex);
-    }
-
-    const url = window.URL.createObjectURL(new Blob([response.data]));
-    const link = document.createElement('a');
-    link.href = url;
-    link.setAttribute('download', filename);
-    document.body.appendChild(link);
-    link.click();
-  });
-};
-
-export const uploadEvents = async (file) => {
-  const formData = new FormData();
-  formData.append('userFile', file); // appending file
-  await axios
-    .post(ontimeURL + '/db', formData, {
-      headers: {
-        'Content-Type': 'multipart/form-data',
-      },
-    })
-    .then((res) => console.log(res.data))
-    .catch((err) => console.error(err));
-};
-
-export const uploadEventsWithPath = async (filepath) => {
-  await axios.post(ontimeURL + '/dbpath', { path: filepath });
-};

client/src/app/api/playbackApi.js

@@ -1,37 +0,0 @@
-import axios from 'axios';
-import { playbackURL } from '../api/apiConstants';
-
-export const getStart = async () => {
-  const res = await axios.get(playbackURL + '/start');
-  return res;
-};
-
-export const getPause = async () => {
-  const res = axios.get(playbackURL + '/pause');
-  return res;
-};
-
-export const getRoll = async () => {
-  const res = axios.get(playbackURL + '/roll');
-  return res;
-};
-
-export const getPrevious = async () => {
-  const res = axios.get(playbackURL + '/previous');
-  return res;
-};
-
-export const getNext = async () => {
-  const res = axios.get(playbackURL + '/next');
-  return res;
-};
-
-export const getUnload = async () => {
-  const res = axios.get(playbackURL + '/unload');
-  return res;
-};
-
-export const getReload = async () => {
-  const res = axios.get(playbackURL + '/reload');
-  return res;
-};

client/src/app/context/collapseAtom.js

@@ -1,60 +0,0 @@
-const { atom } = require('jotai');
-
-const PATH = 'option-collapse';
-const initialValue = {};
-
-// collapse options object, initialised from local storage
-// REFRACT: When do we read from local storage?
-//          on every render?
-
-export const collapseAtom = atom(
-  (get) => {
-    const storedOptions = localStorage.getItem(PATH);
-    if (storedOptions == null) return initialValue;
-
-    return JSON.parse(storedOptions);
-  },
-  (get, set, newValues) => {
-    set(collapseAtom, newValues);
-    localStorage.setItem(PATH, JSON.stringify(newValues));
-  }
-);
-
-// get a single option, if it exists
-export const SelectCollapse = (id) => {
-  return atom((get) => get(collapseAtom)[id]);
-};
-
-// change a single item in object
-export const HandleCollapse = atom(null, (get, set, payload) => {
-  const updatedVal = {
-    ...get(collapseAtom),
-    ...payload,
-  };
-  set(collapseAtom, updatedVal);
-  localStorage.setItem(PATH, JSON.stringify(updatedVal));
-});
-
-// change collapsed in several items
-export const BatchOperation = atom(null, (get, set, payload) => {
-  let prevOptions = get(collapseAtom);
-
-  let newOptions = {};
-
-  for (const item of payload.items) {
-    newOptions[item.id] = payload.isCollapsed;
-  }
-
-  if (payload.clear) {
-    // clear object
-    prevOptions = {};
-    // clear localstorage
-    localStorage.removeItem(PATH);
-  }
-
-  const options = { ...prevOptions, ...newOptions };
-
-  set(collapseAtom, options);
-
-  localStorage.setItem(PATH, JSON.stringify(options));
-});

client/src/app/context/settingsAtom.js

@@ -1,34 +0,0 @@
-const { atom } = require('jotai');
-
-const PATH = 'option-gen';
-const initialValue = {
-  cursor: 'locked',
-};
-
-export const settingsAtom = atom(
-  (get) => {
-    const storedOptions = localStorage.getItem(PATH);
-    if (storedOptions == null) return initialValue;
-
-    return JSON.parse(storedOptions);
-  },
-  (get, set, newValues) => {
-    set(settingsAtom, newValues);
-    localStorage.setItem(PATH, JSON.stringify(newValues));
-  }
-);
-
-// get a single option, if it exists
-export const SelectSetting = (setting) => {
-  return atom((get) => get(settingsAtom)[setting]);
-};
-
-// change a single item in object
-export const HandleOptions = atom(null, (get, set, payload) => {
-  const updatedVal = {
-    ...get(settingsAtom),
-    ...payload,
-  };
-  set(settingsAtom, updatedVal);
-  localStorage.setItem(PATH, JSON.stringify(updatedVal));
-});

client/src/app/context/socketContext.js

@@ -1,26 +0,0 @@
-import { createContext, useContext, useEffect, useState } from 'react';
-import io from 'socket.io-client';
-import { serverURL } from 'app/api/apiConstants';
-
-const SocketContext = createContext([[], () => {}]);
-
-export const useSocket = () => {
-  return useContext(SocketContext);
-};
-
-function SocketProvider(props) {
-  const [socket, setSocket] = useState();
-
-  useEffect(() => {
-    const s = io(serverURL, { transports: ['websocket'] });
-    setSocket(s);
-    return () => s.disconnect();
-  }, []);
-
-  return (
-    <SocketContext.Provider value={socket}>
-      {props.children}
-    </SocketContext.Provider>
-  );
-}
-export default SocketProvider;

client/src/app/hooks/useTimeout.js

@@ -1,38 +0,0 @@
-import { useEffect } from 'react';
-
-//
-// useTimeout React Hook
-//
-// React hook for delaying calls with time
-export const useTimeout = (
-  callback, // function to call. No args passed.
-  timeout = 0, // delay, ms (default: immediately put into JS Event Queue)
-  {
-    // manage re-render behavior.
-    // by default, a re-render in your component will re-define the callback,
-    //    which will cause this timeout to cancel itself.
-    // to avoid cancelling on re-renders (but still cancel on unmounts),
-    //    set `persistRenders: true,`.
-    persistRenders = false,
-  } = {},
-  // These dependencies are injected for testing purposes.
-  // (pure functions - where all dependencies are arguments - is often easier to test)
-  _setTimeout = setTimeout,
-  _clearTimeout = clearTimeout,
-  _useEffect = useEffect
-) => {
-  let timeoutId;
-  const cancel = () => timeoutId && _clearTimeout(timeoutId);
-
-  _useEffect(
-    () => {
-      timeoutId = _setTimeout(callback, timeout);
-      return cancel;
-    },
-    persistRenders
-      ? [_setTimeout, _clearTimeout]
-      : [callback, timeout, _setTimeout, _clearTimeout]
-  );
-
-  return cancel;
-};

client/src/app/sampleData.js

@@ -1,52 +0,0 @@
-const dummy = new Date();
-
-export const sampleData = {
-  presenterMessage: {
-    text: 'Only the presenter sees this',
-    active: false,
-  },
-  publicMessage: {
-    text: 'Everyone sees this',
-    active: false,
-  },
-  events: [
-    {
-      id: '1',
-      title: 'Is the internet a fad?',
-      subtitle: 'It is',
-      presenter: 'Carlos Valente',
-      timeStart: 37800000,
-      timeEnd: 39600000,
-      clockStarted: dummy,
-      timerDuration: 60,
-      type: 'event',
-    },
-    {
-      id: 0.4849093424577693,
-      duration: 25*60000,
-      type: 'delay',
-    },
-    {
-      id: '2',
-      title: 'Is reddit a dictatorship?',
-      subtitle: 'It is',
-      presenter: 'Carlos Valente',
-      timeStart: 39600000,
-      timeEnd: 40320000,
-      clockStarted: dummy,
-      timerDuration: 60*60000,
-      type: 'event',
-    },
-    {
-      id: '3',
-      title: 'Out of words',
-      subtitle: '',
-      presenter: 'Carlos Valente',
-      timeStart: 41400000,
-      timeEnd: 43200000,
-      clockStarted: dummy,
-      timerDuration: 60,
-      type: 'event',
-    },
-  ],
-};

client/src/app/userConfig.js

@@ -1,7 +0,0 @@
-export const userConfig = {
-  timerColorOnPause: '#555',
-  timerColorOnRunning: '#FFF',
-  timerColorOnMessage: '#CCC',
-  timerColorOnTimeOver: '#F00',
-  overTimeText: '',
-}

client/src/app/utils.js

@@ -1,2 +0,0 @@
-export const clamp = (num, a, b) =>
-  Math.max(Math.min(num, Math.max(a, b)), Math.min(a, b));

client/src/appConstants.js

@@ -0,0 +1,18 @@
+// Exported viewer link location
+const minimalLocation = 'minimal';
+const speakerLocation = 'speaker';
+const smLocation = 'sm';
+const publicLocation = 'public';
+const pipLocation = 'pip';
+const studioLocation = 'studio';
+const cuesheetLocation = 'cuesheet';
+
+export const viewerLocations = [
+  { link: minimalLocation, label: 'Minimal timer' },
+  { link: speakerLocation, label: 'Speaker Screen' },
+  { link: smLocation, label: 'Backstage Screen' },
+  { link: publicLocation, label: 'Public Screen' },
+  { link: pipLocation, label: 'Picture in Picture' },
+  { link: studioLocation, label: 'Studio Clock' },
+  { link: cuesheetLocation, label: 'Cuesheet' }
+];

client/src/common/api/apiConstants.js

@@ -0,0 +1,33 @@
+export const STATIC_PORT = 4001;
+export const EVENT_TABLE = ['event'];
+export const ALIASES = ['aliases'];
+export const USERFIELDS = ['userFields'];
+export const EVENTS_TABLE_KEY = 'events';
+export const EVENTS_TABLE = [EVENTS_TABLE_KEY];
+export const APP_TABLE = ['appinfo'];
+export const OSC_SETTINGS = ['oscSettings'];
+export const APP_SETTINGS = ['appSettings'];
+export const VIEW_SETTINGS = ['viewSettings'];
+
+export const FEAT_EVENTLIST = ['feat-eventList'];
+export const FEAT_MESSAGECONTROL = ['feat-messagecontrol'];
+export const FEAT_PLAYBACKCONTROL = ['feat-playbackcontrol'];
+export const FEAT_INFO = ['feat-info'];
+export const FEAT_CUESHEET = ['feat-cuesheet'];
+export const TIMER = ['ontime-timer'];
+
+/**
+ * @description finds server path given the current location, it
+ * @return {*}
+ */
+export const calculateServer = () =>
+  import.meta.env.DEV ? `http://localhost:${STATIC_PORT}` : window.location.origin;
+
+export const serverURL = calculateServer();
+export const eventURL = `${serverURL}/${EVENT_TABLE}`;
+export const eventsURL = `${serverURL}/${EVENTS_TABLE}`;
+export const playbackURL = `${serverURL}/playback`;
+export const ontimeURL = `${serverURL}/ontime`;
+
+export const stylesPath = 'external/styles/override.css';
+export const overrideStylesURL = `${serverURL}/${stylesPath}`;

client/src/common/api/eventApi.js

@@ -0,0 +1,18 @@
+import axios from 'axios';
+
+import { eventURL } from './apiConstants';
+
+/**
+ * @description HTTP request to fetch event data
+ * @return {Promise}
+ */
+export const fetchEvent = async () => {
+  const res = await axios.get(eventURL);
+  return res.data;
+};
+
+/**
+ * @description HTTP request to mutate event data
+ * @return {Promise}
+ */
+export const postEvent = async (data) => axios.post(eventURL, data);

client/src/common/api/eventsApi.js

@@ -0,0 +1,54 @@
+import axios from 'axios';
+
+import { eventsURL } from './apiConstants';
+
+/**
+ * @description HTTP request to fetch all events
+ * @return {Promise}
+ */
+export const fetchAllEvents = async () => {
+  const res = await axios.get(eventsURL);
+  return res.data;
+};
+
+/**
+ * @description HTTP request to post new event
+ * @return {Promise}
+ */
+export const requestPost = async (data) => axios.post(eventsURL, data);
+
+/**
+ * @description HTTP request to put new event
+ * @return {Promise}
+ */
+export const requestPut = async (data) => axios.put(eventsURL, data);
+
+/**
+ * @description HTTP request to modify event
+ * @return {Promise}
+ */
+export const requestPatch = async (data) => axios.patch(eventsURL, data);
+
+/**
+ * @description HTTP request to reorder events
+ * @return {Promise}
+ */
+export const requestReorder = async (data) => axios.patch(`${eventsURL}/reorder`, data);
+
+/**
+ * @description HTTP request to request application of delay
+ * @return {Promise}
+ */
+export const requestApplyDelay = async (eventId) => axios.patch(`${eventsURL}/applydelay/${eventId}`);
+
+/**
+ * @description HTTP request to delete given event
+ * @return {Promise}
+ */
+export const requestDelete = async (eventId) => axios.delete(`${eventsURL}/${eventId}`);
+
+/**
+ * @description HTTP request to delete all events
+ * @return {Promise}
+ */
+export const requestDeleteAll = async () => axios.delete(`${eventsURL}/all`);

client/src/common/api/ontimeApi.js

@@ -0,0 +1,289 @@
+import axios from 'axios';
+
+import { ontimeURL } from './apiConstants';
+
+/**
+ * @description placeholder information for ontimeInfo
+ * @type {{settings: {serverPort: number, version: string}, networkInterfaces: *[]}}
+ */
+export const ontimePlaceholderInfo = {
+  networkInterfaces: [],
+  settings: {
+    version: '',
+    serverPort: 4001,
+  },
+};
+
+/**
+ * @description placeholder information for ontimeSettings
+ * @type {{pinCode: null}}
+ */
+export const ontimePlaceholderSettings = {
+  app: 'ontime',
+  version: 1,
+  serverPort: 4001,
+  lock: null,
+  pinCode: null,
+  timeFormat: '24',
+};
+
+/**
+ * @description placeholder information for eventSettings
+ * @type {{backstageInfo: string, endMessage: string, publicInfo: string, title: string, url: string}}
+ */
+export const eventPlaceholderSettings = {
+  title: '',
+  url: '',
+  publicInfo: '',
+  backstageInfo: '',
+  endMessage: '',
+};
+
+/**
+ * @description placeholder information for userFields
+ * @type {{user1: string, user2: string, user0: string, user9: string, user7: string, user8: string, user5: string, user6: string, user3: string, user4: string}}
+ */
+export const userFieldsPlaceholder = {
+  user0: '',
+  user1: '',
+  user2: '',
+  user3: '',
+  user4: '',
+  user5: '',
+  user6: '',
+  user7: '',
+  user8: '',
+  user9: '',
+};
+
+/**
+ * @description placeholder information for oscSettings
+ * @type {{targetIP: string, port: string, portOut: string, enabled: boolean}}
+ */
+export const oscPlaceholderSettings = {
+  port: '',
+  portOut: '',
+  targetIP: '',
+  enabled: false,
+};
+
+/**
+ * @description placeholder information for view settings
+ * @type {{overrideCSS: boolean}}
+ */
+export const viewsPlaceholder = {
+  overrideStyles: false,
+};
+
+/**
+ * @description placeholder information for httpSettings
+ * @type {{onStart: {url: string, enabled: boolean}, onLoad: {url: string, enabled: boolean}, onPause: {url: string, enabled: boolean}, onFinish: {url: string, enabled: boolean}, onUpdate: {url: string, enabled: boolean}, onStop: {url: string, enabled: boolean}}}
+ */
+export const httpPlaceholder = {
+  onLoad: {
+    url: '',
+    enabled: false,
+  },
+  onStart: {
+    url: '',
+    enabled: false,
+  },
+  onUpdate: {
+    url: '',
+    enabled: false,
+  },
+  onPause: {
+    url: '',
+    enabled: false,
+  },
+  onStop: {
+    url: '',
+    enabled: false,
+  },
+  onFinish: {
+    url: '',
+    enabled: false,
+  },
+};
+
+/**
+ * @description ontime utility variables
+ * @type {[{name: string, description: string}, {name: string, description: string}, {name: string, description: string}, {name: string, description: string}, {name: string, description: string}, null, null]}
+ */
+export const ontimeVars = [
+  {
+    name: '$timer',
+    description: 'Current running timer',
+  },
+  {
+    name: '$title',
+    description: 'Current title',
+  },
+  {
+    name: '$presenter',
+    description: 'Current timer',
+  },
+  {
+    name: '$subtitle',
+    description: 'Current subtitle',
+  },
+  {
+    name: '$next-title',
+    description: 'Next title',
+  },
+  {
+    name: '$next-presenter',
+    description: 'Next timer',
+  },
+  {
+    name: '$next-subtitle',
+    description: 'Next subtitle',
+  },
+];
+
+/**
+ * @description HTTP request to retrieve application settings
+ * @return {Promise}
+ */
+export const getSettings = async () => {
+  const res = await axios.get(`${ontimeURL}/settings`);
+  return res.data;
+};
+
+/**
+ * @description HTTP request to mutate application settings
+ * @return {Promise}
+ */
+export const postSettings = async (data) => axios.post(`${ontimeURL}/settings`, data);
+
+/**
+ * @description HTTP request to retrieve application info
+ * @return {Promise}
+ */
+export const getInfo = async () => {
+  const res = await axios.get(`${ontimeURL}/info`);
+  return res.data;
+};
+
+/**
+ * @description HTTP request to mutate application info
+ * @return {Promise}
+ */
+export const postInfo = async (data) => axios.post(`${ontimeURL}/info`, data);
+
+/**
+ * @description HTTP request to retrieve view settings
+ * @return {Promise}
+ */
+export const getView = async () => {
+  const res = await axios.get(`${ontimeURL}/views`);
+  return res.data;
+};
+
+/**
+ * @description HTTP request to mutate view settings
+ * @return {Promise}
+ */
+export const postView = async (data) => axios.post(`${ontimeURL}/views`, data);
+
+/**
+ * @description HTTP request to retrieve aliases
+ * @return {Promise}
+ */
+export const getAliases = async () => {
+  const res = await axios.get(`${ontimeURL}/aliases`);
+  return res.data;
+};
+
+/**
+ * @description HTTP request to mutate aliases
+ * @return {Promise}
+ */
+export const postAliases = async (data) => axios.post(`${ontimeURL}/aliases`, data);
+
+/**
+ * @description HTTP request to retrieve user fields
+ * @return {Promise}
+ */
+export const getUserFields = async () => {
+  const res = await axios.get(`${ontimeURL}/userfields`);
+  return res.data;
+};
+
+/**
+ * @description HTTP request to mutate user fields
+ * @return {Promise}
+ */
+export const postUserFields = async (data) => axios.post(`${ontimeURL}/userfields`, data);
+
+/**
+ * @description HTTP request to retrieve osc settings
+ * @return {Promise}
+ */
+export const getOSC = async () => {
+  const res = await axios.get(`${ontimeURL}/osc`);
+  return res.data;
+};
+
+/**
+ * @description HTTP request to mutate osc settings
+ * @return {Promise}
+ */
+export const postOSC = async (data) => axios.post(`${ontimeURL}/osc`, data);
+
+/**
+ * @description HTTP request to download db
+ * @return {Promise}
+ */
+export const downloadEvents = async () => {
+  await axios({
+    url: `${ontimeURL}/db`,
+    method: 'GET',
+    responseType: 'blob', // important
+  }).then((response) => {
+    const headerLine = response.headers['Content-Disposition'];
+    let filename = 'events.json';
+
+    // try and get the filename from the response
+    if (headerLine != null) {
+      const startFileNameIndex = headerLine.indexOf('"') + 1;
+      const endFileNameIndex = headerLine.lastIndexOf('"');
+      filename = headerLine.substring(startFileNameIndex, endFileNameIndex);
+    }
+
+    const url = window.URL.createObjectURL(new Blob([response.data], { type: 'application/json' }));
+    const link = document.createElement('a');
+    link.href = url;
+    link.setAttribute('download', filename);
+    document.body.appendChild(link);
+    link.click();
+  });
+};
+
+/**
+ * @description HTTP request to upload events db
+ * @return {Promise}
+ */
+export const uploadEvents = async (file, setProgress, options) => {
+  const formData = new FormData();
+  formData.append('userFile', file);
+  const onlyEvents = options?.onlyEvents;
+  await axios
+    .post(`${ontimeURL}/db?onlyEvents=${onlyEvents}`, formData, {
+      headers: {
+        'Content-Type': 'multipart/form-data',
+      },
+      onUploadProgress: (progressEvent) => {
+        const complete = Math.round((progressEvent.loaded * 100) / progressEvent.total);
+        setProgress(complete);
+      },
+    })
+    .then((response) => response.data.id);
+};
+
+/**
+ * @description HTTP request to upload events
+ * @return {Promise}
+ */
+export const uploadEventsWithPath = async (filepath) =>
+  axios.post(`${ontimeURL}/dbpath`, { path: filepath });

client/src/common/api/playbackApi.js

@@ -0,0 +1,45 @@
+import axios from 'axios';
+
+import { playbackURL } from './apiConstants';
+
+/**
+ * @description HTTP call to start current timer
+ * @return {Promise}
+ */
+export const getStart = async () => axios.get(`${playbackURL}/start`);
+
+/**
+ * @description HTTP call to pause current timer
+ * @return {Promise}
+ */
+export const getPause = async () => axios.get(`${playbackURL}/pause`);
+
+/**
+ * @description HTTP call to start roll mode
+ * @return {Promise}
+ */
+export const getRoll = async () => axios.get(`${playbackURL}/roll`);
+
+/**
+ * @description HTTP call to skip to previous event
+ * @return {Promise}
+ */
+export const getPrevious = async () => axios.get(`${playbackURL}/previous`);
+
+/**
+ * @description HTTP call to skip to next event
+ * @return {Promise}
+ */
+export const getNext = async () => axios.get(`${playbackURL}/next`);
+
+/**
+ * @description HTTP call to unload current timer
+ * @return {Promise}
+ */
+export const getUnload = async () => axios.get(`${playbackURL}/unload`);
+
+/**
+ * @description HTTP call to reload current timer
+ * @return {Promise}
+ */
+export const getReload = async () => axios.get(`${playbackURL}/reload`);

client/src/common/atoms/LocalEventSettings.js

@@ -0,0 +1,20 @@
+import { atomWithStorage, selectAtom } from 'jotai/utils';
+
+export const eventSettingsAtom = atomWithStorage('ontime-eventSettings', {
+  showQuickEntry: false,
+  startTimeIsLastEnd: false,
+  defaultPublic: false,
+});
+
+export const showQuickEntryAtom = selectAtom(
+  eventSettingsAtom,
+  (settings) => settings.showQuickEntry
+);
+export const startTimeIsLastEndAtom = selectAtom(
+  eventSettingsAtom,
+  (settings) => settings.startTimeIsLastEnd
+);
+export const defaultPublicAtom = selectAtom(
+  eventSettingsAtom,
+  (settings) => settings.defaultPublic
+);

client/src/common/atoms/ViewerSettings.ts

@@ -0,0 +1,3 @@
+import { atomWithStorage } from 'jotai/utils';
+
+export const mirrorViewersAtom = atomWithStorage('ontime-viewers-mirrorViewers', false);

client/src/common/components/buttons/ActionButtons.jsx

@@ -0,0 +1,58 @@
+import { IconButton } from '@chakra-ui/button';
+import { Menu, MenuButton, MenuItem, MenuList } from '@chakra-ui/menu';
+import { Tooltip } from '@chakra-ui/tooltip';
+import { FiClock } from '@react-icons/all-files/fi/FiClock';
+import { FiMinusCircle } from '@react-icons/all-files/fi/FiMinusCircle';
+import { FiPlus } from '@react-icons/all-files/fi/FiPlus';
+import PropTypes from 'prop-types';
+
+import { tooltipDelayMid } from '../../../ontimeConfig';
+
+export default function ActionButtons(props) {
+  const { showAdd, showDelay, showBlock, actionHandler } = props;
+
+  const menuStyle = {
+    color: '#000000',
+    backgroundColor: 'rgba(255,255,255,1)',
+  };
+
+  return (
+    <Menu isLazy lazyBehavior='unmount'>
+      <Tooltip label='Add ...' delay={tooltipDelayMid}>
+        <MenuButton
+          as={IconButton}
+          aria-label='Options'
+          size='xs'
+          icon={<FiPlus />}
+          _expanded={{ bg: 'orange.300', color: 'white' }}
+          _focus={{ boxShadow: 'none' }}
+          backgroundColor='orange.200'
+          color='orange.500'
+        />
+      </Tooltip>
+      <MenuList style={menuStyle}>
+        <MenuItem icon={<FiPlus />} onClick={() => actionHandler('event')} isDisabled={!showAdd}>
+          Add Event after
+        </MenuItem>
+
+        <MenuItem icon={<FiClock />} onClick={() => actionHandler('delay')} isDisabled={!showDelay}>
+          Add Delay after
+        </MenuItem>
+        <MenuItem
+          icon={<FiMinusCircle />}
+          onClick={() => actionHandler('block')}
+          isDisabled={!showBlock}
+        >
+          Add Block after
+        </MenuItem>
+      </MenuList>
+    </Menu>
+  );
+}
+
+ActionButtons.propTypes = {
+  showAdd: PropTypes.bool,
+  showDelay: PropTypes.bool,
+  showBlock: PropTypes.bool,
+  actionHandler: PropTypes.func,
+}

client/src/common/components/buttons/AddIconBtn.jsx

@@ -1,18 +0,0 @@
-import { IconButton } from '@chakra-ui/button';
-import { FiPlus } from 'react-icons/fi';
-
-export default function AddIconBtn(props) {
-  const { clickhandler, ...rest } = props;
-  return (
-    <IconButton
-      size={props.size || 'xs'}
-      icon={<FiPlus />}
-      _expanded={{ bg: 'orange.300', color: 'white' }}
-      _focus={{ boxShadow: 'none' }}
-      backgroundColor={'orange.200'}
-      color={'orange.500'}
-      onClick={clickhandler}
-      {...rest}
-    />
-  );
-}

client/src/common/components/buttons/ApplyIconBtn.jsx

@@ -1,19 +0,0 @@
-import { IconButton } from '@chakra-ui/button';
-import { Tooltip } from '@chakra-ui/tooltip';
-import { FiChevronsDown } from 'react-icons/fi';
-
-export default function ApplyIconBtn(props) {
-  const { clickhandler, ...rest } = props;
-  return (
-    <Tooltip label='Apply delays'>
-      <IconButton
-        size={props.size || 'xs'}
-        icon={<FiChevronsDown />}
-        colorScheme='orange'
-        onClick={clickhandler}
-        _focus={{ boxShadow: 'none' }}
-        {...rest}
-      />
-    </Tooltip>
-  );
-}

client/src/common/components/buttons/BlockIconBtn.jsx

@@ -1,16 +0,0 @@
-import { IconButton } from '@chakra-ui/button';
-import { FiMinusCircle } from 'react-icons/fi';
-
-export default function BlockIconBtn(props) {
-  const { clickhandler, ...rest } = props;
-  return (
-    <IconButton
-      size={props.size || 'xs'}
-      icon={<FiMinusCircle />}
-      colorScheme='purple'
-      onClick={clickhandler}
-      _focus={{ boxShadow: 'none' }}
-      {...rest}
-    />
-  );
-}

client/src/common/components/buttons/CollapseBtn.jsx

@@ -1,20 +0,0 @@
-import { IconButton } from '@chakra-ui/button';
-import { Tooltip } from '@chakra-ui/tooltip';
-import { FiChevronsUp } from 'react-icons/fi';
-
-export default function CollapseBtn(props) {
-  const { clickhandler } = props;
-  return (
-    <Tooltip label='Collapse all'>
-      <IconButton
-        size={props.size || 'xs'}
-        icon={<FiChevronsUp />}
-        colorScheme='white'
-        variant='outline'
-        background='#fff1'
-        onClick={clickhandler}
-        _focus={{ boxShadow: 'none' }}
-      />
-    </Tooltip>
-  );
-}

client/src/common/components/buttons/CurrentBtn.jsx

@@ -1,18 +0,0 @@
-import { Button } from '@chakra-ui/button';
-import { FiTarget } from 'react-icons/fi';
-
-export default function CurrentBtn(props) {
-  const { clickhandler, active } = props;
-  return (
-    <Button
-      size={props.size || 'xs'}
-      leftIcon={<FiTarget />}
-      colorScheme='whiteAlpha'
-      variant={active ? 'solid' : 'outline'}
-      onClick={clickhandler}
-      _focus={{ boxShadow: 'none' }}
-    >
-      Goto Current
-    </Button>
-  );
-}

client/src/common/components/buttons/DelayIconBtn.jsx

@@ -1,16 +0,0 @@
-import { IconButton } from '@chakra-ui/button';
-import { FiClock } from 'react-icons/fi';
-
-export default function DelayIconBtn(props) {
-  const { clickhandler, ...rest } = props;
-  return (
-    <IconButton
-      size={props.size || 'xs'}
-      icon={<FiClock />}
-      colorScheme='yellow'
-      onClick={clickhandler}
-      _focus={{ boxShadow: 'none' }}
-      {...rest}
-    />
-  );
-}

client/src/common/components/buttons/DeleteIconBtn.jsx

@@ -1,26 +0,0 @@
-import { IconButton } from '@chakra-ui/button';
-import { useState } from 'react';
-import { FiMinus } from 'react-icons/fi';
-
-export default function DeleteIconBtn(props) {
-  const { actionHandler, ...rest } = props;
-  const [loading, setLoading] = useState(false);
-
-  const handleClick = () => {
-    setLoading(true);
-    actionHandler('delete');
-  };
-
-  return (
-    <IconButton
-      size={props.size || 'xs'}
-      icon={<FiMinus />}
-      colorScheme='red'
-      onClick={handleClick}
-      _focus={{ boxShadow: 'none' }}
-      disabled={loading}
-      isLoading={loading}
-      {...rest}
-    />
-  );
-}

client/src/common/components/buttons/EnableBtn.jsx

@@ -0,0 +1,26 @@
+import { Button } from '@chakra-ui/button';
+import { IoCheckmarkSharp } from '@react-icons/all-files/io5/IoCheckmarkSharp';
+import { IoCloseSharp } from '@react-icons/all-files/io5/IoCloseSharp';
+import PropTypes from 'prop-types';
+
+export default function EnableBtn(props) {
+  const { active, text, actionHandler, size = 'xs' } = props;
+  return (
+    <Button
+      size={size}
+      leftIcon={active ? <IoCheckmarkSharp /> : <IoCloseSharp />}
+      colorScheme='blue'
+      variant={active ? 'solid' : 'outline'}
+      onClick={actionHandler}
+    >
+      {text}
+    </Button>
+  );
+}
+
+EnableBtn.propTypes = {
+  active: PropTypes.bool,
+  text: PropTypes.string,
+  actionHandler: PropTypes.func,
+  size: PropTypes.oneOf(['xs', 'sm', 'md', 'lg']),
+}

client/src/common/components/buttons/ExpandBtn.jsx

@@ -1,20 +0,0 @@
-import { IconButton } from '@chakra-ui/button';
-import { Tooltip } from '@chakra-ui/tooltip';
-import { FiChevronsDown } from 'react-icons/fi';
-
-export default function ExpandBtn(props) {
-  const { clickhandler } = props;
-  return (
-    <Tooltip label='Expand all'>
-      <IconButton
-        size={props.size || 'xs'}
-        icon={<FiChevronsDown />}
-        colorScheme='white'
-        variant='outline'
-        background='#fff1'
-        onClick={clickhandler}
-        _focus={{ boxShadow: 'none' }}
-      />
-    </Tooltip>
-  );
-}

client/src/common/components/buttons/LockIconBtn.jsx

@@ -1,22 +0,0 @@
-import { IconButton } from '@chakra-ui/button';
-import { Tooltip } from '@chakra-ui/tooltip';
-import { FiTarget } from 'react-icons/fi';
-
-export default function LockIconBtn(props) {
-  const { clickhandler, active, ref } = props;
-  return (
-    <Tooltip label='Lock cursor to current'>
-        <IconButton
-        ref={ref}
-        size={props.size || 'xs'}
-        icon={<FiTarget />}
-        color={active ? 'pink.100' : 'pink.300'}
-        borderColor={active ? undefined : 'pink.300'}
-        backgroundColor={active ? 'pink.400' : undefined}
-        variant={active ? 'solid' : 'outline'}
-        onClick={clickhandler}
-        _focus={{ boxShadow: 'none' }}
-      />
-    </Tooltip>
-  );
-}

client/src/common/components/buttons/NextIconBtn.jsx

@@ -1,18 +0,0 @@
-import { IconButton } from '@chakra-ui/button';
-import { FiSkipForward } from 'react-icons/fi';
-
-export default function NextIconBtn(props) {
-  const { clickhandler, ...rest } = props;
-  return (
-    <IconButton
-      icon={<FiSkipForward />}
-      colorScheme='whiteAlpha'
-      backgroundColor='#ffffff11'
-      variant='outline'
-      onClick={clickhandler}
-      width={90}
-      _focus={{ boxShadow: 'none' }}
-      {...rest}
-    />
-  );
-}

client/src/common/components/buttons/PauseIconBtn.jsx

@@ -1,17 +1,30 @@
 import { IconButton } from '@chakra-ui/button';
-import { FiPause } from 'react-icons/fi';
+import { Tooltip } from '@chakra-ui/tooltip';
+import { IoPause } from '@react-icons/all-files/io5/IoPause';
+import PropTypes from 'prop-types';
+
+import { tooltipDelayMid } from '../../../ontimeConfig';
 
 export default function PauseIconBtn(props) {
-  const { clickhandler, active, ...rest } = props;
+  const { clickhandler, active, disabled, ...rest } = props;
   return (
-    <IconButton
-      icon={<FiPause />}
-      colorScheme='orange'
-      variant={active ? 'solid' : 'outline'}
-      onClick={clickhandler}
-      width={120}
-      _focus={{ boxShadow: 'none' }}
-      {...rest}
-    />
+    <Tooltip label='Pause timer' openDelay={tooltipDelayMid} shouldWrapChildren={disabled}>
+      <IconButton
+        icon={<IoPause size='24px' />}
+        colorScheme='orange'
+        _hover={!disabled && { bg: 'orange.400' }}
+        variant={active ? 'solid' : 'outline'}
+        onClick={clickhandler}
+        width={120}
+        disabled={disabled}
+        {...rest}
+      />
+    </Tooltip>
   );
 }
+
+PauseIconBtn.propTypes = {
+  clickhandler: PropTypes.func,
+  active: PropTypes.bool,
+  disabled: PropTypes.bool
+}

client/src/common/components/buttons/PrevIconBtn.jsx

@@ -1,18 +0,0 @@
-import { IconButton } from '@chakra-ui/button';
-import { FiSkipBack } from 'react-icons/fi';
-
-export default function PrevIconBtn(props) {
-  const { clickhandler, ...rest } = props;
-  return (
-    <IconButton
-      icon={<FiSkipBack />}
-      colorScheme='whiteAlpha'
-      backgroundColor='#ffffff11'
-      variant='outline'
-      onClick={clickhandler}
-      width={90}
-      _focus={{ boxShadow: 'none' }}
-      {...rest}
-    />
-  );
-}

client/src/common/components/buttons/PublicIconBtn.jsx

@@ -1,22 +1,26 @@
 import { IconButton } from '@chakra-ui/button';
 import { Tooltip } from '@chakra-ui/tooltip';
-import { FiUsers } from 'react-icons/fi';
+import { FiUsers } from '@react-icons/all-files/fi/FiUsers';
+import PropTypes from 'prop-types';
 
 export default function PublicIconBtn(props) {
-  const { actionHandler, active, ...rest } = props;
+  const { actionHandler, active, size = 'xs', ...rest } = props;
   return (
     <Tooltip label={active ? 'Make event private' : 'Make event public'}>
       <IconButton
-        size={props.size || 'xs'}
+        size={size}
         icon={<FiUsers />}
         colorScheme='blue'
         variant={active ? 'solid' : 'outline'}
-        onClick={() =>
-          actionHandler('update', { field: 'isPublic', value: !active })
-        }
-        _focus={{ boxShadow: 'none' }}
+        onClick={() => actionHandler('update', { field: 'isPublic', value: !active })}
         {...rest}
       />
     </Tooltip>
   );
 }
+
+PublicIconBtn.propTypes = {
+  actionHandler: PropTypes.func,
+  active: PropTypes.bool,
+  size: PropTypes.oneOf(['xs', 'sm', 'md', 'lg']),
+};

client/src/common/components/buttons/QuitIconBtn.jsx

@@ -1,3 +1,4 @@
+import { useCallback, useContext, useEffect, useRef, useState } from 'react';
 import { Button, IconButton } from '@chakra-ui/button';
 import {
   AlertDialog,
@@ -8,25 +9,37 @@ import {
   AlertDialogOverlay,
 } from '@chakra-ui/modal';
 import { Tooltip } from '@chakra-ui/tooltip';
-import { useRef, useState } from 'react';
-import { FiPower } from 'react-icons/fi';
+import { FiPower } from '@react-icons/all-files/fi/FiPower';
+import PropTypes from 'prop-types';
+
+import { LoggingContext } from '../../context/LoggingContext';
 
 export default function QuitIconBtn(props) {
-  const { clickhandler, ...rest } = props;
+  const { clickHandler, size = 'lg', ...rest } = props;
   const [isOpen, setIsOpen] = useState(false);
+  const { emitInfo } = useContext(LoggingContext);
   const onClose = () => setIsOpen(false);
   const cancelRef = useRef();
 
-  const handleShutdown = () => {
+  useEffect(() => {
+    if (window.process?.type === 'renderer') {
+      window.ipcRenderer.on('user-request-shutdown', () => {
+        emitInfo('Shutdown request')
+        setIsOpen(true);
+      });
+    }
+  }, [emitInfo]);
+
+  const handleShutdown = useCallback(() => {
     onClose();
-    clickhandler();
-  };
+    clickHandler();
+  }, [clickHandler]);
 
   return (
     <>
       <Tooltip label='Quit Application'>
         <IconButton
-          size={props.size || 'xs'}
+          size={size}
           icon={<FiPower />}
           colorScheme='red'
           variant='outline'
@@ -36,22 +49,15 @@ export default function QuitIconBtn(props) {
           {...rest}
         />
       </Tooltip>
-      <AlertDialog
-        isOpen={isOpen}
-        leastDestructiveRef={cancelRef}
-        onClose={onClose}
-      >
+      <AlertDialog isOpen={isOpen} leastDestructiveRef={cancelRef} onClose={onClose}>
         <AlertDialogOverlay>
           <AlertDialogContent>
             <AlertDialogHeader fontSize='lg' fontWeight='bold'>
               Server Shutdown
             </AlertDialogHeader>
-
             <AlertDialogBody>
-              This will shutdown the program and all running servers. Are you
-              sure?
+              This will shutdown the program and all running servers. Are you sure?
             </AlertDialogBody>
-
             <AlertDialogFooter>
               <Button ref={cancelRef} onClick={onClose}>
                 Cancel
@@ -66,3 +72,8 @@ export default function QuitIconBtn(props) {
     </>
   );
 }
+
+QuitIconBtn.propTypes = {
+  clickHandler: PropTypes.func,
+  size: PropTypes.oneOf(['xs', 'sm', 'md', 'lg']),
+};

client/src/common/components/buttons/ReloadIconBtn.jsx

@@ -1,18 +0,0 @@
-import { IconButton } from '@chakra-ui/button';
-import { FiRefreshCcw } from 'react-icons/fi';
-
-export default function ReloadIconButton(props) {
-  const { clickhandler, ...rest } = props;
-  return (
-    <IconButton
-      icon={<FiRefreshCcw />}
-      colorScheme='whiteAlpha'
-      backgroundColor='#ffffff05'
-      variant='outline'
-      onClick={clickhandler}
-      width={90}
-      _focus={{ boxShadow: 'none' }}
-      {...rest}
-    />
-  );
-}

client/src/common/components/buttons/RollIconBtn.jsx

@@ -1,17 +1,29 @@
 import { IconButton } from '@chakra-ui/button';
-import { FiClock } from 'react-icons/fi';
+import { Tooltip } from '@chakra-ui/tooltip';
+import { IoTimeOutline } from '@react-icons/all-files/io5/IoTimeOutline';
+import PropTypes from 'prop-types';
+
+import { tooltipDelayMid } from '../../../ontimeConfig';
 
 export default function RollIconBtn(props) {
-  const { clickhandler, active, ...rest } = props;
+  const { clickhandler, active, disabled, ...rest } = props;
   return (
-    <IconButton
-      icon={<FiClock />}
-      colorScheme='blue'
-      variant={active ? 'solid' : 'outline'}
-      onClick={clickhandler}
-      width={120}
-      _focus={{ boxShadow: 'none' }}
-      {...rest}
-    />
+    <Tooltip label='Roll mode' openDelay={tooltipDelayMid} shouldWrapChildren={disabled}>
+      <IconButton
+        icon={<IoTimeOutline size='24px' />}
+        colorScheme='blue'
+        variant={active ? 'solid' : 'outline'}
+        onClick={clickhandler}
+        width={120}
+        disabled={disabled}
+        {...rest}
+      />
+    </Tooltip>
   );
 }
+
+RollIconBtn.propTypes = {
+  clickhandler: PropTypes.func,
+  active: PropTypes.bool,
+  disabled: PropTypes.bool
+}

client/src/common/components/buttons/StartIconBtn.jsx

@@ -1,17 +1,29 @@
 import { IconButton } from '@chakra-ui/button';
-import { FiPlay } from 'react-icons/fi';
+import { Tooltip } from '@chakra-ui/tooltip';
+import { IoPlay } from '@react-icons/all-files/io5/IoPlay';
+import PropTypes from 'prop-types';
+
+import { tooltipDelayMid } from '../../../ontimeConfig';
 
 export default function StartIconBtn(props) {
-  const { clickhandler, active, ...rest } = props;
+  const { clickhandler, active, disabled, ...rest } = props;
   return (
-    <IconButton
-      icon={<FiPlay />}
-      colorScheme='green'
-      variant={active ? 'solid' : 'outline'}
-      onClick={clickhandler}
-      width={120}
-      _focus={{ boxShadow: 'none' }}
-      {...rest}
-    />
+    <Tooltip label='Start timer' openDelay={tooltipDelayMid} shouldWrapChildren={disabled}>
+      <IconButton
+        icon={<IoPlay size='24px' />}
+        colorScheme='green'
+        variant={active ? 'solid' : 'outline'}
+        onClick={clickhandler}
+        width={120}
+        disabled={disabled}
+        {...rest}
+      />
+    </Tooltip>
   );
 }
+
+StartIconBtn.propTypes = {
+  clickhandler: PropTypes.func,
+  active: PropTypes.bool,
+  disabled: PropTypes.bool
+}

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

@@ -0,0 +1,25 @@
+import { IconButton } from '@chakra-ui/button';
+import { IconButtonProps } from '@chakra-ui/react';
+import { Tooltip } from '@chakra-ui/tooltip';
+
+interface TooltipActionBtnProps extends IconButtonProps {
+  clickHandler: () => void;
+  tooltip: string;
+  openDelay?: number;
+}
+
+export default function TooltipActionBtn(props: TooltipActionBtnProps) {
+  const { clickHandler, icon, size = 'xs', tooltip, openDelay = 0, className, ...rest } = props;
+  return (
+    <Tooltip label={tooltip} openDelay={openDelay}>
+      <IconButton
+        {...rest}
+        aria-label={tooltip}
+        size={size}
+        icon={icon}
+        onClick={clickHandler}
+        className={className}
+      />
+    </Tooltip>
+  );
+}

client/src/common/components/buttons/TooltipLoadingActionBtn.jsx

@@ -0,0 +1,36 @@
+import { useCallback, useState } from 'react';
+import { IconButton } from '@chakra-ui/button';
+import { Tooltip } from '@chakra-ui/tooltip';
+import PropTypes from 'prop-types';
+
+export default function TooltipLoadingActionBtn(props) {
+  const { clickHandler, icon, color, size = 'xs', tooltip, ...rest } = props;
+  const [loading, setLoading] = useState(false);
+
+  const handleClick = useCallback(() => {
+    setLoading(true);
+    clickHandler();
+  },[clickHandler, setLoading]);
+
+  return (
+    <Tooltip label={tooltip} shouldWrapChildren={loading}>
+      <IconButton
+        aria-label={tooltip}
+        size={size}
+        icon={icon}
+        onClick={handleClick}
+        disabled={loading}
+        isLoading={loading}
+        {...rest}
+      />
+    </Tooltip>
+  );
+}
+
+TooltipLoadingActionBtn.propTypes = {
+  clickHandler: PropTypes.func,
+  icon: PropTypes.element,
+  color: PropTypes.string,
+  size: PropTypes.oneOf(['xs', 'sm', 'md', 'lg']),
+  tooltip: PropTypes.string,
+};

client/src/common/components/buttons/TransportIconBtn.jsx

@@ -0,0 +1,30 @@
+import { IconButton } from '@chakra-ui/button';
+import { Tooltip } from '@chakra-ui/tooltip';
+import PropTypes from 'prop-types';
+
+import { tooltipDelayMid } from '../../../ontimeConfig';
+
+export default function TransportIconBtn(props) {
+  const { clickHandler, icon, tooltip, disabled, ...rest } = props;
+  return (
+    <Tooltip label={tooltip} openDelay={tooltipDelayMid} shouldWrapChildren={disabled}>
+      <IconButton
+        icon={icon}
+        colorScheme='white'
+        variant='outline'
+        _hover={!disabled && { bg: '#ebedf0', color: '#333' }}
+        onClick={clickHandler}
+        width={90}
+        disabled={disabled}
+        {...rest}
+      />
+    </Tooltip>
+  );
+}
+
+TransportIconBtn.propTypes = {
+  clickHandler: PropTypes.func,
+  icon: PropTypes.element,
+  tooltip: PropTypes.string,
+  disabled: PropTypes.bool,
+};

client/src/common/components/buttons/TrashIconBtn.jsx

@@ -1,16 +0,0 @@
-import { IconButton } from '@chakra-ui/button';
-import { FiTrash2 } from 'react-icons/fi';
-
-export default function TrashIconBtn(props) {
-  const { clickhandler, ...rest } = props;
-  return (
-    <IconButton
-      size={props.size || 'xs'}
-      icon={<FiTrash2 />}
-      colorScheme='red'
-      onClick={clickhandler}
-      _focus={{ boxShadow: 'none' }}
-      {...rest}
-    />
-  );
-}

client/src/common/components/buttons/UnloadIconBtn.jsx

@@ -1,18 +1,28 @@
 import { IconButton } from '@chakra-ui/button';
-import { FiXOctagon } from 'react-icons/fi';
+import { Tooltip } from '@chakra-ui/tooltip';
+import { IoStop } from '@react-icons/all-files/io5/IoStop';
+import PropTypes from 'prop-types';
+
+import { tooltipDelayMid } from '../../../ontimeConfig';
 
 export default function UnloadIconBtn(props) {
-  const { clickhandler, ...rest } = props;
+  const { clickHandler, disabled, ...rest } = props;
   return (
-    <IconButton
-      icon={<FiXOctagon />}
-      colorScheme='red'
-      backgroundColor='#ff000022'
-      variant='outline'
-      onClick={clickhandler}
-      width={90}
-      _focus={{ boxShadow: 'none' }}
-      {...rest}
-    />
+    <Tooltip label='Unload event' openDelay={tooltipDelayMid} shouldWrapChildren={disabled}>
+      <IconButton
+        icon={<IoStop size='22px' />}
+        colorScheme='red'
+        variant='outline'
+        onClick={clickHandler}
+        width={90}
+        disabled={disabled}
+        {...rest}
+      />
+    </Tooltip>
   );
 }
+
+UnloadIconBtn.propTypes = {
+  clickHandler: PropTypes.func,
+  disabled: PropTypes.bool,
+};

client/src/common/components/buttons/VisibleIconBtn.jsx

@@ -1,19 +0,0 @@
-import { IconButton } from '@chakra-ui/button';
-import { FiSun } from 'react-icons/fi';
-
-export default function VisibleIconBtn(props) {
-  const { actionHandler, active, ...rest } = props;
-  return (
-    <IconButton
-      size={props.size || 'xs'}
-      icon={<FiSun />}
-      colorScheme='blue'
-      variant={active ? 'solid' : 'outline'}
-      onClick={() =>
-        actionHandler('update', { field: 'isPublic', value: !active })
-      }
-      _focus={{ boxShadow: 'none' }}
-      {...rest}
-    />
-  );
-}

client/src/common/components/collapseBar/CollapseBar.jsx

@@ -0,0 +1,26 @@
+import { Icon } from '@chakra-ui/react';
+import { FiChevronUp } from '@react-icons/all-files/fi/FiChevronUp';
+import PropTypes from 'prop-types';
+
+import style from './CollapseBar.module.scss';
+
+export default function CollapseBar(props) {
+  const { title = 'Collapse bar', isCollapsed, onClick, roll } = props;
+
+  return (
+    <div className={roll ? style.headerRoll : style.header}>
+      {title}
+      <Icon
+        className={isCollapsed ? style.moreCollapsed : style.moreExpanded}
+        as={FiChevronUp}
+        onClick={onClick}
+      />
+    </div>
+  );
+}
+CollapseBar.propTypes = {
+  title: PropTypes.string,
+  isCollapsed: PropTypes.bool,
+  onClick: PropTypes.func,
+  roll: PropTypes.bool,
+};

client/src/common/components/collapseBar/CollapseBar.module.scss

@@ -0,0 +1,34 @@
+@use '../../../theme/main' as *;
+
+.header,
+.headerRoll {
+  padding: 0;
+  margin: 0;
+  font-size: 0.9em;
+  display: flex;
+  justify-content: space-between;
+}
+
+.header {
+  color: $header-gray;
+}
+
+.headerRoll {
+  color: $ontime-roll;
+}
+
+.moreExpanded,
+.moreCollapsed {
+  cursor: pointer;
+  color: $text-white;
+}
+
+.moreExpanded {
+  transform: scaleY(-1);
+  transition: transform 0.3s;
+}
+
+.moreCollapsed {
+  transform: scaleY(1);
+  transition: transform 0.3s;
+}

client/src/common/components/countdown/Countdown.jsx

@@ -1,24 +0,0 @@
-import { memo } from 'react';
-import { formatDisplay } from 'common/utils/dateConfig';
-import styles from './Countdown.module.css';
-
-const Countdown = ({ time, small, negative, hideZeroHours }) => {
-  // prepare display string
-  const display =
-    time != null && !isNaN(time)
-      ? formatDisplay(time, hideZeroHours)
-      : '-- : -- : --';
-
-  const colour = negative ? '#ff7597' : '#fffffa';
-
-  return (
-    <div
-      className={small ? styles.countdownClockSmall : styles.countdownClock}
-      style={{ color: colour }}
-    >
-      {display}
-    </div>
-  );
-};
-
-export default memo(Countdown);

client/src/common/components/countdown/Countdown.module.css

@@ -1,25 +0,0 @@
-/* @import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;400;600;800&display=swap'); */
-
-/* Common */
-.countdownClock,
-.countdownClockSmall {
-  font-family: 'Open Sans', sans-serif;
-  line-height: 0.9;
-}
-
-/* Viewers */
-.countdownClock {
-  font-size: 21vw;
-  line-height: 21vw;
-  text-align: center;
-  letter-spacing: 1vw;
-}
-
-/* Editor */
-.countdownClockSmall {
-  font-size: 4em;
-  text-align: center;
-  letter-spacing: 0.1em;
-  font-weight: 600;
-  color: #fffffa;
-}

client/src/common/components/countdown/TimerDisplay.jsx

@@ -0,0 +1,26 @@
+import { memo } from 'react';
+import { formatDisplay } from 'common/utils/dateConfig';
+import PropTypes from 'prop-types';
+
+import './TimerDisplay.scss';
+
+const TimerDisplay = ({ time, small, isNegative, hideZeroHours }) => {
+
+  const display =
+    (time === null || typeof time === 'undefined' || isNaN(time))
+      ? '-- : -- : --'
+      : formatDisplay(time, hideZeroHours);
+
+  const classes = `timer ${small ? 'timer--small' : ''}  ${isNegative ? 'timer--finished' : ''}`;
+
+  return <div className={classes}>{display}</div>;
+};
+
+export default memo(TimerDisplay);
+
+TimerDisplay.propTypes = {
+  time: PropTypes.number,
+  small: PropTypes.bool,
+  isNegative: PropTypes.bool,
+  hideZeroHours: PropTypes.bool,
+};

client/src/common/components/countdown/TimerDisplay.scss

@@ -0,0 +1,22 @@
+@use '../../../theme/viewerDefs' as *;
+
+.timer {
+  font-family: 'Open Sans', sans-serif;
+  color: var(--timer-color-override, $viewer-color);
+  font-size: 21vw;
+  line-height: 21vw;
+  text-align: center;
+  letter-spacing: 1vw;
+
+  &--small {
+    font-size: 4em;
+    line-height: 0.9;
+    text-align: center;
+    letter-spacing: 0.1em;
+    font-weight: 600;
+  }
+
+  &--finished {
+    color: $timer-finished-color;
+  }
+}

client/src/common/components/errorBoundary/ErrorBoundary.jsx

@@ -1,6 +1,15 @@
+/* eslint-disable react/destructuring-assignment */
 import React from 'react';
 
+import { version as appVersion } from '../../../../package.json';
+import { LoggingContext } from '../../context/LoggingContext';
+
+import style from './ErrorBoundary.module.scss';
+
 class ErrorBoundary extends React.Component {
+  static contextType = LoggingContext;
+  reportContent = '';
+
   constructor(props) {
     super(props);
     this.state = { error: null, errorInfo: null };
@@ -16,17 +25,47 @@ class ErrorBoundary extends React.Component {
       error: error,
       errorInfo: info,
     });
-    // TODO: Log the error to an error reporting service
-    this.logErrorToServices(error.toString(), info.componentStack);
+    try {
+      this.context.emitError(error.toString());
+    } catch (e) {
+      console.log('Unable to emit error', error, e )
+    }
+    this.reportContent = `${error} ${info.componentStack}`;
   }
 
-  // A fake logging service.
-  logErrorToServices = console.log;
-
   render() {
     if (this.state.errorMessage) {
-      // You can render any custom fallback UI
-      return <p>:/</p>;
+      return (
+        <div className={style.errorContainer} data-testid="error-container">
+          <div>
+            <p className={style.error}>:/</p>
+            <p>Something went wrong</p>
+            <p
+              className={style.report}
+              onClick={() => {
+                if (navigator.clipboard) {
+                  const copyContent = `ontime version ${appVersion} \n ${this.reportContent}`;
+                  navigator.clipboard.writeText(copyContent);
+                }
+              }}
+            >
+              Copy error
+            </p>
+            <p
+              className={style.report}
+              onClick={() => {
+                if (window.process.type === 'renderer') {
+                  window.ipcRenderer.send('reload');
+                } else {
+                  window.location.reload();
+                }
+              }}
+            >
+              Reload interface
+            </p>
+          </div>
+        </div>
+      );
     }
     return this.props.children;
   }

client/src/common/components/errorBoundary/ErrorBoundary.module.scss

@@ -0,0 +1,28 @@
+@use '../../../theme/main' as *;
+
+.errorContainer {
+  width: 100%;
+  height: 100%;
+  display: grid;
+  place-content: center;
+  background-color: #121212;
+  color: white;
+
+  .error {
+    color: $ontime-pink;
+    font-weight: 600;
+  }
+
+  .report {
+    text-decoration: underline  $ontime-pink;
+    cursor: pointer;
+  }
+
+  .report:hover {
+    color: $ontime-pink;
+  }
+
+  .report:active {
+    color: white;
+  }
+}

client/src/common/components/eventTimes/EventTimes.jsx

@@ -1,25 +1,43 @@
-import EditableTimer from 'common/input/EditableTimer';
-import { showWarningToast } from 'common/helpers/toastManager';
+import { useCallback, useContext } from 'react';
+import EditableTimer from 'common/components/input/EditableTimer';
+import PropTypes from 'prop-types';
+
+import { LoggingContext } from '../../context/LoggingContext';
+import { validateTimes } from '../../utils/entryValidator';
 
 export default function EventTimes(props) {
-  const { actionHandler, delay, timeStart, timeEnd } = props;
+  const { actionHandler, delay, timeStart, timeEnd, previousEnd } = props;
+  const { emitWarning } = useContext(LoggingContext);
 
-  const handleValidate = (entry, v) => {
-    // we dont inforce validation here
+  /**
+   * This code is duplicated from EventTimesVertical
+   * @description Validates a time input against its pair
+   * @param {string} entry - field to validate: timeStart, timeEnd, durationOverride
+   * @param {number} val - field value
+   * @return {boolean}
+   */
+  const handleValidate = useCallback(
+    () => (entry, val) => {
+      if (val == null || timeStart == null || timeEnd == null) return true;
+      if (timeStart === 0) return true;
 
-    if (v == null || timeStart == null || timeEnd == null) return true;
-    if (timeStart === 0) return true;
+      let start = timeStart;
+      let end = timeEnd;
+      if (entry === 'timeStart') {
+        start = val;
+      } else if (entry === 'timeEnd') {
+        end = val;
+      } else return entry === 'durationOverride';
 
-    let validate = { value: true, catch: '' };
-    if (entry === 'timeStart' && v > timeEnd)
-      validate.catch = 'Start time later than end time';
-    else if (entry === 'timeEnd' && v < timeStart)
-      validate.catch = 'End time earlier than start time';
-
-    if (validate.catch !== '')
-      showWarningToast('Time Input Warning', validate.catch);
-    return validate.value;
-  };
+      const valid = validateTimes(start, end);
+      // give warning but not enforce validation
+      if (!valid.value) {
+        emitWarning(`Time Input Warning: ${valid.catch}`);
+      }
+      return valid.value;
+    },
+    [emitWarning, timeEnd, timeStart]
+  );
 
   return (
     <>
@@ -29,6 +47,7 @@ export default function EventTimes(props) {
         actionHandler={actionHandler}
         time={timeStart}
         delay={delay}
+        previousEnd={previousEnd}
       />
       <EditableTimer
         name='timeEnd'
@@ -36,7 +55,16 @@ export default function EventTimes(props) {
         actionHandler={actionHandler}
         time={timeEnd}
         delay={delay}
+        previousEnd={previousEnd}
       />
     </>
   );
 }
+
+EventTimes.propTypes = {
+  actionHandler: PropTypes.func.isRequired,
+  delay: PropTypes.number,
+  timeStart: PropTypes.number,
+  timeEnd: PropTypes.number,
+  previousEnd: PropTypes.number,
+};

client/src/common/components/eventTimes/EventTimesVertical.jsx

@@ -1,121 +1,73 @@
-import EditableTimer from 'common/input/EditableTimer';
-import { showWarningToast } from 'common/helpers/toastManager';
-import { stringFromMillis } from 'common/utils/dateConfig';
+import { useCallback, useContext } from 'react';
+import PropTypes from 'prop-types';
 
-const label = {
-  fontSize: '0.75em',
-  color: '#aaa',
-};
+import { LoggingContext } from '../../context/LoggingContext';
+import { validateTimes } from '../../utils/entryValidator';
 
-const TimesDelayed = (props) => {
-  const { handleValidate, actionHandler, delay, timeStart, timeEnd, duration } =
-    props;
-
-  const scheduledStart = stringFromMillis(timeStart, false);
-  const scheduledEnd = stringFromMillis(timeEnd, false);
-
-  return (
-    <>
-      <span style={label}>
-        Start <span>{scheduledStart}</span>
-      </span>
-      <EditableTimer
-        name='timeStart'
-        validate={handleValidate}
-        actionHandler={actionHandler}
-        time={timeStart}
-        delay={delay}
-      />
-      <span style={label}>
-        End <span>{scheduledEnd}</span>
-      </span>
-      <EditableTimer
-        name='timeEnd'
-        validate={handleValidate}
-        actionHandler={actionHandler}
-        time={timeEnd}
-        delay={delay}
-      />
-      <span style={label}>Duration</span>
-      <EditableTimer
-        name='durationOverride'
-        validate={handleValidate}
-        actionHandler={actionHandler}
-        time={duration}
-        delay={0}
-      />
-    </>
-  );
-};
-
-const Times = (props) => {
-  const { handleValidate, actionHandler, timeStart, timeEnd, duration } = props;
-
-  return (
-    <>
-      <span style={label}>Start</span>
-      <EditableTimer
-        name='timeStart'
-        validate={handleValidate}
-        actionHandler={actionHandler}
-        time={timeStart}
-        delay={0}
-      />
-      <span style={label}>End</span>
-      <EditableTimer
-        name='timeEnd'
-        validate={handleValidate}
-        actionHandler={actionHandler}
-        time={timeEnd}
-        delay={0}
-      />
-      <span style={label}>Duration</span>
-      <EditableTimer
-        name='durationOverride'
-        validate={handleValidate}
-        actionHandler={actionHandler}
-        time={duration}
-        delay={0}
-      />
-    </>
-  );
-};
+import Times from './Times';
+import TimesDelayed from './TimesDelayed';
 
 export default function EventTimesVertical(props) {
-  const { delay, timeStart, timeEnd, duration } = props;
-  const handleValidate = (entry, v) => {
-    // we dont enforce validation here
+  const { delay, timeStart, timeEnd, duration, previousEnd, actionHandler } = props;
+  const { emitWarning } = useContext(LoggingContext);
 
-    if (v == null || timeStart == null || timeEnd == null) return true;
-    if (timeStart === 0) return true;
+  /**
+   * This code is duplicated from EventTimes
+   * @description Validates a time input against its pair
+   * @param {string} entry - field to validate: timeStart, timeEnd, durationOverride
+   * @param {number} val - field value
+   * @return {boolean}
+   */
+  const handleValidate = useCallback(
+    () => (entry, val) => {
+      if (val == null || timeStart == null || timeEnd == null) return true;
+      if (timeStart === 0) return true;
 
-    let validate = { value: true, catch: '' };
-    if (entry === 'timeStart' && v > timeEnd)
-      validate.catch = 'Start time later than end time';
-    else if (entry === 'timeEnd' && v < timeStart)
-      validate.catch = 'End time earlier than start time';
+      let start = timeStart;
+      let end = timeEnd;
+      if (entry === 'timeStart') {
+        start = val;
+      } else if (entry === 'timeEnd') {
+        end = val;
+      } else return entry === 'durationOverride';
 
-    if (validate.catch !== '')
-      showWarningToast('Time Input Warning', validate.catch);
-    return validate.value;
-  };
+      const valid = validateTimes(start, end);
+      // give warning but not enforce validation
+      if (!valid.value) {
+        emitWarning(`Time Input Warning: ${valid.catch}`);
+      }
+      return valid.value;
+    },
+    [emitWarning, timeEnd, timeStart]
+  );
 
-  return (delay != null) & (delay > 0) ? (
+  return delay != null && delay !== 0 ? (
     <TimesDelayed
       handleValidate={handleValidate}
-      actionHandler={props.actionHandler}
+      actionHandler={actionHandler}
       delay={delay}
       timeStart={timeStart}
       timeEnd={timeEnd}
       duration={duration}
+      previousEnd={previousEnd}
     />
   ) : (
     <Times
       handleValidate={handleValidate}
-      actionHandler={props.actionHandler}
+      actionHandler={actionHandler}
       timeStart={timeStart}
       timeEnd={timeEnd}
       duration={duration}
+      previousEnd={previousEnd}
     />
   );
 }
+
+EventTimesVertical.propTypes = {
+  delay: PropTypes.number,
+  timeStart: PropTypes.number,
+  timeEnd: PropTypes.number,
+  duration: PropTypes.number,
+  previousEnd: PropTypes.number,
+  actionHandler: PropTypes.func.isRequired,
+};

client/src/common/components/eventTimes/Times.jsx

@@ -0,0 +1,50 @@
+import PropTypes from 'prop-types';
+
+import EditableTimer from '../input/EditableTimer';
+
+import style from './Times.module.scss';
+
+export default function Times(props) {
+  const { handleValidate, actionHandler, timeStart, timeEnd, duration, previousEnd } = props;
+
+  return (
+    <>
+      <span className={style.label}>Start</span>
+      <EditableTimer
+        name='timeStart'
+        validate={handleValidate}
+        actionHandler={actionHandler}
+        time={timeStart}
+        delay={0}
+        previousEnd={previousEnd}
+      />
+      <span className={style.label}>End</span>
+      <EditableTimer
+        name='timeEnd'
+        validate={handleValidate}
+        actionHandler={actionHandler}
+        time={timeEnd}
+        delay={0}
+        previousEnd={previousEnd}
+      />
+      <span className={style.label}>Duration</span>
+      <EditableTimer
+        name='durationOverride'
+        validate={handleValidate}
+        actionHandler={actionHandler}
+        time={duration}
+        delay={0}
+        previousEnd={previousEnd}
+      />
+    </>
+  );
+}
+
+Times.propTypes = {
+  handleValidate: PropTypes.func.isRequired,
+  actionHandler: PropTypes.func.isRequired,
+  timeStart: PropTypes.number,
+  timeEnd: PropTypes.number,
+  duration: PropTypes.number,
+  previousEnd: PropTypes.number,
+};

client/src/common/components/eventTimes/Times.module.scss

@@ -0,0 +1,6 @@
+@use '../../../theme/main' as *;
+
+.label {
+  font-size: 0.75em;
+  color: $label-gray;
+}

client/src/common/components/eventTimes/TimesDelayed.jsx

@@ -0,0 +1,59 @@
+import PropTypes from 'prop-types';
+
+import { stringFromMillis } from '../../utils/time';
+import EditableTimer from '../input/EditableTimer';
+
+import style from './Times.module.scss';
+
+export default function TimesDelayed(props) {
+  const { handleValidate, actionHandler, delay, timeStart, timeEnd, duration, previousEnd } = props;
+
+  const scheduledStart = stringFromMillis(timeStart, false);
+  const scheduledEnd = stringFromMillis(timeEnd, false);
+
+  return (
+    <>
+      <span className={style.label}>
+        Start <span>{scheduledStart}</span>
+      </span>
+      <EditableTimer
+        name='timeStart'
+        validate={handleValidate}
+        actionHandler={actionHandler}
+        time={timeStart}
+        delay={delay}
+        previousEnd={previousEnd}
+      />
+      <span className={style.label}>
+        End <span>{scheduledEnd}</span>
+      </span>
+      <EditableTimer
+        name='timeEnd'
+        validate={handleValidate}
+        actionHandler={actionHandler}
+        time={timeEnd}
+        delay={delay}
+        previousEnd={previousEnd}
+      />
+      <span className={style.label}>Duration</span>
+      <EditableTimer
+        name='durationOverride'
+        validate={handleValidate}
+        actionHandler={actionHandler}
+        time={duration}
+        delay={0}
+        previousEnd={previousEnd}
+      />
+    </>
+  );
+}
+
+TimesDelayed.propTypes = {
+  handleValidate: PropTypes.func.isRequired,
+  actionHandler: PropTypes.func.isRequired,
+  delay: PropTypes.number,
+  timeStart: PropTypes.number,
+  timeEnd: PropTypes.number,
+  duration: PropTypes.number,
+  previousEnd: PropTypes.number,
+};

client/src/common/components/input/AutoTextArea.jsx

@@ -0,0 +1,27 @@
+import { useEffect, useRef } from 'react';
+import { Textarea } from '@chakra-ui/react';
+import autosize from 'autosize/dist/autosize';
+
+export const AutoTextArea = (props) => {
+  const ref = useRef();
+
+  useEffect(() => {
+    const node = ref.current;
+    autosize(ref.current);
+    return () => {
+      autosize.destroy(node);
+    };
+  }, []);
+
+
+  return (
+    <Textarea
+      overflow='hidden'
+      w='100%'
+      resize='none'
+      ref={ref}
+      transition='height none'
+      {...props}
+    />
+  );
+};

client/src/common/components/input/DelayInput.jsx

@@ -0,0 +1,62 @@
+import { useCallback, useEffect, useState } from 'react';
+import { Editable, EditableInput, EditablePreview } from '@chakra-ui/react';
+import PropTypes from 'prop-types';
+
+import { clamp } from '../../utils/math';
+
+import style from './TimeInput.module.css';
+
+const inputProps = {
+  width: 20,
+  fontWeight: 400,
+  backgroundColor: 'rgba(0,0,0,0.05)',
+  color: '#fff',
+  border: '1px solid #ecc94b55',
+  borderRadius: '8px',
+  placeholder: '-',
+  textAlign: 'center',
+};
+
+export default function DelayInput(props) {
+  const { actionHandler, value } = props;
+  const [_value, setValue] = useState(value);
+
+  useEffect(() => {
+    if (value == null) return;
+    setValue(value);
+  }, [value]);
+
+  const handleSubmit = useCallback(
+    (newValue) => {
+      if (newValue === value) return;
+      if (newValue === '') setValue(0);
+
+      // convert to ms and updates
+      const msVal = clamp(newValue, -60, 60) * 60000;
+      actionHandler('update', { field: 'duration', value: msVal });
+    },
+    [actionHandler, value]
+  );
+
+  const labelText = `minutes ${value >= 0 ? 'delayed' : 'ahead'}`;
+
+  return (
+    <div className={style.timeInput}>
+      <Editable
+        {...inputProps}
+        value={_value}
+        onChange={(v) => setValue(v)}
+        onSubmit={(v) => handleSubmit(v)}
+      >
+        <EditablePreview />
+        <EditableInput type='number' min='-60' max='60' />
+      </Editable>
+      <span className={style.label}>{labelText}</span>
+    </div>
+  );
+}
+
+DelayInput.propTypes = {
+  actionHandler: PropTypes.func,
+  value: PropTypes.number,
+};

client/src/common/components/input/EditableText.jsx

@@ -0,0 +1,56 @@
+import { useCallback, useEffect, useState } from 'react';
+import { Editable, EditableInput, EditablePreview } from '@chakra-ui/editable';
+import PropTypes from 'prop-types';
+
+import style from './EditableText.module.scss';
+
+export default function EditableText(props) {
+  const { label, defaultValue, placeholder, submitHandler, maxchar = 40, ...rest } = props;
+  const [text, setText] = useState(defaultValue || '');
+
+  useEffect(() => {
+    if (defaultValue == null) setText('');
+    else setText(defaultValue);
+  }, [defaultValue]);
+
+  const handleSubmit = useCallback((submittedVal) => {
+    // No need to update if it hasnt changed
+    if (submittedVal === defaultValue) return;
+    // submit a cleaned up version of the string
+    const cleanVal = submittedVal.trim();
+    submitHandler(cleanVal);
+
+    if (cleanVal !== submittedVal) {
+      setText(cleanVal);
+    }
+  },[defaultValue, submitHandler]);
+
+  const handleChange = useCallback((val) => {
+    if (val.length < maxchar) setText(val);
+  },[maxchar]);
+
+  return (
+    <div className={style.block}>
+      <span className={style.title}>{label}</span>
+      <Editable
+        onChange={(v) => handleChange(v)}
+        onSubmit={(v) => handleSubmit(v)}
+        value={text}
+        placeholder={placeholder}
+        className={style.inline}
+        {...rest}
+      >
+        <EditablePreview className={text === '' ? style.preview : ''} />
+        <EditableInput />
+      </Editable>
+    </div>
+  );
+}
+
+EditableText.propTypes = {
+  label: PropTypes.string,
+  defaultValue: PropTypes.string,
+  placeholder: PropTypes.string,
+  submitHandler: PropTypes.func.isRequired,
+  maxchar: PropTypes.number,
+};

client/src/common/components/input/EditableText.module.scss

@@ -0,0 +1,28 @@
+@use '../../../theme/main' as *;
+
+.block {
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+  width: 100%;
+
+  .title {
+    padding-left: 1em;
+    font-size: 0.75em;
+    color: $label-gray;
+    display: inline-block;
+    min-width: 6em;
+  }
+
+  .preview {
+    color: $bg-gray-500;
+  }
+
+  .inline {
+    display: inline;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    flex: 1;
+  }
+}

client/src/common/components/input/EditableTimer.jsx

@@ -0,0 +1,97 @@
+import { useCallback, useContext, useEffect, useState } from 'react';
+import { Editable, EditableInput, EditablePreview } from '@chakra-ui/editable';
+import PropTypes from 'prop-types';
+
+import { LoggingContext } from '../../context/LoggingContext';
+import { forgivingStringToMillis } from '../../utils/dateConfig';
+import { stringFromMillis } from '../../utils/time';
+
+import style from './EditableTimer.module.scss';
+
+export default function EditableTimer(props) {
+  const { name, actionHandler, time = 0, delay, validate, previousEnd } = props;
+  const { emitError } = useContext(LoggingContext);
+  const [value, setValue] = useState('');
+
+
+  const handleSubmit = useCallback((value) => {
+    // Check if there is anything there
+    if (value === '') return false;
+
+    let newValMillis = 0;
+
+    // check for known aliases
+    if (value === 'p' || value === 'prev' || value === 'previous') {
+      // string to pass should be the time of the end before
+      if (previousEnd != null) {
+        newValMillis = previousEnd;
+      }
+    } else if (value.startsWith('+') || value.startsWith('p+') || value.startsWith('p +')) {
+      // string to pass should add to the end before
+      const val = value.substring(1);
+      newValMillis = previousEnd + forgivingStringToMillis(val);
+    } else {
+      // convert entered value to milliseconds
+      newValMillis = forgivingStringToMillis(value);
+    }
+
+    // Time now and time submittedVal
+    const originalMillis = time + delay;
+
+    // check if time is different from before
+    if (newValMillis === originalMillis) return false;
+
+    // validate with parent
+    if (!validate(name, newValMillis)) return false;
+
+    // update entry
+    actionHandler('update', { field: name, value: newValMillis });
+
+    return true;
+  },[actionHandler, delay, name, previousEnd, time, validate]);
+
+  // prepare time fields
+  const validateValue = useCallback((value) => {
+    const success = handleSubmit(value);
+    if (success) {
+      const ms = forgivingStringToMillis(value);
+      setValue(stringFromMillis(ms + delay));
+    } else {
+      setValue(stringFromMillis(time + delay));
+    }
+  },[delay, handleSubmit, time]);
+
+  useEffect(() => {
+    if (time == null) return;
+    try {
+      setValue(stringFromMillis(time + delay));
+    } catch (error) {
+      emitError(`Unable to parse date: ${error.text}`);
+    }
+  }, [time, delay, emitError]);
+
+  const isDelayed = delay != null && delay !== 0;
+
+  return (
+    <Editable
+      data-testid='editable-timer'
+      onChange={(v) => setValue(v)}
+      onSubmit={(v) => validateValue(v)}
+      onCancel={() => setValue(stringFromMillis(time + delay, true))}
+      value={value}
+      className={isDelayed ? style.delayedEditable : style.editable}
+    >
+      <EditablePreview />
+      <EditableInput type='text' placeholder='--:--:--' data-testid='editable-timer-input' />
+    </Editable>
+  );
+}
+
+EditableTimer.propTypes = {
+  name: PropTypes.string.isRequired,
+  actionHandler: PropTypes.func.isRequired,
+  time: PropTypes.number,
+  delay: PropTypes.number,
+  validate: PropTypes.func.isRequired,
+  previousEnd: PropTypes.number,
+};

client/src/common/components/input/EditableTimer.module.scss

@@ -0,0 +1,17 @@
+@use '../../../theme/main'as *;
+
+.editable,
+.delayedEditable {
+  background-color: $input-bg;
+  border: $input-border;
+  width: 6.5em;
+  letter-spacing: 1px;
+  height: fit-content;
+
+  text-align: center;
+  border-radius: 8px;
+}
+
+.delayedEditable {
+  border: $input-delayed-border;
+}

client/src/common/components/myProgressBar/MyProgressBar.jsx

@@ -1,5 +1,7 @@
-import { clamp } from 'app/utils';
-import styles from './MyProgressBar.module.css';
+import { clamp } from 'common/utils/math';
+import PropTypes from 'prop-types';
+
+import styles from './MyProgressBar.module.scss';
 
 export default function MyProgressBar(props) {
   const { now, complete, showElapsed } = props;
@@ -21,3 +23,9 @@ export default function MyProgressBar(props) {
     </div>
   );
 }
+
+MyProgressBar.propTypes = {
+  now: PropTypes.number,
+  complete: PropTypes.number,
+  showElapsed: PropTypes.bool,
+}

client/src/common/components/myProgressBar/MyProgressBar.module.scss

@@ -1,22 +1,23 @@
+@use '../../../theme/main' as *;
+
 .progress,
 .progressCountdown {
   height: 2vh;
-  background-color: rgba(255, 255, 255, 0.13);
   border-radius: 4px;
 }
 
 .progress {
-  background-color: rgba(255, 255, 255, 0.13);
+  background-color: $bg-gray-900;
 }
 
 .progressCountdown {
-  background-color: #ff7597;
+  background-color: $ontime-pink;
 }
 
 .progressBar {
   width: 100%;
   height: 2vh;
-  background-color: rgb(255, 255, 255);
+  background-color: $title-white;
   border-radius: 4px;
   transition: 1s linear;
   transition-property: width;