diff --git a/.vscode/dashkiosk.hurl b/.vscode/dashkiosk.hurl new file mode 100644 index 0000000..4585f1f --- /dev/null +++ b/.vscode/dashkiosk.hurl @@ -0,0 +1,36 @@ +# "C:\Program Files\hurl\hurl.exe" basic.hurl + +### + +GET https://dashkiosk.phares.duckdns.org/api/display +Accept: application/json +HTTP 200 +[Asserts] +header "Content-Type" == "application/json; charset=utf-8" + +### + +GET https://dashkiosk.phares.duckdns.org/api/group +Accept: application/json +HTTP 200 +[Asserts] +header "Content-Type" == "application/json; charset=utf-8" + +### + +PUT https://dashkiosk.phares.duckdns.org/api/display/5NRH58/group/2 +Accept: application/json +HTTP 200 +[Asserts] +header "Content-Type" == "application/json; charset=utf-8" + +### + +PUT https://dashkiosk.phares.duckdns.org/api/display/5NRH58/group/1 +Accept: application/json +HTTP 200 +[Asserts] +header "Content-Type" == "application/json; charset=utf-8" +jsonpath "$.group" == 1 + +### diff --git a/index.html b/index.html index c237d4b..8087572 100644 --- a/index.html +++ b/index.html @@ -12,10 +12,10 @@
-

Slideshow

-

Slideshow (Last)

-

Slideshow (Time)

-

Slideshow (Last-List)

+

Slideshow

+

Slideshow (Last)

+

Slideshow (Time)

+

Slideshow (Last-List)

diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 7bf74fa..0000000 --- a/package-lock.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "www", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "devDependencies": { - "prettier": "^3.0.0" - } - }, - "node_modules/prettier": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.1.tgz", - "integrity": "sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==", - "dev": true, - "bin": { - "prettier": "bin/prettier.cjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - } - } -} diff --git a/slideshow/index.html b/slideshow/index.html index 2fce5a6..1a6530e 100644 --- a/slideshow/index.html +++ b/slideshow/index.html @@ -21,7 +21,7 @@ - + \ No newline at end of file diff --git a/slideshow/index.json b/slideshow/index.json index bece1f4..dd52363 100644 --- a/slideshow/index.json +++ b/slideshow/index.json @@ -5,6 +5,6 @@ "ImageIntervalXX": 21234, "ImageZero": "images/1x1_00000000.png", "JsonInterval": 59000, - "ListLength": 15, - "UserId": "93f51ef4-f1f8-48af-ab00-e00436d790ef" + "ListLength": 50, + "UserId": "c0c8a7fb-5dff-4708-b921-c54d9a8b1ef8" } \ No newline at end of file diff --git a/slideshow/scripts/index.js b/slideshow/scripts/index.js index adf7408..7257af4 100644 --- a/slideshow/scripts/index.js +++ b/slideshow/scripts/index.js @@ -22,7 +22,7 @@ const currentDate = new Date(); const dd = currentDate.getDate().toString().padStart(2, '0'); const mm = (new Date().getMonth() + 1).toString().padStart(2, '0'); - const url = _UniformResourceLocator + '/slideshow/' + _DataDirectory + '/' + mm + '-' + dd + '.json?nocache=2025-08-02-11-33'; + const url = _UniformResourceLocator + '/slideshow/' + _DataDirectory + '/' + mm + '-' + dd + '.json?nocache=2025-08-10-15-12'; console.log(url); fetch(url, { nocache: new Date().getTime() }) .then((res) => res.text()) @@ -177,7 +177,7 @@ _hasLast = typeof window == 'undefined' ? false : window.location.href.indexOf('last') > 0; _hasList = typeof window == 'undefined' ? false : window.location.href.indexOf('list') > 0; _hasTime = typeof window == 'undefined' ? false : window.location.href.indexOf('time') > 0; - const url = uniformResourceLocator + '/slideshow/index.json?nocache=2025-08-02-11-33'; + const url = uniformResourceLocator + '/slideshow/index.json?nocache=2025-08-10-15-12'; console.log(url); fetch(url, { nocache: new Date().getTime() }) .then((res) => res.text()) @@ -225,7 +225,7 @@ } function loadLog() { - const url = _UniformResourceLocator + '/log-nginx/access.log?nocache=2025-08-02-11-33'; + const url = _UniformResourceLocator + '/log-nginx/access.log?nocache=2025-08-10-15-12'; fetch(url, { nocache: new Date().getTime() }) .then((res) => res.text()) .then((text) => {