feat: clock fonts and glass and tinted clock styles
This commit is contained in:
+77
-14
@@ -1,4 +1,6 @@
|
||||
import { useSyncExternalStore } from "react"
|
||||
import { WallpaperImage } from "@/components/wallpaper"
|
||||
import type { ClockFont, ClockStyle } from "@/lib/clock"
|
||||
import { cn } from "@/vendor/collabry/lib/cn"
|
||||
|
||||
const subscribe = (tick: () => void) => {
|
||||
@@ -8,7 +10,29 @@ const subscribe = (tick: () => void) => {
|
||||
// changes once a minute, so the clock re-renders once a minute
|
||||
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
|
||||
const minute = useSyncExternalStore<number | null>(
|
||||
subscribe,
|
||||
@@ -29,14 +53,23 @@ export function Clock() {
|
||||
.trim()
|
||||
const period = parts.find((p) => p.type === "dayPeriod")?.value
|
||||
|
||||
return (
|
||||
<div
|
||||
className={cn(
|
||||
"flex flex-col items-center text-white transition-opacity duration-500 [text-shadow:0_2px_24px_rgb(0_0_0/0.45)]",
|
||||
!now && "opacity-0"
|
||||
// Each piece fades in by itself. Opacity on a common parent would cut the
|
||||
// glass off from the wallpaper it blends with.
|
||||
const fade = cn("transition-opacity duration-500", !now && "opacity-0")
|
||||
const digits = (
|
||||
<>
|
||||
{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.toLocaleDateString(undefined, {
|
||||
weekday: "long",
|
||||
@@ -47,13 +80,43 @@ export function Clock() {
|
||||
</p>
|
||||
<time
|
||||
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"}
|
||||
{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>
|
||||
{look === "solid" ? (
|
||||
<span className={cn("block", fade)}>{digits}</span>
|
||||
) : (
|
||||
<>
|
||||
{/* 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 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>
|
||||
</div>
|
||||
|
||||
@@ -1,22 +1,37 @@
|
||||
import { cn } from "@/vendor/collabry/lib/cn"
|
||||
|
||||
export const DEFAULT_WALLPAPER = "/wallpaper.jpg"
|
||||
|
||||
function showDefault(img: HTMLImageElement) {
|
||||
if (!img.src.endsWith(DEFAULT_WALLPAPER)) img.src = DEFAULT_WALLPAPER
|
||||
}
|
||||
|
||||
/** The wallpaper over the whole window. Falls back to the default photo. */
|
||||
export function WallpaperImage({
|
||||
src,
|
||||
className,
|
||||
}: {
|
||||
src?: string | null
|
||||
className?: string
|
||||
}) {
|
||||
return (
|
||||
<img
|
||||
src={src ?? DEFAULT_WALLPAPER}
|
||||
alt=""
|
||||
className={cn("fixed inset-0 size-full object-cover", className)}
|
||||
// an image that failed before hydration never fires onError
|
||||
ref={(img) => {
|
||||
if (img?.complete && img.naturalWidth === 0) showDefault(img)
|
||||
}}
|
||||
onError={(e) => showDefault(e.currentTarget)}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
export function Wallpaper({ src }: { src?: string | null }) {
|
||||
return (
|
||||
<div className="fixed inset-0 -z-10 bg-black" aria-hidden>
|
||||
<img
|
||||
src={src ?? DEFAULT_WALLPAPER}
|
||||
alt=""
|
||||
className="size-full object-cover"
|
||||
// an image that failed before hydration never fires onError
|
||||
ref={(img) => {
|
||||
if (img?.complete && img.naturalWidth === 0) showDefault(img)
|
||||
}}
|
||||
onError={(e) => showDefault(e.currentTarget)}
|
||||
/>
|
||||
<WallpaperImage src={src} />
|
||||
<div className="absolute inset-0 wallpaper-dither" />
|
||||
</div>
|
||||
)
|
||||
|
||||
@@ -127,6 +127,15 @@ export const settings = pgTable("settings", {
|
||||
.default("duckduckgo"),
|
||||
// null = bundled default wallpaper
|
||||
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", {
|
||||
|
||||
@@ -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,6 +5,7 @@ import { z } from "zod"
|
||||
import { db } from "@/db"
|
||||
import { card, link, settings, wallpaper } from "@/db/schema"
|
||||
import { auth, requireUser, signUpEnabled, ssoName } from "@/lib/auth"
|
||||
import { CLOCK_FONTS, CLOCK_STYLES } from "@/lib/clock"
|
||||
import { ENGINES, parseSuggestions } from "@/lib/search"
|
||||
|
||||
const httpUrl = z.url({ protocol: /^https?$/ }).max(2000)
|
||||
@@ -74,6 +75,8 @@ export const getDashboard = createServerFn({ method: "GET" }).handler(
|
||||
title: s?.title ?? "Dahoam",
|
||||
searchEngine: s?.searchEngine ?? "duckduckgo",
|
||||
wallpaperUrl: s?.wallpaperUrl ?? null,
|
||||
clockFont: s?.clockFont ?? "serif",
|
||||
clockStyle: s?.clockStyle ?? "solid",
|
||||
searxngUrl: process.env.SEARXNG_URL || null,
|
||||
}
|
||||
}
|
||||
@@ -187,6 +190,8 @@ export const saveSettings = createServerFn({ method: "POST" })
|
||||
wallpaperUrl: z
|
||||
.union([httpUrl, z.string().regex(/^\/api\/wallpaper\?v=\d+$/)])
|
||||
.nullable(),
|
||||
clockFont: z.enum(CLOCK_FONTS),
|
||||
clockStyle: z.enum(CLOCK_STYLES),
|
||||
})
|
||||
.partial()
|
||||
.refine((patch) => Object.keys(patch).length > 0)
|
||||
|
||||
@@ -72,7 +72,11 @@ function Dashboard() {
|
||||
{/* 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. */}
|
||||
<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">
|
||||
<SearchBar
|
||||
|
||||
@@ -10,6 +10,7 @@ import {
|
||||
ArrowLeft,
|
||||
Check,
|
||||
CircleUser,
|
||||
Clock,
|
||||
Image,
|
||||
LogOut,
|
||||
Search,
|
||||
@@ -19,6 +20,13 @@ import {
|
||||
import { Logo } from "@/components/logo"
|
||||
import { DEFAULT_WALLPAPER } from "@/components/wallpaper"
|
||||
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 { ENGINES, ENGINE_NAMES } from "@/lib/search"
|
||||
import type { Engine } from "@/lib/search"
|
||||
@@ -68,6 +76,7 @@ export const Route = createFileRoute("/settings")({
|
||||
|
||||
const SECTIONS = [
|
||||
{ id: "general", label: "General", icon: SlidersHorizontal },
|
||||
{ id: "clock", label: "Clock", icon: Clock },
|
||||
{ id: "search", label: "Search", icon: Search },
|
||||
{ id: "wallpaper", label: "Wallpaper", icon: Image },
|
||||
{ id: "account", label: "Account", icon: CircleUser },
|
||||
@@ -97,6 +106,8 @@ function Settings() {
|
||||
title?: string
|
||||
searchEngine?: Engine
|
||||
wallpaperUrl?: string | null
|
||||
clockFont?: ClockFont
|
||||
clockStyle?: ClockStyle
|
||||
}) => run(() => saveSettings({ data: patch }))
|
||||
const upload = (image: File) =>
|
||||
run(async () => {
|
||||
@@ -215,6 +226,66 @@ function Settings() {
|
||||
</SettingsRow>
|
||||
</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}>
|
||||
<SettingsSectionHeader>
|
||||
<SettingsSectionTitle>Search</SettingsSectionTitle>
|
||||
|
||||
@@ -2,10 +2,15 @@
|
||||
@import "./vendor/collabry/styles/index.css";
|
||||
@import "@fontsource-variable/inter";
|
||||
@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 {
|
||||
--font-sans: "Inter Variable", system-ui, sans-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 */
|
||||
|
||||
Reference in New Issue
Block a user