diff --git a/package-lock.json b/package-lock.json index 23255c4..46504c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -357,7 +357,6 @@ "integrity": "sha512-neCNfVxOoE7DsqDB5m1hEwxCwaTRdF6g5Nxq21FaDpSg0TpAdwzYlhHDhaCcriTOP0WhdYBn4l0TRRLP3bPDQQ==", "devOptional": true, "license": "MIT", - "peer": true, "dependencies": { "@rspack/core": "1.5.5", "@rspack/lite-tapable": "~1.0.1", @@ -618,7 +617,6 @@ "integrity": "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==", "devOptional": true, "license": "Apache-2.0", - "peer": true, "dependencies": { "tslib": "^2.8.0" } @@ -654,7 +652,6 @@ "integrity": "sha512-hHkbU/eoO3EG5/MZkuFSKmYqPbSVk5byPFa3e7y/8TybHiLMACgI8seVYlicwk7H5K/rI2px9xrQp/C+AUDTiQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "csstype": "^3.0.2" } @@ -675,7 +672,6 @@ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -893,7 +889,6 @@ "integrity": "sha512-QePbBFMJFjgmlE+cXAlbHZbHpdFVS2E/6vzCy7aKlebddvl1vadiC4JFV5u/wqTkNUwEV8WrQi257jf5f06hrg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", @@ -1527,7 +1522,6 @@ "resolved": "https://registry.npmjs.org/react/-/react-19.1.1.tgz", "integrity": "sha512-w8nqGImo45dmMIfljjMwOGtbmC/mk4CMYhWIicdSflH91J9TyCyczcPFXJzrZ/ZXcgGRFeP6BU0BEJTw6tZdfQ==", "license": "MIT", - "peer": true, "engines": { "node": ">=0.10.0" } @@ -1537,7 +1531,6 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.1.tgz", "integrity": "sha512-Dlq/5LAZgF0Gaz6yiqZCf6VCcZs1ghAJyrsu84Q/GT0gV+mCxbfmKNoGRKBYMJ8IEdGPqu49YWXD02GCknEDkw==", "license": "MIT", - "peer": true, "dependencies": { "scheduler": "^0.26.0" }, @@ -1551,7 +1544,6 @@ "integrity": "sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=0.10.0" } diff --git a/rsbuild.config.mjs b/rsbuild.config.mjs index 05caee9..a346fb5 100644 --- a/rsbuild.config.mjs +++ b/rsbuild.config.mjs @@ -5,7 +5,7 @@ import { pluginTypedCSSModules } from "@rsbuild/plugin-typed-css-modules"; export default defineConfig({ plugins: [pluginReact(), pluginTypedCSSModules()], output: { - assetPrefix: "/newtabplus/", + assetPrefix: ".", cssModules: { auto: (resource) => { return resource.includes("") || resource.includes(".module."); diff --git a/src/WidgetMap.tsx b/src/WidgetMap.tsx index aaa031d..6864628 100644 --- a/src/WidgetMap.tsx +++ b/src/WidgetMap.tsx @@ -17,6 +17,7 @@ const WidgetMap = { size: { width: 4, height: 2 }, settings: { use24HourClock: false, + showAMPM: false, showDate: true, showYear: true, } satisfies ClockSettings, diff --git a/src/widgets/Clock.css b/src/widgets/Clock.css index d8d4b74..a632bea 100644 --- a/src/widgets/Clock.css +++ b/src/widgets/Clock.css @@ -15,6 +15,7 @@ } .clock { + text-wrap-mode: nowrap; font-size: 4rem; font-weight: 700; } diff --git a/src/widgets/Clock.tsx b/src/widgets/Clock.tsx index e506344..c26902f 100644 --- a/src/widgets/Clock.tsx +++ b/src/widgets/Clock.tsx @@ -4,6 +4,7 @@ import styles from "./Clock.css"; export interface ClockSettings { use24HourClock: boolean; + showAMPM: boolean; showDate: boolean; showYear: boolean; } @@ -28,7 +29,12 @@ export function Clock({ settings }: WidgetState) { ? date.getHours() : date.getHours() % 12 || 12) + ":" + - date.getMinutes().toString().padStart(2, "0")} + date.getMinutes().toString().padStart(2, "0") + + (!settings.use24HourClock && settings.showAMPM + ? date.getHours() > 11 + ? " PM" + : " AM" + : "")} {settings.showDate && (