Skip to content

Commit 2586fae

Browse files
2hdlockness2hdlockness
authored
Merge pull request #6 from bugsounet/api
v1.1.0
2 parents 9edae1e + c552dcb commit 2586fae

27 files changed

+4102
-554
lines changed

‎.eslint.config.mjs

+4-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const config = [
8383
}
8484
},
8585
{
86-
"files": [".eslint.config.mjs"],
86+
"files": [".*.mjs"],
8787
"languageOptions": {
8888
"ecmaVersion": "latest",
8989
"globals": {
@@ -110,6 +110,9 @@ const config = [
110110
"package-json/valid-name": "off",
111111
"depend/ban-dependencies": ["error", {"allowed": ["jquery"]}]
112112
}
113+
},
114+
{
115+
"ignores": ["*.js"]
113116
}
114117
];
115118

‎.github/workflows/build.yml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: "MagicMirror² and MMM-Linky build Testing"
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
build:
7+
name: Test install MMM-Linky
8+
runs-on: ubuntu-latest
9+
strategy:
10+
matrix:
11+
node-version: [20.x, 22.x, 23.x]
12+
steps:
13+
- name: "Use Node.js ${{ matrix.node-version }}"
14+
uses: actions/setup-node@v4
15+
with:
16+
node-version: ${{ matrix.node-version }}
17+
check-latest: true
18+
19+
- name: Checkout MagicMirror²
20+
uses: actions/checkout@v4
21+
with:
22+
repository: MagicMirrorOrg/MagicMirror
23+
24+
- name: Install MagicMirror²
25+
run: npm install
26+
27+
- name: Checkout MMM-Linky
28+
uses: actions/checkout@v4
29+
with:
30+
path: MagicMirror/modules/MMM-Linky
31+
32+
- name: Install MMM-Linky
33+
run: npm run setup
34+
working-directory: MagicMirror/modules/MMM-Linky
35+
continue-on-error: false

‎.github/workflows/esbuild.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: "ESBuild Testing"
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
esbuild:
7+
name: Run esbuild
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: "Use Node.js v20.x (latest)"
11+
uses: actions/setup-node@v4
12+
with:
13+
node-version: "20.x"
14+
check-latest: true
15+
16+
- name: Checkout code
17+
uses: actions/checkout@v4
18+
19+
- name: Install Dependencies
20+
run: npm prune
21+
22+
- name: Run ESBuild
23+
run: node installer/minify
24+
continue-on-error: false

‎.github/workflows/windowsMaster.yml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: "[Windows] MagicMirror² and MMM-Linky build Testing"
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
build:
7+
name: Test install MMM-Linky
8+
runs-on: windows-latest
9+
strategy:
10+
matrix:
11+
node-version: [ 20.x ]
12+
steps:
13+
- name: "Use Node.js ${{ matrix.node-version }}"
14+
uses: actions/setup-node@v4
15+
with:
16+
node-version: ${{ matrix.node-version }}
17+
check-latest: true
18+
19+
- name: Checkout MagicMirror²
20+
uses: actions/checkout@v4
21+
with:
22+
repository: MagicMirrorOrg/MagicMirror
23+
24+
- name: Install MagicMirror²
25+
run: npm install
26+
27+
- name: Checkout MMM-Linky
28+
uses: actions/checkout@v4
29+
with:
30+
path: MagicMirror/modules/MMM-Linky
31+
32+
- name: Install MMM-Linky
33+
run: npm run setup
34+
working-directory: MagicMirror/modules/MMM-Linky
35+
continue-on-error: false

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
/node_modules/
2+
/MMM-Linky.js
3+
/node_helper.js

‎.markdownlint-cli2.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const options = {
22
"config": {
33
"MD013": {
4-
"line_length": 350
4+
"line_length": 350
55
},
66
"MD033": {
77
"allowed_elements": [

‎.npmrc

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
engine-strict=true
2+
audit=false
3+
loglevel="error"
4+
fund=false

‎.prettier.config.mjs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
const config = {
2-
tabWidth: 2,
3-
overrides: [
2+
"tabWidth": 2,
3+
"overrides": [
44
{
5-
files: "*.md",
6-
options: {
7-
parser: "markdown"
5+
"files": "*.md",
6+
"options": {
7+
"parser": "markdown"
88
}
99
}
1010
],
11-
trailingComma: "none"
11+
"trailingComma": "none"
1212
};
1313

1414
export default config;

‎MMM-Linky.css

+59-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
.MMM-Linky {
2-
max-width: 350px;
1+
#MMM-Linky {
2+
width: 350px;
33
margin: 0 auto;
44
overflow: hidden;
55
word-wrap: break-word;
66
}
77

8-
.header {
8+
#MMM-Linky_Header {
99
text-transform: uppercase;
1010
text-align: center;
1111
font-size: var(--font-size-xsmall);
@@ -14,17 +14,66 @@
1414
border-bottom: 1px solid #fff;
1515
line-height: 15px;
1616
padding-bottom: 5px;
17+
margin-top: 2px;
1718
margin-bottom: 10px;
1819
color: #fff;
1920
}
2021

21-
#energyChart {
22-
width: 100% !important;
23-
height: 300px;
24-
margin-top: 20px;
22+
#MMM-Linky_Energie {
23+
text-align: left;
24+
font-size: medium;
25+
max-width: 100%;
26+
word-wrap: break-word;
27+
line-height: 1.2;
28+
padding: 5px;
29+
}
30+
31+
#MMM-Linky_Energie.red {
32+
color: red;
33+
}
34+
35+
#MMM-Linky_Energie.yellow {
36+
color: yellow;
37+
}
38+
39+
#MMM-Linky_Energie.green {
40+
color: green;
41+
}
42+
43+
#MMM-Linky_Message {
44+
color: #fff;
45+
text-align: center;
46+
font-size: medium;
47+
max-width: 100%;
48+
word-wrap: break-word;
49+
line-height: 1.2;
50+
padding: 5px;
51+
}
52+
53+
#MMM-Linky_Update {
54+
text-align: right;
55+
font-size: x-small;
56+
}
57+
58+
#MMM-Linky_Message.hidden {
59+
display: none;
60+
}
61+
62+
#MMM-Linky_Message.warn {
63+
color: red;
64+
animation: clignotte 1000ms infinite;
2565
}
2666

27-
.chartjs-render-monitor {
28-
border-radius: 8px;
29-
box-shadow: 0 4px 6px rgb(0 0 0 / 10%);
67+
@keyframes clignotte {
68+
0% {
69+
opacity: 0;
70+
}
71+
72+
40% {
73+
opacity: 1;
74+
}
75+
76+
100% {
77+
opacity: 0;
78+
}
3079
}

0 commit comments

Comments
 (0)