feat: clock fonts and glass and tinted clock styles
images / check (push) Successful in 27s
images / image (push) Successful in 28s

This commit is contained in:
2026-11-18 16:56:46 +01:00
parent 4a4401ddb0
commit 7798432de6
14 changed files with 932 additions and 25 deletions
+2
View File
@@ -66,6 +66,8 @@ Build it yourself: `docker build -t dahoam .`
a link, `/settings`, `/add link`, `/add card` and `/sign out` run commands. a link, `/settings`, `/add link`, `/add card` and `/sign out` run commands.
- **Wallpaper**: Settings (or the pencil at the bottom right) takes an image URL or an - **Wallpaper**: Settings (or the pencil at the bottom right) takes an image URL or an
upload (JPEG, PNG, WebP, AVIF, up to 10 MB). upload (JPEG, PNG, WebP, AVIF, up to 10 MB).
- **Clock**: Settings has five fonts and three styles. Glass shows the wallpaper blurred
through the digits, Tinted takes its color from the wallpaper.
## Notes ## Notes
+2
View File
@@ -0,0 +1,2 @@
ALTER TABLE "settings" ADD COLUMN "clock_font" text DEFAULT 'serif' NOT NULL;--> statement-breakpoint
ALTER TABLE "settings" ADD COLUMN "clock_style" text DEFAULT 'solid' NOT NULL;
+679
View File
@@ -0,0 +1,679 @@
{
"id": "ac3af713-2f43-44c7-8e48-d840cfee12c0",
"prevId": "d6c6160d-4a0a-4e19-a093-40a1963aab9d",
"version": "7",
"dialect": "postgresql",
"tables": {
"public.account": {
"name": "account",
"schema": "",
"columns": {
"id": {
"name": "id",
"type": "text",
"primaryKey": true,
"notNull": true
},
"account_id": {
"name": "account_id",
"type": "text",
"primaryKey": false,
"notNull": true
},
"provider_id": {
"name": "provider_id",
"type": "text",
"primaryKey": false,
"notNull": true
},
"user_id": {
"name": "user_id",
"type": "text",
"primaryKey": false,
"notNull": true
},
"access_token": {
"name": "access_token",
"type": "text",
"primaryKey": false,
"notNull": false
},
"refresh_token": {
"name": "refresh_token",
"type": "text",
"primaryKey": false,
"notNull": false
},
"id_token": {
"name": "id_token",
"type": "text",
"primaryKey": false,
"notNull": false
},
"access_token_expires_at": {
"name": "access_token_expires_at",
"type": "timestamp",
"primaryKey": false,
"notNull": false
},
"refresh_token_expires_at": {
"name": "refresh_token_expires_at",
"type": "timestamp",
"primaryKey": false,
"notNull": false
},
"scope": {
"name": "scope",
"type": "text",
"primaryKey": false,
"notNull": false
},
"password": {
"name": "password",
"type": "text",
"primaryKey": false,
"notNull": false
},
"created_at": {
"name": "created_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
},
"updated_at": {
"name": "updated_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
}
},
"indexes": {
"account_user_id_idx": {
"name": "account_user_id_idx",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": false,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {
"account_user_id_user_id_fk": {
"name": "account_user_id_user_id_fk",
"tableFrom": "account",
"tableTo": "user",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.card": {
"name": "card",
"schema": "",
"columns": {
"id": {
"name": "id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"user_id": {
"name": "user_id",
"type": "text",
"primaryKey": false,
"notNull": true
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"created_at": {
"name": "created_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
}
},
"indexes": {
"card_user_id_idx": {
"name": "card_user_id_idx",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": false,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {
"card_user_id_user_id_fk": {
"name": "card_user_id_user_id_fk",
"tableFrom": "card",
"tableTo": "user",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.link": {
"name": "link",
"schema": "",
"columns": {
"id": {
"name": "id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"user_id": {
"name": "user_id",
"type": "text",
"primaryKey": false,
"notNull": true
},
"card_id": {
"name": "card_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"position": {
"name": "position",
"type": "integer",
"primaryKey": false,
"notNull": true,
"default": 0
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"url": {
"name": "url",
"type": "text",
"primaryKey": false,
"notNull": true
},
"icon": {
"name": "icon",
"type": "text",
"primaryKey": false,
"notNull": false
},
"created_at": {
"name": "created_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
}
},
"indexes": {
"link_user_id_idx": {
"name": "link_user_id_idx",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": false,
"concurrently": false,
"method": "btree",
"with": {}
},
"link_card_id_idx": {
"name": "link_card_id_idx",
"columns": [
{
"expression": "card_id",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": false,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {
"link_user_id_user_id_fk": {
"name": "link_user_id_user_id_fk",
"tableFrom": "link",
"tableTo": "user",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
},
"link_card_id_card_id_fk": {
"name": "link_card_id_card_id_fk",
"tableFrom": "link",
"tableTo": "card",
"columnsFrom": [
"card_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.session": {
"name": "session",
"schema": "",
"columns": {
"id": {
"name": "id",
"type": "text",
"primaryKey": true,
"notNull": true
},
"expires_at": {
"name": "expires_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true
},
"token": {
"name": "token",
"type": "text",
"primaryKey": false,
"notNull": true
},
"created_at": {
"name": "created_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
},
"updated_at": {
"name": "updated_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
},
"ip_address": {
"name": "ip_address",
"type": "text",
"primaryKey": false,
"notNull": false
},
"user_agent": {
"name": "user_agent",
"type": "text",
"primaryKey": false,
"notNull": false
},
"user_id": {
"name": "user_id",
"type": "text",
"primaryKey": false,
"notNull": true
}
},
"indexes": {
"session_user_id_idx": {
"name": "session_user_id_idx",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": false,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {
"session_user_id_user_id_fk": {
"name": "session_user_id_user_id_fk",
"tableFrom": "session",
"tableTo": "user",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {
"session_token_unique": {
"name": "session_token_unique",
"nullsNotDistinct": false,
"columns": [
"token"
]
}
},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.settings": {
"name": "settings",
"schema": "",
"columns": {
"user_id": {
"name": "user_id",
"type": "text",
"primaryKey": true,
"notNull": true
},
"title": {
"name": "title",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'Dahoam'"
},
"search_engine": {
"name": "search_engine",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'duckduckgo'"
},
"wallpaper_url": {
"name": "wallpaper_url",
"type": "text",
"primaryKey": false,
"notNull": false
},
"clock_font": {
"name": "clock_font",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'serif'"
},
"clock_style": {
"name": "clock_style",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'solid'"
}
},
"indexes": {},
"foreignKeys": {
"settings_user_id_user_id_fk": {
"name": "settings_user_id_user_id_fk",
"tableFrom": "settings",
"tableTo": "user",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.user": {
"name": "user",
"schema": "",
"columns": {
"id": {
"name": "id",
"type": "text",
"primaryKey": true,
"notNull": true
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"email": {
"name": "email",
"type": "text",
"primaryKey": false,
"notNull": true
},
"email_verified": {
"name": "email_verified",
"type": "boolean",
"primaryKey": false,
"notNull": true,
"default": false
},
"image": {
"name": "image",
"type": "text",
"primaryKey": false,
"notNull": false
},
"created_at": {
"name": "created_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
},
"updated_at": {
"name": "updated_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {
"user_email_unique": {
"name": "user_email_unique",
"nullsNotDistinct": false,
"columns": [
"email"
]
}
},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.verification": {
"name": "verification",
"schema": "",
"columns": {
"id": {
"name": "id",
"type": "text",
"primaryKey": true,
"notNull": true
},
"identifier": {
"name": "identifier",
"type": "text",
"primaryKey": false,
"notNull": true
},
"value": {
"name": "value",
"type": "text",
"primaryKey": false,
"notNull": true
},
"expires_at": {
"name": "expires_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true
},
"created_at": {
"name": "created_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
},
"updated_at": {
"name": "updated_at",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"default": "now()"
}
},
"indexes": {
"verification_identifier_idx": {
"name": "verification_identifier_idx",
"columns": [
{
"expression": "identifier",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": false,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.wallpaper": {
"name": "wallpaper",
"schema": "",
"columns": {
"user_id": {
"name": "user_id",
"type": "text",
"primaryKey": true,
"notNull": true
},
"mime": {
"name": "mime",
"type": "text",
"primaryKey": false,
"notNull": true
},
"data": {
"name": "data",
"type": "bytea",
"primaryKey": false,
"notNull": true
}
},
"indexes": {},
"foreignKeys": {
"wallpaper_user_id_user_id_fk": {
"name": "wallpaper_user_id_user_id_fk",
"tableFrom": "wallpaper",
"tableTo": "user",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"id"
],
"onDelete": "cascade",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
}
},
"enums": {},
"schemas": {},
"sequences": {},
"roles": {},
"policies": {},
"views": {},
"_meta": {
"columns": {},
"schemas": {},
"tables": {}
}
}
+7
View File
@@ -29,6 +29,13 @@
"when": 1794956525569, "when": 1794956525569,
"tag": "0003_default_title", "tag": "0003_default_title",
"breakpoints": true "breakpoints": true
},
{
"idx": 4,
"version": "7",
"when": 1795017311884,
"tag": "0004_clock",
"breakpoints": true
} }
] ]
} }
+2
View File
@@ -22,6 +22,8 @@
"@dnd-kit/sortable": "^10.0.0", "@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2", "@dnd-kit/utilities": "^3.2.2",
"@fontsource-variable/inter": "^5.3.0", "@fontsource-variable/inter": "^5.3.0",
"@fontsource-variable/nunito": "^5.3.0",
"@fontsource-variable/roboto-slab": "^5.3.0",
"@fontsource/dm-serif-display": "^5.3.0", "@fontsource/dm-serif-display": "^5.3.0",
"@tailwindcss/vite": "^4", "@tailwindcss/vite": "^4",
"@tanstack/react-devtools": "latest", "@tanstack/react-devtools": "latest",
+16
View File
@@ -178,6 +178,12 @@ importers:
'@fontsource-variable/inter': '@fontsource-variable/inter':
specifier: ^5.3.0 specifier: ^5.3.0
version: 5.3.0 version: 5.3.0
'@fontsource-variable/nunito':
specifier: ^5.3.0
version: 5.3.0
'@fontsource-variable/roboto-slab':
specifier: ^5.3.0
version: 5.3.0
'@fontsource/dm-serif-display': '@fontsource/dm-serif-display':
specifier: ^5.3.0 specifier: ^5.3.0
version: 5.3.0 version: 5.3.0
@@ -970,6 +976,12 @@ packages:
'@fontsource-variable/inter@5.3.0': '@fontsource-variable/inter@5.3.0':
resolution: {integrity: sha512-OupL48va4JNofb97w6NYeF9S7W/kHNKM0Er8Dem5nqi4jeOLrVJDoE8tZEpnMJmtkvNbB1EIPPwHcdkF6b1oUA==} resolution: {integrity: sha512-OupL48va4JNofb97w6NYeF9S7W/kHNKM0Er8Dem5nqi4jeOLrVJDoE8tZEpnMJmtkvNbB1EIPPwHcdkF6b1oUA==}
'@fontsource-variable/nunito@5.3.0':
resolution: {integrity: sha512-tw0ch7evIDSwoeUy+0XzocYHfbRWLeCRPJy22KgbrLjDLAbNw/fErBiil10Ssrs3Sjr55zaZrr36a975j8cBkQ==}
'@fontsource-variable/roboto-slab@5.3.0':
resolution: {integrity: sha512-eByKAjLM9td0qsXCOZhlUGfhsjen//epd6/cAJOg+o73RtYBijrI1jz+lTp2X0ebwTCLmKB1+Kt/QiRMgmNPTw==}
'@fontsource/dm-serif-display@5.3.0': '@fontsource/dm-serif-display@5.3.0':
resolution: {integrity: sha512-ecRclUcYeto9fB7ghkB36H4MtUoaUYFjjornWYYeLCMHzaWEDPk2kIWgZOq0mKBNRxclRSieKcFeLonlMYDTKg==} resolution: {integrity: sha512-ecRclUcYeto9fB7ghkB36H4MtUoaUYFjjornWYYeLCMHzaWEDPk2kIWgZOq0mKBNRxclRSieKcFeLonlMYDTKg==}
@@ -4254,6 +4266,10 @@ snapshots:
'@fontsource-variable/inter@5.3.0': {} '@fontsource-variable/inter@5.3.0': {}
'@fontsource-variable/nunito@5.3.0': {}
'@fontsource-variable/roboto-slab@5.3.0': {}
'@fontsource/dm-serif-display@5.3.0': {} '@fontsource/dm-serif-display@5.3.0': {}
'@humanfs/core@0.19.2': '@humanfs/core@0.19.2':
+76 -13
View File
@@ -1,4 +1,6 @@
import { useSyncExternalStore } from "react" import { useSyncExternalStore } from "react"
import { WallpaperImage } from "@/components/wallpaper"
import type { ClockFont, ClockStyle } from "@/lib/clock"
import { cn } from "@/vendor/collabry/lib/cn" import { cn } from "@/vendor/collabry/lib/cn"
const subscribe = (tick: () => void) => { const subscribe = (tick: () => void) => {
@@ -8,7 +10,29 @@ const subscribe = (tick: () => void) => {
// changes once a minute, so the clock re-renders once a minute // changes once a minute, so the clock re-renders once a minute
const currentMinute = () => Math.floor(Date.now() / 60_000) const currentMinute = () => Math.floor(Date.now() / 60_000)
export function Clock() { const FONTS: Record<ClockFont, string> = {
serif: "font-serif tracking-wide",
sans: "font-sans font-bold tracking-tight",
light: "font-sans font-extralight tracking-tight",
rounded: "font-rounded font-extrabold",
slab: "font-slab font-semibold",
}
// What the wallpaper looks like through the digits, and how much white is in the glass.
const GLASS: Record<Exclude<ClockStyle, "solid">, [string, string]> = {
glass: ["blur-xl saturate-150 brightness-150", "bg-white/45"],
tinted: ["blur-3xl saturate-150 brightness-150", "bg-white/20"],
}
export function Clock({
font,
look,
wallpaper,
}: {
font: ClockFont
look: ClockStyle
wallpaper: string | null
}) {
// null on the server: its clock and locale are not the visitor's // null on the server: its clock and locale are not the visitor's
const minute = useSyncExternalStore<number | null>( const minute = useSyncExternalStore<number | null>(
subscribe, subscribe,
@@ -29,14 +53,23 @@ export function Clock() {
.trim() .trim()
const period = parts.find((p) => p.type === "dayPeriod")?.value const period = parts.find((p) => p.type === "dayPeriod")?.value
return ( // Each piece fades in by itself. Opacity on a common parent would cut the
<div // glass off from the wallpaper it blends with.
className={cn( const fade = cn("transition-opacity duration-500", !now && "opacity-0")
"flex flex-col items-center text-white transition-opacity duration-500 [text-shadow:0_2px_24px_rgb(0_0_0/0.45)]", const digits = (
!now && "opacity-0" <>
{time || "0:00"}
{period && (
<span className="absolute top-1 left-full ml-2 text-xl tracking-normal sm:top-3 sm:ml-4 sm:text-3xl">
{period}
</span>
)} )}
> </>
<p className="text-lg font-medium sm:text-xl"> )
return (
<div className="flex flex-col items-center text-white [text-shadow:0_2px_24px_rgb(0_0_0/0.45)]">
<p className={cn("text-lg font-medium sm:text-xl", fade)}>
{now {now
? now.toLocaleDateString(undefined, { ? now.toLocaleDateString(undefined, {
weekday: "long", weekday: "long",
@@ -47,13 +80,43 @@ export function Clock() {
</p> </p>
<time <time
dateTime={now?.toISOString()} dateTime={now?.toISOString()}
className="relative mt-2 font-serif text-7xl leading-none tracking-wide sm:text-[9.5rem]" className={cn(
"relative mt-2 text-7xl leading-none sm:text-[9.5rem]",
FONTS[font]
)}
> >
{time || "0:00"} {look === "solid" ? (
{period && ( <span className={cn("block", fade)}>{digits}</span>
<span className="absolute top-1 left-full ml-2 text-xl tracking-normal sm:top-3 sm:ml-4 sm:text-3xl"> ) : (
{period} <>
{/* the real text: it sets the size and casts the shadow */}
<span className={cn("block text-transparent", fade)}>{digits}</span>
{/* The glass. A blurred copy of the wallpaper lies exactly on the real
one. Multiplying it with white digits on black leaves it only inside
the digits, and screen drops the black. The clip keeps the copy
inside the clock, with room for AM/PM on the right. */}
<span
aria-hidden
className="absolute inset-0 isolate mix-blend-screen [clip-path:inset(-0.1em_-1em_-0.1em_-0.1em)] [text-shadow:none]"
>
<span className={cn("fixed inset-0", fade)}>
<WallpaperImage src={wallpaper} className={GLASS[look][0]} />
<span className={cn("fixed inset-0", GLASS[look][1])} />
</span> </span>
<span className="absolute inset-0 bg-black mix-blend-multiply shadow-[0_0_0_100vmax_#000]">
{digits}
</span>
{/* light on the edges: only the shadows show, the black digits drop out */}
<span
className={cn(
"absolute inset-0 text-black mix-blend-screen [text-shadow:0_-1px_0.5px_#aaa,0_1px_0.5px_#444]",
fade
)}
>
{digits}
</span>
</span>
</>
)} )}
</time> </time>
</div> </div>
+18 -3
View File
@@ -1,22 +1,37 @@
import { cn } from "@/vendor/collabry/lib/cn"
export const DEFAULT_WALLPAPER = "/wallpaper.jpg" export const DEFAULT_WALLPAPER = "/wallpaper.jpg"
function showDefault(img: HTMLImageElement) { function showDefault(img: HTMLImageElement) {
if (!img.src.endsWith(DEFAULT_WALLPAPER)) img.src = DEFAULT_WALLPAPER if (!img.src.endsWith(DEFAULT_WALLPAPER)) img.src = DEFAULT_WALLPAPER
} }
export function Wallpaper({ src }: { src?: string | null }) { /** The wallpaper over the whole window. Falls back to the default photo. */
export function WallpaperImage({
src,
className,
}: {
src?: string | null
className?: string
}) {
return ( return (
<div className="fixed inset-0 -z-10 bg-black" aria-hidden>
<img <img
src={src ?? DEFAULT_WALLPAPER} src={src ?? DEFAULT_WALLPAPER}
alt="" alt=""
className="size-full object-cover" className={cn("fixed inset-0 size-full object-cover", className)}
// an image that failed before hydration never fires onError // an image that failed before hydration never fires onError
ref={(img) => { ref={(img) => {
if (img?.complete && img.naturalWidth === 0) showDefault(img) if (img?.complete && img.naturalWidth === 0) showDefault(img)
}} }}
onError={(e) => showDefault(e.currentTarget)} onError={(e) => showDefault(e.currentTarget)}
/> />
)
}
export function Wallpaper({ src }: { src?: string | null }) {
return (
<div className="fixed inset-0 -z-10 bg-black" aria-hidden>
<WallpaperImage src={src} />
<div className="absolute inset-0 wallpaper-dither" /> <div className="absolute inset-0 wallpaper-dither" />
</div> </div>
) )
+9
View File
@@ -127,6 +127,15 @@ export const settings = pgTable("settings", {
.default("duckduckgo"), .default("duckduckgo"),
// null = bundled default wallpaper // null = bundled default wallpaper
wallpaperUrl: text("wallpaper_url"), wallpaperUrl: text("wallpaper_url"),
// the big clock, see src/lib/clock.ts
clockFont: text("clock_font", {
enum: ["serif", "sans", "light", "rounded", "slab"],
})
.notNull()
.default("serif"),
clockStyle: text("clock_style", { enum: ["solid", "glass", "tinted"] })
.notNull()
.default("solid"),
}) })
export const wallpaper = pgTable("wallpaper", { export const wallpaper = pgTable("wallpaper", {
+27
View File
@@ -0,0 +1,27 @@
// How the big clock on the dashboard looks. The choices are stored per user.
export const CLOCK_FONTS = [
"serif",
"sans",
"light",
"rounded",
"slab",
] as const
export type ClockFont = (typeof CLOCK_FONTS)[number]
export const CLOCK_FONT_NAMES: Record<ClockFont, string> = {
serif: "Serif",
sans: "Sans",
light: "Light",
rounded: "Rounded",
slab: "Slab",
}
export const CLOCK_STYLES = ["solid", "glass", "tinted"] as const
export type ClockStyle = (typeof CLOCK_STYLES)[number]
export const CLOCK_STYLE_NAMES: Record<ClockStyle, string> = {
solid: "Solid",
glass: "Glass",
tinted: "Tinted",
}
+5
View File
@@ -5,6 +5,7 @@ import { z } from "zod"
import { db } from "@/db" import { db } from "@/db"
import { card, link, settings, wallpaper } from "@/db/schema" import { card, link, settings, wallpaper } from "@/db/schema"
import { auth, requireUser, signUpEnabled, ssoName } from "@/lib/auth" import { auth, requireUser, signUpEnabled, ssoName } from "@/lib/auth"
import { CLOCK_FONTS, CLOCK_STYLES } from "@/lib/clock"
import { ENGINES, parseSuggestions } from "@/lib/search" import { ENGINES, parseSuggestions } from "@/lib/search"
const httpUrl = z.url({ protocol: /^https?$/ }).max(2000) const httpUrl = z.url({ protocol: /^https?$/ }).max(2000)
@@ -74,6 +75,8 @@ export const getDashboard = createServerFn({ method: "GET" }).handler(
title: s?.title ?? "Dahoam", title: s?.title ?? "Dahoam",
searchEngine: s?.searchEngine ?? "duckduckgo", searchEngine: s?.searchEngine ?? "duckduckgo",
wallpaperUrl: s?.wallpaperUrl ?? null, wallpaperUrl: s?.wallpaperUrl ?? null,
clockFont: s?.clockFont ?? "serif",
clockStyle: s?.clockStyle ?? "solid",
searxngUrl: process.env.SEARXNG_URL || null, searxngUrl: process.env.SEARXNG_URL || null,
} }
} }
@@ -187,6 +190,8 @@ export const saveSettings = createServerFn({ method: "POST" })
wallpaperUrl: z wallpaperUrl: z
.union([httpUrl, z.string().regex(/^\/api\/wallpaper\?v=\d+$/)]) .union([httpUrl, z.string().regex(/^\/api\/wallpaper\?v=\d+$/)])
.nullable(), .nullable(),
clockFont: z.enum(CLOCK_FONTS),
clockStyle: z.enum(CLOCK_STYLES),
}) })
.partial() .partial()
.refine((patch) => Object.keys(patch).length > 0) .refine((patch) => Object.keys(patch).length > 0)
+5 -1
View File
@@ -72,7 +72,11 @@ function Dashboard() {
{/* Spare height: one part above the clock, three parts below the cards. {/* Spare height: one part above the clock, three parts below the cards.
A short window keeps only the minimum here, a tall one stays balanced. */} A short window keeps only the minimum here, a tall one stays balanced. */}
<div className="min-h-8 flex-1" /> <div className="min-h-8 flex-1" />
<Clock /> <Clock
font={data.clockFont}
look={data.clockStyle}
wallpaper={data.wallpaperUrl}
/>
<div className="mt-8 flex w-full justify-center sm:mt-10"> <div className="mt-8 flex w-full justify-center sm:mt-10">
<SearchBar <SearchBar
+71
View File
@@ -10,6 +10,7 @@ import {
ArrowLeft, ArrowLeft,
Check, Check,
CircleUser, CircleUser,
Clock,
Image, Image,
LogOut, LogOut,
Search, Search,
@@ -19,6 +20,13 @@ import {
import { Logo } from "@/components/logo" import { Logo } from "@/components/logo"
import { DEFAULT_WALLPAPER } from "@/components/wallpaper" import { DEFAULT_WALLPAPER } from "@/components/wallpaper"
import { authClient } from "@/lib/auth-client" import { authClient } from "@/lib/auth-client"
import {
CLOCK_FONTS,
CLOCK_FONT_NAMES,
CLOCK_STYLES,
CLOCK_STYLE_NAMES,
} from "@/lib/clock"
import type { ClockFont, ClockStyle } from "@/lib/clock"
import { getDashboard, saveSettings } from "@/lib/dashboard.functions" import { getDashboard, saveSettings } from "@/lib/dashboard.functions"
import { ENGINES, ENGINE_NAMES } from "@/lib/search" import { ENGINES, ENGINE_NAMES } from "@/lib/search"
import type { Engine } from "@/lib/search" import type { Engine } from "@/lib/search"
@@ -68,6 +76,7 @@ export const Route = createFileRoute("/settings")({
const SECTIONS = [ const SECTIONS = [
{ id: "general", label: "General", icon: SlidersHorizontal }, { id: "general", label: "General", icon: SlidersHorizontal },
{ id: "clock", label: "Clock", icon: Clock },
{ id: "search", label: "Search", icon: Search }, { id: "search", label: "Search", icon: Search },
{ id: "wallpaper", label: "Wallpaper", icon: Image }, { id: "wallpaper", label: "Wallpaper", icon: Image },
{ id: "account", label: "Account", icon: CircleUser }, { id: "account", label: "Account", icon: CircleUser },
@@ -97,6 +106,8 @@ function Settings() {
title?: string title?: string
searchEngine?: Engine searchEngine?: Engine
wallpaperUrl?: string | null wallpaperUrl?: string | null
clockFont?: ClockFont
clockStyle?: ClockStyle
}) => run(() => saveSettings({ data: patch })) }) => run(() => saveSettings({ data: patch }))
const upload = (image: File) => const upload = (image: File) =>
run(async () => { run(async () => {
@@ -215,6 +226,66 @@ function Settings() {
</SettingsRow> </SettingsRow>
</SettingsSection> </SettingsSection>
<SettingsSection id="clock" className={section}>
<SettingsSectionHeader>
<SettingsSectionTitle>Clock</SettingsSectionTitle>
<SettingsSectionDescription>
How the time on the dashboard looks.
</SettingsSectionDescription>
</SettingsSectionHeader>
<SettingsRow>
<SettingsRowText>
<div id="settings-font" className="leading-tight font-bold">
Font
</div>
</SettingsRowText>
<SettingsRowControl>
<SegmentedControl
aria-labelledby="settings-font"
size="md"
value={data.clockFont}
onValueChange={(v) => save({ clockFont: v as ClockFont })}
>
{CLOCK_FONTS.map((f) => (
<SegmentedControlItem key={f} value={f}>
{CLOCK_FONT_NAMES[f]}
</SegmentedControlItem>
))}
</SegmentedControl>
</SettingsRowControl>
</SettingsRow>
<SettingsRow>
<SettingsRowText>
<div
id="settings-style"
className="leading-tight font-bold"
>
Style
</div>
<SettingsRowDescription>
Glass shows the wallpaper blurred through the digits.
Tinted takes its color from the wallpaper.
</SettingsRowDescription>
</SettingsRowText>
<SettingsRowControl>
<SegmentedControl
aria-labelledby="settings-style"
size="md"
value={data.clockStyle}
onValueChange={(v) =>
save({ clockStyle: v as ClockStyle })
}
>
{CLOCK_STYLES.map((s) => (
<SegmentedControlItem key={s} value={s}>
{CLOCK_STYLE_NAMES[s]}
</SegmentedControlItem>
))}
</SegmentedControl>
</SettingsRowControl>
</SettingsRow>
</SettingsSection>
<SettingsSection id="search" className={section}> <SettingsSection id="search" className={section}>
<SettingsSectionHeader> <SettingsSectionHeader>
<SettingsSectionTitle>Search</SettingsSectionTitle> <SettingsSectionTitle>Search</SettingsSectionTitle>
+5
View File
@@ -2,10 +2,15 @@
@import "./vendor/collabry/styles/index.css"; @import "./vendor/collabry/styles/index.css";
@import "@fontsource-variable/inter"; @import "@fontsource-variable/inter";
@import "@fontsource/dm-serif-display"; @import "@fontsource/dm-serif-display";
/* only for the clock, and only downloaded when chosen in the settings */
@import "@fontsource-variable/nunito";
@import "@fontsource-variable/roboto-slab";
@theme inline { @theme inline {
--font-sans: "Inter Variable", system-ui, sans-serif; --font-sans: "Inter Variable", system-ui, sans-serif;
--font-serif: "DM Serif Display", ui-serif, Georgia, serif; --font-serif: "DM Serif Display", ui-serif, Georgia, serif;
--font-rounded: "Nunito Variable", ui-rounded, system-ui, sans-serif;
--font-slab: "Roboto Slab Variable", ui-serif, Georgia, serif;
} }
/* The accent is near white here (set on ThemeProvider), so text on it is dark */ /* The accent is near white here (set on ThemeProvider), so text on it is dark */