Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Kiosk: fixing time=0 bug #6012

Merged
merged 3 commits into from
Aug 10, 2023
Merged

Kiosk: fixing time=0 bug #6012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78364c1
Kiosk: fixing time=0 bug
srietkerk Aug 8, 2023
dba9cc8
Using min, max for determining kiosk time
srietkerk Aug 9, 2023
0eea044
New kiosk build for time=0 limits
srietkerk Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/kiosk.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>MakeCode Arcade Kiosk</title>
<script defer="defer" src="/static/kiosk/static/js/main.0d14f3d0.js"></script><link href="/static/kiosk/static/css/main.5f8c7aeb.css" rel="stylesheet"></head>
<script defer="defer" src="/static/kiosk/static/js/main.b5a9c480.js"></script><link href="/static/kiosk/static/css/main.5f8c7aeb.css" rel="stylesheet"></head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>

Expand Down
6 changes: 3 additions & 3 deletions docs/static/kiosk/asset-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"files": {
"main.css": "/static/kiosk/static/css/main.5f8c7aeb.css",
"main.js": "/static/kiosk/static/js/main.0d14f3d0.js",
"main.js": "/static/kiosk/static/js/main.b5a9c480.js",
"static/js/787.709d397d.chunk.js": "/static/kiosk/static/js/787.709d397d.chunk.js",
"index.html": "/static/kiosk/index.html",
"main.5f8c7aeb.css.map": "/static/kiosk/static/css/main.5f8c7aeb.css.map",
"main.0d14f3d0.js.map": "/static/kiosk/static/js/main.0d14f3d0.js.map",
"main.b5a9c480.js.map": "/static/kiosk/static/js/main.b5a9c480.js.map",
"787.709d397d.chunk.js.map": "/static/kiosk/static/js/787.709d397d.chunk.js.map"
},
"entrypoints": [
"static/css/main.5f8c7aeb.css",
"static/js/main.0d14f3d0.js"
"static/js/main.b5a9c480.js"
]
}
1 change: 0 additions & 1 deletion docs/static/kiosk/static/js/main.0d14f3d0.js.map
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions docs/static/kiosk/static/js/main.0d14f3d0.js → docs/static/kiosk/static/js/main.b5a9c480.js
View file
Open in desktop

Large diffs are not rendered by default.

0 ...sk/static/js/main.0d14f3d0.js.LICENSE.txt → ...sk/static/js/main.b5a9c480.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions docs/static/kiosk/static/js/main.b5a9c480.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion kiosk/src/Components/AddingGame.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const AddingGame: React.FC<IProps> = ({ kiosk }) => {
return parseInt(kioskCodeTime);
} else if (kiosk.time) {
const kioskTime = parseInt(kiosk.time);
return (kioskTime > 240 ? 240 : kioskTime) * 60;
return Math.min(240, Math.max(kioskTime, 0.5)) * 60;
} else {
return 30;
}
Expand Down