Skip to content

Commit

Permalink
Working on layout
Browse files Browse the repository at this point in the history
  • Loading branch information
GermanBluefox committed Jan 5, 2025
2 parents 23c0f3e + 36a14f1 commit 8720708
Show file tree
Hide file tree
Showing 66 changed files with 156 additions and 746 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ You can debug view charts locally with:
- (@GermanBluefox) Project was completely rewritten with TypeScript
- (@GermanBluefox) Better mobile layouts added

### 1.9.3 (2024-12-19)
### 1.9.5 (2024-12-20)

- (@GermanBluefox) Convert actual values with provided "convert" function too

Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion admin/chart/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
document.head.appendChild(script);
</script>
<title>Echarts [ioBroker]</title>
<script type="module" crossorigin src="./assets/index-WdepKgeu.js"></script>
<script type="module" crossorigin src="./assets/index-eg0Cycky.js"></script>
<link rel="stylesheet" crossorigin href="./assets/index-VI9R7d-i.css">
</head>
<body>
Expand Down
Binary file removed admin/preview/assets/echarts-BDq-rBJC.png
Binary file not shown.
519 changes: 0 additions & 519 deletions admin/preview/assets/index-CZHXnHpJ.js

This file was deleted.

1 change: 0 additions & 1 deletion admin/preview/assets/index-VI9R7d-i.css

This file was deleted.

Binary file removed admin/preview/favicon.ico
Binary file not shown.
55 changes: 0 additions & 55 deletions admin/preview/index.html

This file was deleted.

15 changes: 0 additions & 15 deletions admin/preview/manifest.json

This file was deleted.

2 changes: 1 addition & 1 deletion admin/tab.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
document.head.appendChild(script);
</script>
<title>Echarts [ioBroker]</title>
<script type="module" crossorigin src="./assets/index-CgvZfgDV.js"></script>
<script type="module" crossorigin src="./assets/index-DDrMdFmh.js"></script>
<link rel="stylesheet" crossorigin href="./assets/index-D5BB0j0i.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions io-package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"common": {
"name": "echarts",
"version": "1.9.3",
"version": "1.9.5",
"news": {
"1.9.3": {
"1.9.5": {
"en": "Convert actual values with provided \"convert\" function too",
"de": "Istwerte mit bereitgestellter \"Konvert\"-Funktion umrechnen",
"ru": "Конвертировать фактические значения с предоставленной функцией «конверт»",
Expand Down
170 changes: 85 additions & 85 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,87 +1,87 @@
{
"name": "iobroker.echarts",
"version": "1.9.3",
"description": "Build useful charts in ioBroker",
"author": {
"name": "bluefox",
"email": "[email protected]"
},
"homepage": "https://github.com/ioBroker/ioBroker.echarts",
"license": "Apache-2.0",
"keywords": [
"charts",
"diagram",
"ioBroker"
],
"engines": {
"node": ">=18"
},
"repository": {
"type": "git",
"url": "https://github.com/ioBroker/ioBroker.echarts"
},
"optionalDependencies": {
"canvas": "^2.11.2",
"echarts": "^5.6.0",
"jsdom": "^25.0.1"
},
"dependencies": {
"moment": "^2.30.1",
"@iobroker/adapter-core": "^3.2.3"
},
"devDependencies": {
"@alcalzone/release-script": "^3.8.0",
"@alcalzone/release-script-plugin-iobroker": "^3.7.2",
"@alcalzone/release-script-plugin-license": "^3.7.0",
"@iobroker/adapter-react-v5": "^7.4.10",
"@iobroker/build-tools": "^2.0.13",
"@iobroker/eslint-config": "^1.0.0",
"@iobroker/legacy-testing": "^2.0.1",
"@iobroker/testing": "^5.0.0",
"@iobroker/vis-2-widgets-react-dev": "^4.0.4",
"@mui/icons-material": "^6.3.0",
"@mui/material": "^6.3.0",
"@types/jsdom": "^21.1.7",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"axios": "^1.7.9",
"chai": "^4.5.0",
"colorette": "^2.0.20",
"mocha": "^11.0.1",
"puppeteer": "^23.11.1",
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"main": "build-backend/main.js",
"files": [
"admin/",
"img/",
"widgets/",
"www/",
"io-package.json",
"LICENSE",
"build-backend/"
],
"scripts": {
"test:package": "mocha test/package --exit",
"test:gui": "mocha ./test/*.gui.js --exit",
"test": "npm run test:package",
"prepublishOnly": "npm run build",
"tsc": "tsc -p tsconfig.build.json",
"build": "npm run build:widgets && npm run build:chart && npm run build:preview && npm run build:edit && npm run tsc",
"build:widgets": "node tasksWidgets",
"build:chart": "node tasksChart",
"build:preview": "node tasksPreview",
"build:edit": "node tasksEdit.js",
"release": "release-script",
"release-patch": "release-script patch --yes",
"release-minor": "release-script minor --yes",
"release-major": "release-script major --yes",
"update-packages": "npx -y npm-check-updates --upgrade && cd src && npx -y npm-check-updates --upgrade && cd ../src-chart && npx -y npm-check-updates --upgrade && cd ../src-preview && npx -y npm-check-updates --upgrade && cd ../src-widgets && npx -y npm-check-updates --upgrade",
"npm": "npm i && cd src && npm i -f && cd ../src-chart && npm i -f && cd ../src-preview && npm i -f && cd ../src-widgets && npm i -f"
},
"bugs": {
"url": "https://github.com/ioBroker/ioBroker.echarts/issues"
},
"readmeFilename": "README.md"
"name": "iobroker.echarts",
"version": "1.9.5",
"description": "Build useful charts in ioBroker",
"author": {
"name": "bluefox",
"email": "[email protected]"
},
"homepage": "https://github.com/ioBroker/ioBroker.echarts",
"license": "Apache-2.0",
"keywords": [
"charts",
"diagram",
"ioBroker"
],
"engines": {
"node": ">=18"
},
"repository": {
"type": "git",
"url": "https://github.com/ioBroker/ioBroker.echarts"
},
"optionalDependencies": {
"canvas": "^2.11.2",
"echarts": "^5.6.0",
"jsdom": "^25.0.1"
},
"dependencies": {
"moment": "^2.30.1",
"@iobroker/adapter-core": "^3.2.3"
},
"devDependencies": {
"@alcalzone/release-script": "^3.8.0",
"@alcalzone/release-script-plugin-iobroker": "^3.7.2",
"@alcalzone/release-script-plugin-license": "^3.7.0",
"@iobroker/adapter-react-v5": "^7.4.10",
"@iobroker/build-tools": "^2.0.13",
"@iobroker/eslint-config": "^1.0.0",
"@iobroker/legacy-testing": "^2.0.1",
"@iobroker/testing": "^5.0.0",
"@iobroker/vis-2-widgets-react-dev": "^4.0.4",
"@mui/icons-material": "^6.3.0",
"@mui/material": "^6.3.0",
"@types/jsdom": "^21.1.7",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"axios": "^1.7.9",
"chai": "^4.5.0",
"colorette": "^2.0.20",
"mocha": "^11.0.1",
"puppeteer": "^23.11.1",
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"main": "build-backend/main.js",
"files": [
"admin/",
"img/",
"widgets/",
"www/",
"io-package.json",
"LICENSE",
"build-backend/"
],
"scripts": {
"test:package": "mocha test/package --exit",
"test:gui": "mocha ./test/*.gui.js --exit",
"test": "npm run test:package",
"prepublishOnly": "npm run build",
"tsc": "tsc -p tsconfig.build.json",
"build": "npm run build:widgets && npm run build:chart && npm run build:preview && npm run build:edit && npm run tsc",
"build:widgets": "node tasksWidgets",
"build:chart": "node tasksChart",
"build:preview": "node tasksPreview",
"build:edit": "node tasksEdit.js",
"release": "release-script",
"release-patch": "release-script patch --yes",
"release-minor": "release-script minor --yes",
"release-major": "release-script major --yes",
"update-packages": "npx -y npm-check-updates --upgrade && cd src && npx -y npm-check-updates --upgrade && cd ../src-chart && npx -y npm-check-updates --upgrade && cd ../src-preview && npx -y npm-check-updates --upgrade && cd ../src-widgets && npx -y npm-check-updates --upgrade",
"npm": "npm i && cd src && npm i -f && cd ../src-chart && npm i -f && cd ../src-preview && npm i -f && cd ../src-widgets && npm i -f"
},
"bugs": {
"url": "https://github.com/ioBroker/ioBroker.echarts/issues"
},
"readmeFilename": "README.md"
}
2 changes: 1 addition & 1 deletion src-chart/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "echarts.index",
"version": "1.9.3",
"version": "1.9.5",
"private": true,
"dependencies": {
"@types/crypto-js": "^4.2.2",
Expand Down
4 changes: 2 additions & 2 deletions src-editor/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-preview/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "echarts.index",
"version": "1.9.3",
"version": "1.9.5",
"private": true,
"dependencies": {
"@vitejs/plugin-react": "^4.3.4",
Expand Down
2 changes: 1 addition & 1 deletion src-widgets/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "iobroker.echarts",
"private": true,
"version": "1.9.3",
"version": "1.9.5",
"dependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@craco/craco": "^7.1.0",
Expand Down
2 changes: 1 addition & 1 deletion widgets/echarts/customWidgets.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion widgets/echarts/customWidgets.js.map

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions widgets/echarts/static/js/main.c4321b18.js

This file was deleted.

2 changes: 2 additions & 0 deletions widgets/echarts/static/js/main.ca7ddd4f.js

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8720708

Please sign in to comment.