Skip to content

Commit b2dbc77

Browse files
authored
Merge pull request #720 from damongolding/task/release
Task/release
2 parents 9bd7662 + f445629 commit b2dbc77

54 files changed

Lines changed: 918 additions & 722 deletions

Some content is hidden

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

.zed/settings.json

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,41 @@
33
// For a full list of overridable settings, and general information on folder-specific settings,
44
// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
55
{
6+
"lsp": {
7+
"biome": {
8+
"settings": {
9+
"require_config_file": true,
10+
},
11+
},
12+
},
613
"languages": {
14+
"CSS": {
15+
"formatter": { "language_server": { "name": "biome" } },
16+
"code_actions_on_format": {
17+
"source.action.useSortedProperties.biome": true,
18+
"source.fixAll.biome": true,
19+
},
20+
},
721
"JavaScript": {
8-
"formatter": {
9-
"external": {
10-
"command": "./frontend/node_modules/.bin/biome",
11-
"arguments": [
12-
"check",
13-
"--stdin-file-path",
14-
"{buffer_path}",
15-
"--write"
16-
]
17-
}
18-
}
22+
"formatter": { "language_server": { "name": "biome" } },
23+
"code_actions_on_format": {
24+
"source.fixAll.biome": true,
25+
"source.organizeImports.biome": true,
26+
},
1927
},
2028
"TypeScript": {
21-
"formatter": {
22-
"external": {
23-
"command": "./frontend/node_modules/.bin/biome",
24-
"arguments": [
25-
"check",
26-
"--stdin-file-path",
27-
"{buffer_path}",
28-
"--write"
29-
]
30-
}
31-
}
32-
}
33-
}
29+
"formatter": { "language_server": { "name": "biome" } },
30+
"code_actions_on_format": {
31+
"source.fixAll.biome": true,
32+
"source.organizeImports.biome": true,
33+
},
34+
},
35+
"TSX": {
36+
"formatter": { "language_server": { "name": "biome" } },
37+
"code_actions_on_format": {
38+
"source.fixAll.biome": true,
39+
"source.organizeImports.biome": true,
40+
},
41+
},
42+
},
3443
}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN bun run css && bun run js && bun run url-builder
1010

1111

1212
# Go Builder
13-
FROM --platform=$BUILDPLATFORM golang:1.26.1-bookworm AS build
13+
FROM --platform=$BUILDPLATFORM golang:1.26.2-bookworm AS build
1414

1515
ARG VERSION=demo
1616
ARG TARGETOS

biome.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,11 @@
33
"enabled": true,
44
"indentStyle": "space",
55
"indentWidth": 4
6+
},
7+
"linter": {
8+
"enabled": true
9+
},
10+
"assist": {
11+
"enabled": true
612
}
713
}

config.example.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ use_original_image: false # use the original file.
9595
show_videos: false
9696
live_photos: false
9797
live_photo_loop_delay: 0
98+
show_animated_gifs: false
9899

99100
## Image METADATA
100101
show_image_rating: false

config.schema.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
],
2424
"examples": ["12", "24"]
2525
},
26+
"show_seconds": {
27+
"type": "boolean",
28+
"default": false,
29+
"description": "Show seconds when displaying clock"
30+
},
2631
"show_am_pm": {
2732
"type": "boolean"
2833
},
@@ -158,6 +163,11 @@
158163
"live_photo_loop_delay": {
159164
"type": "integer"
160165
},
166+
"show_animated_gifs": {
167+
"type": "boolean",
168+
"default": false,
169+
"description": "Show animated GIFs"
170+
},
161171
"menu_position": {
162172
"type": "string"
163173
},

docker-compose-env.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ services:
7070
KIOSK_SHOW_VIDEOS: false
7171
KIOSK_LIVE_PHOTOS: false
7272
KIOSK_LIVE_PHOTO_LOOP_DELAY: 0
73+
KIOSK_SHOW_ANIMATED_GIFS: false
7374
# Image metadata
7475
KIOSK_SHOW_IMAGE_RATING: false
7576
KIOSK_SHOW_OWNER: false

frontend/biome.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"files": {
99
"ignoreUnknown": true,
1010
"includes": [
11+
"**/*.css",
1112
"**/*.ts",
1213
"**/*.js",
1314
"**/*.tsx",
@@ -26,11 +27,18 @@
2627
"noDuplicateProperties": "off"
2728
},
2829
"correctness": {
29-
"noUnknownProperty": "off"
30+
"noUnknownProperty": {
31+
"options": {
32+
"ignore": ["font-smoothing", "-webkit-perspective"]
33+
}
34+
}
3035
},
3136
"style": {
3237
"noDescendingSpecificity": "off"
3338
},
39+
"complexity": {
40+
"noImportantStyles": "off"
41+
},
3442
"recommended": true
3543
}
3644
},
@@ -48,6 +56,7 @@
4856
"enabled": true,
4957
"actions": {
5058
"source": {
59+
"useSortedProperties": "on",
5160
"organizeImports": "on"
5261
}
5362
}

frontend/bun.lock

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

frontend/package.json

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"lint": "bunx --bun biome lint --write",
88
"js": "bunx --bun esbuild 'src/ts/kiosk.ts' --format=iife --global-name=kiosk --bundle --minify --target=es6 --outfile=./public/assets/js/kiosk.js",
99
"css": "bunx --bun esbuild --bundle --loader:.css=css --external:*.woff --external:*.woff2 --external:*.ttf 'src/css/kiosk.css' --outfile=./public/assets/css/kiosk.css && bun run css:postcss",
10-
"css:postcss": "postcss ./public/assets/css/kiosk.css --no-map -o ./public/assets/css/kiosk.css",
10+
"css:postcss": "bunx --bun postcss ./public/assets/css/kiosk.css --no-map -o ./public/assets/css/kiosk.css",
1111
"build": "bun run test && bun run css && bun run js && bun run url-builder",
1212
"url-builder": "bunx --bun esbuild 'src/ts/url-builder.ts' --format=iife --global-name=urlBuilder --bundle --minify --target=es6 --outfile=./public/assets/js/url-builder.js",
1313
"test": "tsc --noEmit"
@@ -18,31 +18,33 @@
1818
"devEngines": {
1919
"runtime": {
2020
"name": "bun",
21-
"version": "1.3.9"
21+
"version": "1.3.12"
2222
},
2323
"packageManager": {
2424
"name": "bun",
25-
"version": "1.3.9"
25+
"version": "1.3.12"
2626
}
2727
},
2828
"devDependencies": {
29-
"@biomejs/biome": "^2.4.8",
30-
"autoprefixer": "^10.4.27",
31-
"choices.js": "^11.2.1",
29+
"@biomejs/biome": "^2.4.12",
30+
"autoprefixer": "^10.5.0",
31+
"choices.js": "^11.2.2",
3232
"date-fns": "^4.1.0",
33-
"dompurify": "^3.3.3",
34-
"esbuild": "^0.27.4",
33+
"dompurify": "^3.4.0",
34+
"esbuild": "^0.28.0",
3535
"htmx.org": "^2.0.8",
36-
"postcss": "^8.5.8",
36+
"postcss": "^8.5.9",
3737
"postcss-cli": "^11.0.1",
3838
"postcss-nested": "^7.0.2",
3939
"typescript": "^5.9.3"
4040
},
4141
"browserslist": [
42-
"> 0.2%",
43-
"not ios 11",
44-
"not android 136",
45-
"not op_mini all",
46-
"not IE 11"
42+
"chrome >= 106",
43+
"edge >= 106",
44+
"opera >= 92",
45+
"samsung >= 19",
46+
"and_chr >= 106",
47+
"firefox >= 107",
48+
"safari >= 16.1"
4749
]
4850
}

frontend/postcss.config.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
/** @type {import('postcss-load-config').Config} */
22
const config = {
33
plugins: [
4-
require("autoprefixer")({
5-
overrideBrowserslist: ["> 0.01%"],
6-
}),
4+
require("autoprefixer"),
75
require("postcss-nested"),
86
],
97
};

0 commit comments

Comments
 (0)