heliox/old-monorepo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into dev

Browse source
This commit is contained in:
GHOSCHT 2021-09-30 09:11:34 +02:00
commit 7156a178c6
4 changed files with 544 additions and 310 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/PlatformIO.yml vendored
View file

@ -1,4 +1,4 @@
name: PlatformIO CI name: PlatformIO Build
on: on:
push: push:

46
Dashboard/package.json
View file

@ -4,7 +4,7 @@
"name": "GHOSCHT" "name": "GHOSCHT"
}, },
"description": "", "description": "",
"version": "0.1.0", "version": "2.0.0",
"main": "src/electron.js", "main": "src/electron.js",
"private": true, "private": true,
"build": { "build": {
@ -52,14 +52,14 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@redux-devtools/cli": "1.0.0-9", "@redux-devtools/cli": "1.0.0-9",
"@types/jest": "27.0.1", "@types/jest": "27.0.2",
"@types/node": "15.14.9", "@types/node": "15.14.9",
"@types/react": "17.0.19", "@types/react": "17.0.24",
"@types/react-dom": "17.0.9", "@types/react-dom": "17.0.9",
"@types/remote-redux-devtools": "0.5.5", "@types/remote-redux-devtools": "0.5.5",
"@types/styled-components": "5.1.13", "@types/styled-components": "5.1.14",
"chalk": "4.1.2", "chalk": "4.1.2",
"electron-acrylic-window": "0.5.8", "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",
@ -67,47 +67,47 @@
"fs-extra": "10.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.4", "react-redux": "7.2.5",
"react-select": "4.3.1", "react-select": "5.0.0",
"redux": "4.1.1", "redux": "4.1.1",
"redux-thunk": "2.3.0", "redux-thunk": "2.3.0",
"remote-redux-devtools": "0.5.16", "remote-redux-devtools": "0.5.16",
"screenz": "1.0.0", "screenz": "1.0.0",
"serialport": "9.2.0", "serialport": "9.2.1",
"sqlite3": "5.0.2", "sqlite3": "5.0.2",
"styled-components": "5.3.1", "styled-components": "5.3.1",
"typesafe-actions": "5.1.0", "typesafe-actions": "5.1.0",
"typescript": "4.4.2" "typescript": "4.4.3"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "7.15.0", "@babel/core": "7.15.5",
"@babel/preset-env": "7.15.0", "@babel/preset-env": "7.15.6",
"@babel/preset-react": "7.14.5", "@babel/preset-react": "7.14.5",
"@types/react-select": "4.0.17", "@types/react-select": "4.0.18",
"@types/serialport": "8.0.2", "@types/serialport": "8.0.2",
"@typescript-eslint/eslint-plugin": "4.29.3", "@typescript-eslint/eslint-plugin": "4.32.0",
"@typescript-eslint/parser": "4.29.3", "@typescript-eslint/parser": "4.32.0",
"babel-loader": "8.2.2", "babel-loader": "8.2.2",
"concurrently": "6.2.1", "concurrently": "6.2.2",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"css-loader": "6.2.0", "css-loader": "6.3.0",
"electron": "13.2.3", "electron": "13.5.0",
"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.24.0", "eslint-plugin-react": "7.26.0",
"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.2", "fork-ts-checker-webpack-plugin": "6.3.3",
"html-webpack-plugin": "5.3.2", "html-webpack-plugin": "5.3.2",
"style-loader": "3.2.1", "style-loader": "3.3.0",
"ts-loader": "9.2.5", "ts-loader": "9.2.6",
"wait-on": "6.0.0", "wait-on": "6.0.0",
"webpack": "5.51.1", "webpack": "5.54.0",
"webpack-cli": "4.8.0", "webpack-cli": "4.8.0",
"webpack-dev-server": "4.0.0" "webpack-dev-server": "4.3.0"
}, },
"presets": [ "presets": [
"@babel/preset-env", "@babel/preset-env",

802
Dashboard/yarn.lock
View file

File diff suppressed because it is too large Load diff

4
README.md
View file

@ -1,9 +1,9 @@
# light-control # light-control
[![Electron Build](https://github.com/GHOSCHT/light-control/actions/workflows/Electron.yml/badge.svg)](https://github.com/GHOSCHT/light-control/actions/workflows/Electron.yml) [![Electron Build](https://github.com/GHOSCHT/light-control/actions/workflows/Electron.yml/badge.svg)](https://github.com/GHOSCHT/light-control/actions/workflows/Electron.yml)
[![PlatformIO CI](https://github.com/GHOSCHT/light-control/actions/workflows/PlatformIO.yml/badge.svg)](https://github.com/GHOSCHT/light-control/actions/workflows/PlatformIO.yml) [![PlatformIO Build](https://github.com/GHOSCHT/light-control/actions/workflows/PlatformIO.yml/badge.svg)](https://github.com/GHOSCHT/light-control/actions/workflows/PlatformIO.yml)
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/bdb8a994396345efab8271307f1ea155)](https://www.codacy.com/gh/GHOSCHT/light-control/dashboard?utm_source=github.com&utm_medium=referral&utm_content=GHOSCHT/light-control&utm_campaign=Badge_Grade)
[![CodeQL](https://github.com/GHOSCHT/light-control/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/GHOSCHT/light-control/actions/workflows/codeql-analysis.yml) [![CodeQL](https://github.com/GHOSCHT/light-control/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/GHOSCHT/light-control/actions/workflows/codeql-analysis.yml)
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/bdb8a994396345efab8271307f1ea155)](https://www.codacy.com/gh/GHOSCHT/light-control/dashboard?utm_source=github.com&utm_medium=referral&utm_content=GHOSCHT/light-control&utm_campaign=Badge_Grade)
<a href="https://www.figma.com/file/fK5tEIw4Zx8AivuVbu79Lw/Light-Control"> <a href="https://www.figma.com/file/fK5tEIw4Zx8AivuVbu79Lw/Light-Control">
<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>