style: wording and UI tweaks (#564)

* style: wording and UI tweaks

* style: prevent note overflow

* style: small wording changes

* soft blink (#569)

* chore: version bump


---------

Co-authored-by: Alex Christoffer Rasmussen <alex.christoffer@gmail.com>

apps/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ontime-ui",
-  "version": "2.9.0",
+  "version": "2.13.1",
   "private": true,
   "dependencies": {
     "@chakra-ui/react": "^2.7.0",

apps/client/src/features/cuesheet/CuesheetWrapper.tsx

@@ -141,11 +141,7 @@ export default function CuesheetWrapper() {
     <div className={styles.tableWrapper} data-testid='cuesheet'>
       <CuesheetTableHeader handleExport={handleOpenModal} featureData={featureData} />
       <Cuesheet data={rundown} columns={columns} handleUpdate={handleUpdate} selectedId={featureData.selectedEventId} />
-      <ExportModal
+      <ExportModal isOpen={isModalOpen} onClose={onModalClose} />
-        isOpen={isModalOpen}
-        onClose={onModalClose}
-        buttonVariants={{ csv: 'ontime-filled', json: 'ontime-ghosted' }}
-      />
     </div>
   );
 }

apps/client/src/features/menu/MenuBar.tsx

@@ -151,11 +151,7 @@ const MenuBar = (props: MenuBarProps) => {
         size='sm'
       />
 
-      <ExportModal
+      <ExportModal onClose={onModalClose} isOpen={isModalOpen} />
-        onClose={onModalClose}
-        isOpen={isModalOpen}
-        buttonVariants={{ csv: 'ontime-subtle-on-light', json: 'ontime-filled' }}
-      />
 
       <div className={style.gap} />
       <TooltipActionBtn

apps/client/src/features/modals/export-modal/ExportModal.tsx

@@ -3,17 +3,14 @@ import { Button, Modal, ModalBody, ModalCloseButton, ModalContent, ModalHeader,
 import styles from './ExportModal.module.scss';
 
 export type ExportType = 'csv' | 'json';
+
 interface ExportModalProps {
   isOpen: boolean;
   onClose: (type?: ExportType) => void;
-  buttonVariants: {
-    csv: string;
-    json: string;
-  };
 }
 
 export default function ExportModal(props: ExportModalProps) {
-  const { isOpen, onClose, buttonVariants } = props;
+  const { isOpen, onClose } = props;
 
   return (
     <Modal isOpen={isOpen} onClose={onClose} motionPreset='scale' size='xl' colorScheme='blackAlpha'>
@@ -22,10 +19,10 @@ export default function ExportModal(props: ExportModalProps) {
         <ModalHeader className={styles.modalHeader}>Download options</ModalHeader>
         <ModalCloseButton />
         <ModalBody className={styles.modalBody}>
-          <Button onClick={() => onClose('csv')} variant={buttonVariants.csv} width='48%'>
+          <Button onClick={() => onClose('csv')} variant='ontime-subtle-on-light' width='48%'>
-            rundown as CSV
+            Rundown as CSV
           </Button>
-          <Button onClick={() => onClose('json')} variant={buttonVariants.json} width='48%'>
+          <Button onClick={() => onClose('json')} variant='ontime-filled' width='48%'>
             Project file
           </Button>
         </ModalBody>

apps/client/src/features/rundown/event-block/EventBlock.module.scss

@@ -175,6 +175,9 @@ $skip-opacity: 0.1;
   font-size: calc(1rem - 3px);
   color: $block-text-color;
   line-height: calc(1rem - 3px);
+
+  max-height: 2rem;
+  overflow-y: hidden;
 }
 
 

apps/client/src/features/viewers/backstage/Backstage.scss

@@ -89,7 +89,10 @@
     border-radius: 8px;
 
     &.blink {
-      animation: blink 0.5s ease-in-out 3;
+      animation-name: blink;
+      animation-timing-function: ease-in-out;
+      animation-iteration-count: 3;
+      animation-duration: 1s;
     }
   }
 
@@ -163,9 +166,12 @@
 
 @keyframes blink {
   0% {
-    background-color: var(--card-background-color-blink-override, $playback-start);
-  }
-  20% {
     background-color: var(--card-background-color-override, $viewer-card-bg-color);
   }
-}
+  50% {
+    background-color: var(--card-background-color-blink-override, $playback-start);
+  }
+  100% {
+    background-color: var(--card-background-color-override, $viewer-card-bg-color);
+  }
+}

apps/electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ontime",
-  "version": "2.9.0",
+  "version": "2.13.1",
   "author": "Carlos Valente",
   "description": "Time keeping for live events",
   "repository": "https://github.com/cpvalente/ontime",

apps/server/package.json

@@ -2,7 +2,7 @@
   "name": "ontime-server",
   "type": "module",
   "main": "src/index.ts",
-  "version": "2.9.0",
+  "version": "2.13.1",
   "exports": "./src/index.js",
   "dependencies": {
     "body-parser": "^1.20.0",

apps/server/src/controllers/integrationController.ts

@@ -1,4 +1,4 @@
-import { LogOrigin, OntimeEvent } from 'ontime-types';
+import { OntimeEvent } from 'ontime-types';
 
 import { messageService } from '../services/message-service/MessageService.js';
 import { PlaybackService } from '../services/PlaybackService.js';
@@ -256,10 +256,10 @@ export function dispatchFromAdapter(
     // ontime/change/{eventID}/{propertyName}
     case 'change': {
       if (params.length < 2) {
-        throw new Error(`To few parameters`);
+        throw new Error('Too few parameters, 3 expected');
       }
       if (payload === undefined) {
-        throw new Error(`Undefined payload`);
+        throw new Error('No payload found');
       }
       const eventID = params[0];
       const propertyName = params[1] as keyof OntimeEvent;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ontime",
-  "version": "2.9.0",
+  "version": "2.13.1",
   "description": "Time keeping for live events",
   "keywords": [
     "lighdev",