Merge branch 'master' into dev-pcb-rework

This commit is contained in:
GHOSCHT 2022-03-07 12:49:38 +01:00
commit 13852adf27
No known key found for this signature in database
GPG key ID: A35BD466B8871994
21 changed files with 8581 additions and 9691 deletions

View file

@ -8,7 +8,7 @@ on:
jobs: jobs:
build: build:
runs-on: windows-latest runs-on: windows-2019
strategy: strategy:
matrix: matrix:

File diff suppressed because it is too large Load diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 634 B

After

Width:  |  Height:  |  Size: 424 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 597 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 795 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 353 KiB

After

Width:  |  Height:  |  Size: 353 KiB

View file

@ -1,38 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 141.73 141.73"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 141.73 141.73"><defs><style>.cls-1{fill:#545353}.cls-2{font-size:20px;fill:#fff;font-family:SegoeUI-Bold,Segoe UI;font-weight:700}.cls-3{fill:#2f6087}</style></defs><title>Knob</title><g id="Base"><path d="M352.12,273A70.87,70.87,0,1,0,423,343.84,70.86,70.86,0,0,0,352.12,273Zm0,120.48a49.61,49.61,0,1,1,49.61-49.61A49.61,49.61,0,0,1,352.12,393.45Z" class="cls-1" transform="translate(-281.26 -272.97)"/></g><g id="Status"><text class="cls-2" transform="translate(53.61 77.41)">255</text></g><g id="Overlay"><g><path d="M363.54,295.57" class="cls-3" transform="translate(-281.26 -272.97)"/><path d="M363.54,295.57a49.44,49.44,0,0,0-11.42-1.34" class="cls-3" transform="translate(-281.26 -272.97)"/><path d="M352.12,294.23" class="cls-3" transform="translate(-281.26 -272.97)"/><path d="M368.76,275l-.33-.1v0Z" class="cls-3" transform="translate(-281.26 -272.97)"/><polygon points="87.18 1.89 87.18 1.89 87.17 1.91 87.17 1.91 87.18 1.89" class="cls-3"/><polygon points="82.28 22.58 87.17 1.91 87.17 1.91 82.28 22.58 82.28 22.58" class="cls-3"/><path d="M368.76,275l-.33-.08A71.24,71.24,0,0,0,352.12,273a10.71,10.71,0,0,0-10.53,10.73,10.53,10.53,0,0,0,10.53,10.53,49.44,49.44,0,0,1,11.42,1.34v0a10.33,10.33,0,0,0,12.56-7.68A10.79,10.79,0,0,0,368.76,275Z" class="cls-3" transform="translate(-281.26 -272.97)"/></g></g></svg>
<defs>
<style>
.cls-1 {
fill: #545353;
}
.cls-2 {
font-size: 20px;
fill: #fff;
font-family: SegoeUI-Bold, Segoe UI;
font-weight: 700;
}
.cls-3 {
fill: #2f6087;
}
</style>
</defs>
<title>Knob</title>
<g id="Base">
<path class="cls-1" d="M352.12,273A70.87,70.87,0,1,0,423,343.84,70.86,70.86,0,0,0,352.12,273Zm0,120.48a49.61,49.61,0,1,1,49.61-49.61A49.61,49.61,0,0,1,352.12,393.45Z" transform="translate(-281.26 -272.97)"/>
</g>
<g id="Status">
<text class="cls-2" transform="translate(53.61 77.41)">255</text>
</g>
<g id="Overlay">
<g>
<path class="cls-3" d="M363.54,295.57" transform="translate(-281.26 -272.97)"/>
<path class="cls-3" d="M363.54,295.57a49.44,49.44,0,0,0-11.42-1.34" transform="translate(-281.26 -272.97)"/>
<path class="cls-3" d="M352.12,294.23" transform="translate(-281.26 -272.97)"/>
<path class="cls-3" d="M368.76,275l-.33-.1v0Z" transform="translate(-281.26 -272.97)"/>
<polygon class="cls-3" points="87.18 1.89 87.18 1.89 87.17 1.91 87.17 1.91 87.18 1.89"/>
<polygon class="cls-3" points="82.28 22.58 87.17 1.91 87.17 1.91 82.28 22.58 82.28 22.58"/>
<path class="cls-3" d="M368.76,275l-.33-.08A71.24,71.24,0,0,0,352.12,273a10.71,10.71,0,0,0-10.53,10.73,10.53,10.53,0,0,0,10.53,10.53,49.44,49.44,0,0,1,11.42,1.34v0a10.33,10.33,0,0,0,12.56-7.68A10.79,10.79,0,0,0,368.76,275Z" transform="translate(-281.26 -272.97)"/>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View file

@ -8,8 +8,8 @@
"main": "src/electron.js", "main": "src/electron.js",
"private": true, "private": true,
"build": { "build": {
"productName": "Light Control", "productName": "Heliox",
"appId": "lightcontrol.dashboard", "appId": "heliox.dashboard",
"buildDependenciesFromSource": true, "buildDependenciesFromSource": true,
"npmRebuild": false, "npmRebuild": false,
"win": { "win": {
@ -52,63 +52,59 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@reduxjs/toolkit": "^1.7.1", "@reduxjs/toolkit": "^1.7.1",
"@types/jest": "27.0.2", "@types/jest": "^27.0.2",
"@types/node": "15.14.9", "@types/node": "^15.14.9",
"@types/react": "17.0.27", "@types/react": "^17.0.27",
"@types/react-dom": "17.0.9", "@types/react-dom": "^17.0.9",
"@types/react-redux": "^7.1.21", "@types/react-redux": "^7.1.21",
"@types/remote-redux-devtools": "0.5.5", "@types/remote-redux-devtools": "^0.5.5",
"@types/styled-components": "5.1.14", "@types/styled-components": "^5.1.14",
"chalk": "4.1.2", "chalk": "^4.1.2",
"electron-acrylic-window": "0.5.9", "electron-acrylic-window": "^0.5.9",
"electron-devtools-installer": "3.2.0", "electron-devtools-installer": "^3.2.0",
"electron-is-dev": "2.0.0", "electron-is-dev": "^2.0.0",
"electron-localshortcut": "3.2.1", "electron-localshortcut": "^3.2.1",
"electron-squirrel-startup": "1.0.0", "electron-squirrel-startup": "^1.0.0",
"fs-extra": "10.0.0", "react": "^17.0.2",
"react": "17.0.2", "react-dom": "^17.0.2",
"react-dom": "17.0.2", "react-redux": "^7.2.5",
"react-redux": "7.2.5", "react-select": "^5.1.0",
"react-select": "5.1.0", "redux": "^4.1.1",
"redux": "4.1.1", "redux-thunk": "^2.3.0",
"redux-thunk": "2.3.0", "screenz": "^1.0.0",
"remote-redux-devtools": "0.5.16", "serialport": "^9.2.4",
"screenz": "1.0.0", "sqlite3": "^5.0.2",
"serialport": "9.2.4", "styled-components": "^5.3.1",
"sqlite3": "5.0.2", "typescript": "^4.4.3"
"styled-components": "5.3.1",
"typesafe-actions": "5.1.0",
"typescript": "4.4.3"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "7.15.5", "@babel/core": "^7.15.5",
"@babel/preset-env": "7.15.6", "@babel/preset-env": "^7.15.6",
"@babel/preset-react": "7.14.5", "@babel/preset-react": "^7.14.5",
"@types/react-select": "5.0.0", "@types/react-select": "^5.0.0",
"@types/serialport": "8.0.2", "@types/serialport": "^8.0.2",
"@typescript-eslint/eslint-plugin": "4.33.0", "@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "4.33.0", "@typescript-eslint/parser": "^4.33.0",
"babel-loader": "8.2.2", "babel-loader": "^8.2.2",
"concurrently": "6.3.0", "concurrently": "^6.3.0",
"cross-env": "7.0.3", "cross-env": "^7.0.3",
"css-loader": "6.3.0", "css-loader": "^6.3.0",
"electron": "13.5.1", "electron": "^13.5.1",
"electron-builder": "22.11.7", "electron-builder": "^22.11.7",
"eslint": "7.32.0", "eslint": "^7.32.0",
"eslint-config-airbnb": "18.2.1", "eslint-config-airbnb": "^18.2.1",
"eslint-plugin-import": "2.24.2", "eslint-plugin-import": "^2.24.2",
"eslint-plugin-jsx-a11y": "6.4.1", "eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "7.26.1", "eslint-plugin-react": "^7.26.1",
"eslint-plugin-react-hooks": "4.2.0", "eslint-plugin-react-hooks": "^4.2.0",
"file-loader": "6.2.0", "file-loader": "^6.2.0",
"fork-ts-checker-webpack-plugin": "6.3.3", "fork-ts-checker-webpack-plugin": "^6.3.3",
"html-webpack-plugin": "5.3.2", "html-webpack-plugin": "^5.3.2",
"style-loader": "3.3.0", "style-loader": "^3.3.0",
"ts-loader": "9.2.6", "ts-loader": "^9.2.6",
"wait-on": "6.0.0", "wait-on": "^6.0.0",
"webpack": "5.57.1", "webpack": "^5.57.1",
"webpack-cli": "4.8.0", "webpack-cli": "^4.9.2"
"webpack-dev-server": "4.3.1"
}, },
"presets": [ "presets": [
"@babel/preset-env", "@babel/preset-env",

View file

@ -1,3 +1,3 @@
!macro customInstall !macro customInstall
CreateShortcut "$SMSTARTUP\Light Control.lnk" "$INSTDIR\Light Control.exe" CreateShortcut "$SMSTARTUP\Heliox.lnk" "$INSTDIR\Heliox.exe"
!macroend !macroend

View file

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<title>Light Control</title> <title>Heliox</title>
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>

File diff suppressed because it is too large Load diff

View file

@ -8,7 +8,11 @@
<img src="https://img.shields.io/badge/Figma-F24E1E?style=flat&logo=figma&logoColor=white" /> <img src="https://img.shields.io/badge/Figma-F24E1E?style=flat&logo=figma&logoColor=white" />
</a> </a>
It just takes two standing lights which are too far away to reach, to make turning on and off desk lights a chore. Heliox aims to make desk lighting as easy as possible. <div align="center">
<img src="Dashboard//assets//icons//Icon.png" alt="Logo" width="80" height="80">
<p>It just takes two standing lights which are too far away to reach, to make turning on and off desk lights a chore.</p>
<p>Heliox aims to make desk lighting as easy as possible.</p>
</div>
## About Heliox ## About Heliox