Skip to content

Commit e5c2042

Browse files
committed
Added configuration options for all available properties of Liquid Fill Chart
1 parent 990c8f3 commit e5c2042

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+2088
-416
lines changed

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"homepage": "https://github.com/MintyMods/MintySensorServer#readme",
1515
"scripts": {
1616
"build": "cross-env NODE_ENV=production webpack -p",
17-
"dev": "webpack-dev-server --https --port 8081 --color true --content-base src/main/resources/templates/public --content-base src/main/resources/public --content-base src/main/resources/static"
17+
"dev": "webpack-dev-server --https --port 8081 --color true --mode development --content-base src/main/resources/templates/public --content-base src/main/resources/public --content-base src/main/resources/static"
1818
},
1919
"browserslist": [
2020
">1%",
@@ -26,29 +26,29 @@
2626
"devDependencies": {
2727
"@babel/core": "^7.6.2",
2828
"@babel/preset-env": "^7.6.2",
29+
"autoprefixer": "^9.6.2",
2930
"babel-loader": "^8.0.6",
3031
"clean-webpack-plugin": "^3.0.0",
32+
"copy-webpack-plugin": "^5.0.4",
3133
"cross-env": "^5.2.1",
3234
"css-loader": "^2.1.1",
3335
"file-loader": "^4.2.0",
36+
"friendly-errors-webpack-plugin": "^1.7.0",
3437
"html-webpack-plugin": "^3.2.0",
3538
"mini-css-extract-plugin": "^0.6.0",
3639
"node-sass": "^4.12.0",
3740
"postcss-css-variables": "^0.13.0",
41+
"postcss-flexbugs-fixes": "^4.1.0",
3842
"postcss-loader": "^3.0.0",
3943
"sass-loader": "^7.3.1",
4044
"serve": "^11.2.0",
4145
"style-loader": "^0.23.1",
4246
"svelte": "^3.12.1",
43-
"svelte-grid": "^1.10.1",
47+
"svelte-grid": "^1.10.4",
4448
"svelte-loader": "^2.13.6",
4549
"svelte-material-ui": "^1.0.0-beta.15",
4650
"svelte-spa-router": "^1.2.0",
4751
"svelte-watch-resize": "^1.0.3",
48-
"friendly-errors-webpack-plugin": "^1.7.0",
49-
"postcss-flexbugs-fixes": "^4.1.0",
50-
"copy-webpack-plugin": "^5.0.4",
51-
"autoprefixer": "^9.6.2",
5252
"webpack": "^4.41.0",
5353
"webpack-cli": "^3.3.9",
5454
"webpack-dev-server": "^3.8.1"

src/main/resources/templates/MintyClientApp.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
let readings = [];
5656
let sensors = [];
5757
let types = [];
58-
let demoModeActive = false;
58+
let demoModeActive = true;
5959
$: demoTickCount = $storeDemoCurrentJsonFile;
6060
6161
onMount(() => {

src/main/resources/templates/_charts/JustGage.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
let readings;
99
1010
export function showConfig() {
11-
PNotify.info("Just Guage Config " + data.id + '_' + data.index);
11+
PNotify.info("Just Gauge Config " + data.id + '_' + data.index);
1212
}
1313
1414

src/main/resources/templates/_charts/canvas_gauges/LinearGauge.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script>
2-
// Canvas Guages 2.1.5
2+
// Canvas Gauges 2.1.5
33
// https://canvas-gauges.com
44
import { onMount, beforeUpdate } from "svelte";
55
export let data;
@@ -9,7 +9,7 @@
99
const id = "linear-gauge";
1010
1111
export function showConfig() {
12-
PNotify.info("Linear Guage Config");
12+
PNotify.info("Linear Gauge Config");
1313
}
1414
1515
// onMount(() => {

src/main/resources/templates/_charts/canvas_gauges/RadialGauge.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<script>
2-
// Canvas Guages 2.1.5
2+
// Canvas Gauges 2.1.5
33
// https://canvas-gauges.com
44
import { beforeUpdate } from "svelte";
55
export let data;
66
let gauge;
77
$: data = data;
88
99
export function showConfig() {
10-
PNotify.info("Radial Guage Config");
10+
PNotify.info("Radial Gauge Config");
1111
}
1212
1313
beforeUpdate(() => {

src/main/resources/templates/_charts/echarts/EchartsLiquidFill.svelte

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,46 @@
44
import { onDestroy, onMount } from "svelte";
55
import { watchResize } from "svelte-watch-resize";
66
import EchartsLiquidFillConfig from "./EchartsLiquidFillConfig.svelte";
7-
7+
import {
8+
color,
9+
center,
10+
radius,
11+
amplitude,
12+
waveLength,
13+
period,
14+
direction,
15+
shape,
16+
waveAnimation,
17+
animationEasing,
18+
animationEasingUpdate,
19+
animationDuration,
20+
animationDurationUpdate,
21+
outlineShow,
22+
outlineBorderDistance,
23+
outlineitemStyleColor,
24+
outlineitemStyleBorderColor,
25+
outlineitemStyleBorderWidth,
26+
outlineitemStyleShadowBlur,
27+
outlineitemStyleShadowColor,
28+
backgroundStyleColor,
29+
backgroundStyleBorderWidth,
30+
backgroundStyleBorderColor,
31+
backgroundStyleItemStyleShadowBlur,
32+
backgroundStyleItemStyleShadowColor,
33+
backgroundStyleItemStyleOpacity,
34+
itemStyleOpacity,
35+
itemStyleShadowBlur,
36+
itemStyleShadowColor,
37+
emphasisItemStyleOpacity,
38+
labelShow,
39+
labelColor,
40+
labelInsideColor,
41+
labelFontSize,
42+
labelFontWeight,
43+
labelAlign,
44+
labelBaseline,
45+
labelPosition
46+
} from "./config/echarts-liquid-fill-store.js";
847
export let data;
948
export let options;
1049
const id =
@@ -125,58 +164,19 @@
125164
};
126165
}
127166
128-
import {
129-
color,
130-
center,
131-
radius,
132-
amplitude,
133-
waveLength,
134-
period,
135-
direction,
136-
shape,
137-
waveAnimation,
138-
animationEasing,
139-
animationEasingUpdate,
140-
animationDuration,
141-
animationDurationUpdate,
142-
outlineShow,
143-
outlineBorderDistance,
144-
outlineitemStyleColor,
145-
outlineitemStyleBorderColor,
146-
outlineitemStyleBorderWidth,
147-
outlineitemStyleShadowBlur,
148-
outlineitemStyleShadowColor,
149-
backgroundStyleColor,
150-
backgroundStyleBorderWidth,
151-
backgroundStyleBorderColor,
152-
backgroundStyleItemStyleShadowBlur,
153-
backgroundStyleItemStyleShadowColor,
154-
backgroundStyleItemStyleOpacity,
155-
itemStyleOpacity,
156-
itemStyleShadowBlur,
157-
itemStyleShadowColor,
158-
emphasisItemStyleOpacity,
159-
labelShow,
160-
labelColor,
161-
labelInsideColor,
162-
labelFontSize,
163-
labelFontWeight,
164-
labelAlign,
165-
labelBaseline,
166-
labelPosition
167-
} from "../../_stores/echarts-liquid-fill-store.js";
167+
168168
</script>
169169

170170
<style>
171-
.guage {
171+
.gauge {
172172
display: block;
173173
width: 100%;
174174
height: 100%;
175175
transform: scale(1.7);
176176
}
177177
</style>
178178

179-
<div {id} class="guage" use:watchResize={resizeChart} />
179+
<div {id} class="gauge" use:watchResize={resizeChart} />
180180

181181
<EchartsLiquidFillConfig bind:this={config} {data} />
182182

0 commit comments

Comments
 (0)