Merge branch 'dev'

dlamon1 · Jun 20, 2022 · 0a96fe7 · 0a96fe7
2 parents dcc403b + 626f7e4
commit 0a96fe7
Show file tree

Hide file tree

Showing 11 changed files with 743 additions and 344 deletions.
diff --git a/.erb/dll/renderer.dev.dll.js b/.erb/dll/renderer.dev.dll.js
diff --git a/build/app/package.json b/build/app/package.json
@@ -1 +1,19 @@
-{"name":"clockotron","productName":"Clockotron","version":"1.0.1","description":"Clockotron talks time directly to vMix text inputs","main":"./dist/main/main.js","author":{"name":"LEAD LED, LLC","email":"[email protected]","url":"https://leadled.io"},"scripts":{"electron-rebuild":"node -r ../../.erb/scripts/babel-register.js ../../.erb/scripts/electron-rebuild.js","link-modules":"node -r ../../.erb/scripts/babel-register.js ../../.erb/scripts/link-modules.js","postinstall":"yarn electron-rebuild && yarn link-modules"},"license":"MIT","dependencies":{}}
+{
+  "name": "clockotron",
+  "productName": "Clockotron",
+  "version": "1.0.2",
+  "description": "Clockotron talks time directly to vMix text inputs",
+  "main": "./dist/main/main.js",
+  "author": {
+    "name": "LEAD LED, LLC",
+    "email": "[email protected]",
+    "url": "https://leadled.io"
+  },
+  "scripts": {
+    "electron-rebuild": "node -r ../../.erb/scripts/babel-register.js ../../.erb/scripts/electron-rebuild.js",
+    "link-modules": "node -r ../../.erb/scripts/babel-register.js ../../.erb/scripts/link-modules.js",
+    "postinstall": "yarn electron-rebuild && yarn link-modules"
+  },
+  "license": "MIT",
+  "dependencies": {}
+}
diff --git a/package.json b/package.json
@@ -1 +1,268 @@
-{"name":"clockotron","productName":"Clockotron","description":"Clockotron talks time directly to vMix text inputs","version":"1.0.1","scripts":{"build":"concurrently \"yarn build:main\" \"yarn build:renderer\"","build:main":"cross-env NODE_ENV=production webpack --config ./.erb/configs/webpack.config.main.prod.babel.js","build:renderer":"cross-env NODE_ENV=production webpack --config ./.erb/configs/webpack.config.renderer.prod.babel.js","rebuild":"electron-rebuild --parallel --types prod,dev,optional --module-dir src","lint":"cross-env NODE_ENV=development eslint . --cache --ext .js,.jsx,.ts,.tsx","package":"node -r @babel/register ./.erb/scripts/clean.js dist release && yarn build && electron-builder build --publish never","postinstall":"node -r @babel/register .erb/scripts/check-native-dep.js && electron-builder install-app-deps && yarn cross-env NODE_ENV=development webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.babel.js && opencollective-postinstall && yarn-deduplicate yarn.lock","publish":"node -r @babel/register ./.erb/scripts/clean.js dist release && yarn build && electron-builder build -p always","start":"node -r @babel/register ./.erb/scripts/check-port-in-use.js && yarn start:renderer","start:main":"cross-env NODE_ENV=development electron -r ./.erb/scripts/babel-register ./src/main/main.js","start:renderer":"cross-env NODE_ENV=development webpack serve --config ./.erb/configs/webpack.config.renderer.dev.babel.js","major":"node ./version/major","minor":"node ./version/minor","patch":"node ./version/patch"},"build":{"productName":"Clockotron","appId":"org.erb.Clockotron","asar":false,"asarUnpack":"**\\*.{node,dll}","icon":"assets/icon.icns","files":["dist","node_modules","package.json"],"afterSign":".erb/scripts/notarize.js","mac":{"type":"distribution","hardenedRuntime":true,"entitlements":"assets/entitlements.mac.plist","entitlementsInherit":"assets/entitlements.mac.plist","gatekeeperAssess":false},"dmg":{"contents":[{"x":130,"y":220},{"x":410,"y":220,"type":"link","path":"/Applications"}]},"win":{"target":["nsis"]},"linux":{"target":["AppImage"],"category":"Development"},"directories":{"app":"build/app","buildResources":"assets","output":"build/release"},"extraResources":["./assets/**"],"publish":{"provider":"github","owner":"dlamon1","repo":"clockotron","releaseType":"release"}},"repository":{"type":"git","url":"git+https://github.com/dlamon1/clockotron"},"author":{"name":"LEAD LED, LLC","email":"[email protected]","url":"https://leadled.io"},"contributors":[{"name":"Devon Lamond","email":"[email protected]","url":"https://github.com/dlamon1"}],"license":"MIT","devDependencies":{"@babel/core":"^7.14.8","@babel/plugin-proposal-class-properties":"^7.14.5","@babel/plugin-proposal-decorators":"^7.14.5","@babel/plugin-proposal-do-expressions":"^7.14.5","@babel/plugin-proposal-export-default-from":"^7.14.5","@babel/plugin-proposal-export-namespace-from":"^7.14.5","@babel/plugin-proposal-function-bind":"^7.14.5","@babel/plugin-proposal-function-sent":"^7.14.5","@babel/plugin-proposal-json-strings":"^7.14.5","@babel/plugin-proposal-logical-assignment-operators":"^7.14.5","@babel/plugin-proposal-nullish-coalescing-operator":"^7.14.5","@babel/plugin-proposal-optional-chaining":"^7.14.5","@babel/plugin-proposal-pipeline-operator":"^7.14.8","@babel/plugin-proposal-throw-expressions":"^7.14.5","@babel/plugin-syntax-dynamic-import":"^7.8.3","@babel/plugin-syntax-import-meta":"^7.10.4","@babel/plugin-transform-react-constant-elements":"^7.14.5","@babel/plugin-transform-react-inline-elements":"^7.14.5","@babel/plugin-transform-runtime":"^7.14.5","@babel/preset-env":"^7.14.8","@babel/preset-react":"^7.14.5","@babel/preset-typescript":"^7.14.5","@babel/register":"^7.14.5","@pmmmwh/react-refresh-webpack-plugin":"^0.4.3","@teamsupercell/typings-for-css-modules-loader":"^2.5.1","@testing-library/jest-dom":"^5.12.0","@testing-library/react":"^11.2.7","babel-eslint":"^10.1.0","babel-jest":"^26.1.0","babel-loader":"^8.2.2","babel-plugin-dev-expression":"^0.2.2","babel-plugin-transform-react-remove-prop-types":"^0.4.24","browserslist-config-erb":"^0.0.1","chalk":"^4.1.1","concurrently":"^6.0.2","core-js":"^3.11.3","cross-env":"^7.0.3","css-loader":"^5.2.4","css-minimizer-webpack-plugin":"^2.0.0","detect-port":"^1.3.0","electron":"^13.1.8","electron-builder":"^22.11.1","electron-devtools-installer":"^3.2.0","electron-notarize":"^1.0.0","electron-rebuild":"^2.3.5","enzyme":"^3.11.0","enzyme-adapter-react-16":"^1.15.6","enzyme-to-json":"^3.6.2","file-loader":"^6.2.0","html-webpack-plugin":"^5.3.1","identity-obj-proxy":"^3.0.0","lint-staged":"^10.5.4","mini-css-extract-plugin":"^1.6.0","opencollective-postinstall":"^2.0.3","prettier":"^2.2.1","react-refresh":"^0.10.0","react-test-renderer":"^17.0.2","rimraf":"^3.0.0","style-loader":"^2.0.0","terser-webpack-plugin":"^5.1.1","url-loader":"^4.1.0","webpack":"^5.36.2","webpack-bundle-analyzer":"^4.4.1","webpack-cli":"^4.6.0","webpack-dev-server":"^3.11.2","webpack-merge":"^5.7.3","yarn-deduplicate":"^3.1.0"},"dependencies":{"@material-ui/core":"^4.11.4","@material-ui/icons":"^4.11.2","@material-ui/lab":"^4.0.0-alpha.60","dotenv":"^10.0.0","driftless":"^2.0.3","electron-debug":"^3.2.0","electron-fetch":"^1.7.3","electron-log":"^4.3.5","electron-store":"^8.0.1","electron-updater":"^4.3.8","express":"^4.17.1","fast-xml-parser":"^4.0.1","mobx":"^6.3.2","mobx-react":"^7.2.0","react":"^17.0.1","react-color":"^2.19.3","react-dom":"^17.0.1","react-router-dom":"^5.2.0","regenerator-runtime":"^0.13.5","sass-loader":"^12.4.0","uuid":"^8.3.2","validator":"^13.6.0","xmldom":"^0.6.0"},"devEngines":{"node":">=10.x","npm":">=6.x","yarn":">=1.21.3"},"browserslist":[],"prettier":{"overrides":[{"files":[".prettierrc",".babelrc",".eslintrc"],"options":{"parser":"json"}}],"singleQuote":true}}
+{
+  "name": "clockotron",
+  "productName": "Clockotron",
+  "description": "Clockotron talks time directly to vMix text inputs",
+  "version": "1.0.2",
+  "scripts": {
+    "build": "concurrently \"yarn build:main\" \"yarn build:renderer\"",
+    "build:main": "cross-env NODE_ENV=production webpack --config ./.erb/configs/webpack.config.main.prod.babel.js",
+    "build:renderer": "cross-env NODE_ENV=production webpack --config ./.erb/configs/webpack.config.renderer.prod.babel.js",
+    "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir src",
+    "lint": "cross-env NODE_ENV=development eslint . --cache --ext .js,.jsx,.ts,.tsx",
+    "package": "node -r @babel/register ./.erb/scripts/clean.js dist release && yarn build && electron-builder build --publish never",
+    "postinstall": "node -r @babel/register .erb/scripts/check-native-dep.js && electron-builder install-app-deps && yarn cross-env NODE_ENV=development webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.babel.js && opencollective-postinstall && yarn-deduplicate yarn.lock",
+    "publish": "node -r @babel/register ./.erb/scripts/clean.js dist release && yarn build && electron-builder build -p always",
+    "start": "node -r @babel/register ./.erb/scripts/check-port-in-use.js && yarn start:renderer",
+    "start:main": "cross-env NODE_ENV=development electron -r ./.erb/scripts/babel-register ./src/main/main.js",
+    "start:renderer": "cross-env NODE_ENV=development webpack serve --config ./.erb/configs/webpack.config.renderer.dev.babel.js",
+    "test": "jest",
+    "major": "yarn version --major && yarn run publish",
+    "minor": "yarn version --minor && yarn run publish",
+    "patch": "yarn version --patch && yarn run publish"
+  },
+  "lint-staged": {
+    "*.{js,jsx,ts,tsx}": [
+      "cross-env NODE_ENV=development eslint --cache"
+    ],
+    "*.json,.{babelrc,eslintrc,prettierrc}": [
+      "prettier --ignore-path .eslintignore --parser json --write"
+    ],
+    "*.{css,scss}": [
+      "prettier --ignore-path .eslintignore --single-quote --write"
+    ],
+    "*.{html,md,yml}": [
+      "prettier --ignore-path .eslintignore --single-quote --write"
+    ]
+  },
+  "build": {
+    "productName": "Clockotron",
+    "appId": "org.erb.Clockotron",
+    "asar": false,
+    "asarUnpack": "**\\*.{node,dll}",
+    "icon": "assets/icon.icns",
+    "files": [
+      "dist",
+      "node_modules",
+      "package.json"
+    ],
+    "afterSign": ".erb/scripts/notarize.js",
+    "mac": {
+      "type": "distribution",
+      "hardenedRuntime": true,
+      "entitlements": "assets/entitlements.mac.plist",
+      "entitlementsInherit": "assets/entitlements.mac.plist",
+      "gatekeeperAssess": false
+    },
+    "dmg": {
+      "contents": [
+        {
+          "x": 130,
+          "y": 220
+        },
+        {
+          "x": 410,
+          "y": 220,
+          "type": "link",
+          "path": "/Applications"
+        }
+      ]
+    },
+    "win": {
+      "target": [
+        "nsis"
+      ]
+    },
+    "linux": {
+      "target": [
+        "AppImage"
+      ],
+      "category": "Development"
+    },
+    "directories": {
+      "app": "build/app",
+      "buildResources": "assets",
+      "output": "build/release"
+    },
+    "extraResources": [
+      "./assets/**"
+    ],
+    "publish": {
+      "provider": "github",
+      "owner": "dlamon1",
+      "repo": "clockotron",
+      "releaseType": "release"
+    }
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/dlamon1/clockotron"
+  },
+  "author": {
+    "name": "LEAD LED, LLC",
+    "email": "[email protected]",
+    "url": "https://leadled.io"
+  },
+  "contributors": [
+    {
+      "name": "Devon Lamond",
+      "email": "[email protected]",
+      "url": "https://github.com/dlamon1"
+    }
+  ],
+  "license": "MIT",
+  "jest": {
+    "testURL": "http://localhost/",
+    "moduleNameMapper": {
+      "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/.erb/mocks/fileMock.js",
+      "\\.(css|less|sass|scss)$": "identity-obj-proxy"
+    },
+    "moduleFileExtensions": [
+      "js",
+      "jsx",
+      "ts",
+      "tsx",
+      "json"
+    ],
+    "moduleDirectories": [
+      "node_modules",
+      "build/app/node_modules"
+    ],
+    "setupFiles": [
+      "./.erb/scripts/check-build-exists.js"
+    ]
+  },
+  "devDependencies": {
+    "@babel/core": "^7.14.8",
+    "@babel/plugin-proposal-class-properties": "^7.14.5",
+    "@babel/plugin-proposal-decorators": "^7.14.5",
+    "@babel/plugin-proposal-do-expressions": "^7.14.5",
+    "@babel/plugin-proposal-export-default-from": "^7.14.5",
+    "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
+    "@babel/plugin-proposal-function-bind": "^7.14.5",
+    "@babel/plugin-proposal-function-sent": "^7.14.5",
+    "@babel/plugin-proposal-json-strings": "^7.14.5",
+    "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
+    "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+    "@babel/plugin-proposal-pipeline-operator": "^7.14.8",
+    "@babel/plugin-proposal-throw-expressions": "^7.14.5",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-syntax-import-meta": "^7.10.4",
+    "@babel/plugin-transform-react-constant-elements": "^7.14.5",
+    "@babel/plugin-transform-react-inline-elements": "^7.14.5",
+    "@babel/plugin-transform-runtime": "^7.14.5",
+    "@babel/preset-env": "^7.14.8",
+    "@babel/preset-react": "^7.14.5",
+    "@babel/preset-typescript": "^7.14.5",
+    "@babel/register": "^7.14.5",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
+    "@teamsupercell/typings-for-css-modules-loader": "^2.5.1",
+    "@testing-library/jest-dom": "^5.12.0",
+    "@testing-library/react": "^11.2.7",
+    "@types/enzyme": "^3.10.9",
+    "@types/enzyme-adapter-react-16": "^1.0.6",
+    "@types/history": "4.7.8",
+    "@types/jest": "^26.0.24",
+    "@types/node": "15.0.2",
+    "@types/react": "^17.0.9",
+    "@types/react-dom": "^17.0.9",
+    "@types/react-router": "^5.1.14",
+    "@types/react-router-dom": "^5.1.6",
+    "@types/react-test-renderer": "^17.0.1",
+    "@types/webpack-env": "^1.16.0",
+    "@typescript-eslint/eslint-plugin": "^4.22.1",
+    "@typescript-eslint/parser": "^4.22.1",
+    "babel-eslint": "^10.1.0",
+    "babel-jest": "^26.1.0",
+    "babel-loader": "^8.2.2",
+    "babel-plugin-dev-expression": "^0.2.2",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
+    "browserslist-config-erb": "^0.0.1",
+    "chalk": "^4.1.1",
+    "concurrently": "^6.0.2",
+    "core-js": "^3.11.3",
+    "cross-env": "^7.0.3",
+    "css-loader": "^5.2.4",
+    "css-minimizer-webpack-plugin": "^2.0.0",
+    "detect-port": "^1.3.0",
+    "electron": "^13.1.8",
+    "electron-builder": "^22.11.1",
+    "electron-devtools-installer": "^3.2.0",
+    "electron-notarize": "^1.0.0",
+    "electron-rebuild": "^2.3.5",
+    "enzyme": "^3.11.0",
+    "enzyme-adapter-react-16": "^1.15.6",
+    "enzyme-to-json": "^3.6.2",
+    "file-loader": "^6.2.0",
+    "html-webpack-plugin": "^5.3.1",
+    "identity-obj-proxy": "^3.0.0",
+    "lint-staged": "^10.5.4",
+    "mini-css-extract-plugin": "^1.6.0",
+    "opencollective-postinstall": "^2.0.3",
+    "prettier": "^2.2.1",
+    "react-refresh": "^0.10.0",
+    "react-test-renderer": "^17.0.2",
+    "rimraf": "^3.0.0",
+    "style-loader": "^2.0.0",
+    "terser-webpack-plugin": "^5.1.1",
+    "url-loader": "^4.1.0",
+    "webpack": "^5.36.2",
+    "webpack-bundle-analyzer": "^4.4.1",
+    "webpack-cli": "^4.6.0",
+    "webpack-dev-server": "^3.11.2",
+    "webpack-merge": "^5.7.3",
+    "yarn-deduplicate": "^3.1.0"
+  },
+  "dependencies": {
+    "@material-ui/core": "^4.11.4",
+    "@material-ui/icons": "^4.11.2",
+    "@material-ui/lab": "^4.0.0-alpha.60",
+    "dotenv": "^10.0.0",
+    "driftless": "^2.0.3",
+    "electron-debug": "^3.2.0",
+    "electron-fetch": "^1.7.3",
+    "electron-log": "^4.3.5",
+    "electron-store": "^8.0.1",
+    "electron-updater": "^4.3.8",
+    "express": "^4.17.1",
+    "fast-xml-parser": "^4.0.1",
+    "mobx": "^6.3.2",
+    "mobx-react": "^7.2.0",
+    "react": "^17.0.1",
+    "react-color": "^2.19.3",
+    "react-dom": "^17.0.1",
+    "react-router-dom": "^5.2.0",
+    "regenerator-runtime": "^0.13.5",
+    "sass-loader": "^12.4.0",
+    "uuid": "^8.3.2",
+    "validator": "^13.6.0",
+    "xmldom": "^0.6.0",
+    "xpath": "^0.0.32"
+  },
+  "devEngines": {
+    "node": ">=10.x",
+    "npm": ">=6.x",
+    "yarn": ">=1.21.3"
+  },
+  "browserslist": [],
+  "prettier": {
+    "overrides": [
+      {
+        "files": [
+          ".prettierrc",
+          ".babelrc",
+          ".eslintrc"
+        ],
+        "options": {
+          "parser": "json"
+        }
+      }
+    ],
+    "singleQuote": true
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  }
+}
diff --git a/src/renderer/app.css b/src/renderer/app.css
@@ -1,7 +1,6 @@
-/* html {
-  overflow: scroll;
-  overflow-x: hidden;
-} */
+html {
+  user-select: none;
+}
 ::-webkit-scrollbar {
   width: 0; /* Remove scrollbar space */
   background: transparent;

diff --git a/src/renderer/components/newFeatures.dialog.jsx b/src/renderer/components/newFeatures.dialog.jsx
@@ -38,7 +38,7 @@ export const NewFeaturesDialog = observer(() => {
               fontSize: 24,
             }}
           >
-            Custom Colors
+            Update 1.0.2
           </Typography>
           <Typography
             // noWrap
@@ -49,10 +49,12 @@ export const NewFeaturesDialog = observer(() => {
               fontWeight: 700,
             }}
           >
-            Custom colors can be set via the settings tab. Please submit a bug
-            report for any bugs encountered.
+            The formated time now reflects the total remaining time when
+            adjusting the timer positions. Ex/ a one minute and 15 second timer
+            with one position will show 75 seconds. Please report any bugs you
+            find. Thanks!
           </Typography>
-          <Typography
+          {/* <Typography
             // noWrap
             align="center"
             style={{
@@ -62,9 +64,9 @@ export const NewFeaturesDialog = observer(() => {
               fontWeight: 700,
             }}
           >
-            {/* To enable it, navigate to the menu bar, click View, then click
-            Toggle Video TRT. */}
-          </Typography>
+            To enable it, navigate to the menu bar, click View, then click
+            Toggle Video TRT.
+          </Typography> */}
           <Button
             onClick={close}
             style={{ background: 'black', marginTop: 10 }}

diff --git a/src/renderer/components/playPause.timer.jsx b/src/renderer/components/playPause.timer.jsx
@@ -133,7 +133,10 @@ const PlayPause = observer(() => {
 
         <Grid item xs={12} style={{ marginTop: 15 }}>
           <Grid container justifyContent="center" alignItems="center">
-            <Typography color="primary" style={{ fontSize: 18 }}>
+            <Typography
+              color="primary"
+              style={{ fontSize: 18, userSelect: 'none' }}
+            >
               Clock Speed: {speed} %
             </Typography>
           </Grid>

diff --git a/src/renderer/components/version.app.jsx b/src/renderer/components/version.app.jsx
@@ -20,7 +20,6 @@ const ClockFormated = observer(() => {
       <Typography
         style={{
           color: 'white',
-          // marginTop: -5,
           marginBottom: 5,
           fontSize: 13,
           justifyContent: 'center',