mirror of
https://github.com/aaronpo97/the-biergarten-app.git
synced 2026-04-05 18:09:04 +00:00
Update prettier, format codebase
This commit is contained in:
Aaron Po
@@ -2,3 +2,6 @@ build
|
||||
node_modules
|
||||
.react-router
|
||||
package-lock.json
|
||||
storybook-static
|
||||
test-results
|
||||
debug-storybook.log
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
{
|
||||
"$schema": "https://json.schemastore.org/prettierrc",
|
||||
"printWidth": 100,
|
||||
"singleQuote": false,
|
||||
"singleQuote": true,
|
||||
"trailingComma": "all",
|
||||
"semi": true,
|
||||
"tabWidth": 2,
|
||||
"tabWidth": 3,
|
||||
"useTabs": false,
|
||||
"arrowParens": "always"
|
||||
"arrowParens": "always",
|
||||
"endOfLine": "lf"
|
||||
}
|
||||
|
||||
@@ -1,30 +1,30 @@
|
||||
import type { StorybookConfig } from "@storybook/react-vite";
|
||||
import type { StorybookConfig } from '@storybook/react-vite';
|
||||
|
||||
const config: StorybookConfig = {
|
||||
stories: [
|
||||
"../stories/Configure.mdx",
|
||||
"../stories/SubmitButton.stories.tsx",
|
||||
"../stories/FormField.stories.tsx",
|
||||
"../stories/Navbar.stories.tsx",
|
||||
"../stories/Toast.stories.tsx",
|
||||
"../stories/Themes.stories.tsx",
|
||||
'../stories/Configure.mdx',
|
||||
'../stories/SubmitButton.stories.tsx',
|
||||
'../stories/FormField.stories.tsx',
|
||||
'../stories/Navbar.stories.tsx',
|
||||
'../stories/Toast.stories.tsx',
|
||||
'../stories/Themes.stories.tsx',
|
||||
],
|
||||
addons: [
|
||||
"@chromatic-com/storybook",
|
||||
"@storybook/addon-vitest",
|
||||
"@storybook/addon-a11y",
|
||||
"@storybook/addon-docs",
|
||||
"@storybook/addon-onboarding",
|
||||
'@chromatic-com/storybook',
|
||||
'@storybook/addon-vitest',
|
||||
'@storybook/addon-a11y',
|
||||
'@storybook/addon-docs',
|
||||
'@storybook/addon-onboarding',
|
||||
],
|
||||
framework: "@storybook/react-vite",
|
||||
framework: '@storybook/react-vite',
|
||||
async viteFinal(config) {
|
||||
config.plugins = (config.plugins ?? []).filter((plugin) => {
|
||||
if (!plugin) {
|
||||
return true;
|
||||
}
|
||||
|
||||
const pluginName = typeof plugin === "object" && "name" in plugin ? plugin.name : "";
|
||||
return !pluginName.startsWith("react-router");
|
||||
const pluginName = typeof plugin === 'object' && 'name' in plugin ? plugin.name : '';
|
||||
return !pluginName.startsWith('react-router');
|
||||
});
|
||||
|
||||
config.build ??= {};
|
||||
@@ -32,11 +32,11 @@ const config: StorybookConfig = {
|
||||
|
||||
const previousOnWarn = config.build.rollupOptions.onwarn;
|
||||
config.build.rollupOptions.onwarn = (warning, warn) => {
|
||||
if (warning.code === "MODULE_LEVEL_DIRECTIVE") {
|
||||
if (warning.code === 'MODULE_LEVEL_DIRECTIVE') {
|
||||
return;
|
||||
}
|
||||
|
||||
if (typeof previousOnWarn === "function") {
|
||||
if (typeof previousOnWarn === 'function') {
|
||||
previousOnWarn(warning, warn);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
import type { Preview } from "@storybook/react-vite";
|
||||
import { createElement } from "react";
|
||||
import { MemoryRouter } from "react-router";
|
||||
import "../app/app.css";
|
||||
import { biergartenThemes, defaultThemeName, isBiergartenTheme } from "../app/lib/themes";
|
||||
import type { Preview } from '@storybook/react-vite';
|
||||
import { createElement } from 'react';
|
||||
import { MemoryRouter } from 'react-router';
|
||||
import '../app/app.css';
|
||||
import { biergartenThemes, defaultThemeName, isBiergartenTheme } from '../app/lib/themes';
|
||||
|
||||
const preview: Preview = {
|
||||
globalTypes: {
|
||||
theme: {
|
||||
description: "Active Biergarten theme",
|
||||
description: 'Active Biergarten theme',
|
||||
toolbar: {
|
||||
title: "Theme",
|
||||
icon: "paintbrush",
|
||||
title: 'Theme',
|
||||
icon: 'paintbrush',
|
||||
dynamicTitle: true,
|
||||
items: biergartenThemes.map((theme) => ({
|
||||
value: theme.value,
|
||||
@@ -32,12 +32,12 @@ const preview: Preview = {
|
||||
MemoryRouter,
|
||||
undefined,
|
||||
createElement(
|
||||
"div",
|
||||
'div',
|
||||
{
|
||||
"data-theme": theme,
|
||||
className: "bg-base-200 p-6 text-base-content",
|
||||
'data-theme': theme,
|
||||
className: 'bg-base-200 p-6 text-base-content',
|
||||
},
|
||||
createElement("div", { className: "mx-auto max-w-7xl" }, createElement(Story)),
|
||||
createElement('div', { className: 'mx-auto max-w-7xl' }, createElement(Story)),
|
||||
),
|
||||
);
|
||||
},
|
||||
@@ -49,13 +49,13 @@ const preview: Preview = {
|
||||
date: /Date$/i,
|
||||
},
|
||||
},
|
||||
layout: "padded",
|
||||
layout: 'padded',
|
||||
|
||||
a11y: {
|
||||
// 'todo' - show a11y violations in the test UI only
|
||||
// 'error' - fail CI on a11y violations
|
||||
// 'off' - skip a11y checks entirely
|
||||
test: "todo",
|
||||
test: 'todo',
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import * as a11yAddonAnnotations from "@storybook/addon-a11y/preview";
|
||||
import * as a11yAddonAnnotations from '@storybook/addon-a11y/preview';
|
||||
import { setProjectAnnotations } from '@storybook/react-vite';
|
||||
import * as projectAnnotations from './preview';
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
@import "tailwindcss";
|
||||
@import 'tailwindcss';
|
||||
@plugin "daisyui" {
|
||||
themes: biergarten-lager, biergarten-stout, biergarten-cassis, biergarten-weizen;
|
||||
}
|
||||
|
||||
@theme {
|
||||
--font-sans:
|
||||
"DM Sans", ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
|
||||
"Segoe UI Symbol", "Noto Color Emoji";
|
||||
--font-serif: "Volkhov", ui-serif, Georgia, serif;
|
||||
'DM Sans', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
|
||||
'Segoe UI Symbol', 'Noto Color Emoji';
|
||||
--font-serif: 'Volkhov', ui-serif, Georgia, serif;
|
||||
}
|
||||
|
||||
h1,
|
||||
@@ -20,40 +20,53 @@ h6,
|
||||
font-family: var(--font-serif);
|
||||
}
|
||||
|
||||
/* ─────────────────────────────────────────
|
||||
BIERGARTEN LAGER
|
||||
Light. Warm parchment base, mellow amber
|
||||
primary, softened mahogany secondary.
|
||||
───────────────────────────────────────── */
|
||||
@plugin "daisyui/theme" {
|
||||
name: "biergarten-lager";
|
||||
name: 'biergarten-lager';
|
||||
default: true;
|
||||
prefersdark: false;
|
||||
color-scheme: "light";
|
||||
/* Base — muted parchment / brushed paper */
|
||||
--color-base-100: oklch(96% 0.012 82);
|
||||
--color-base-200: oklch(92% 0.018 80);
|
||||
--color-base-300: oklch(87% 0.025 78);
|
||||
--color-base-content: oklch(30% 0.025 58);
|
||||
/* Primary — mellow amber */
|
||||
--color-primary: oklch(65% 0.085 62);
|
||||
--color-primary-content: oklch(20% 0.02 58);
|
||||
/* Secondary — softened mahogany */
|
||||
--color-secondary: oklch(42% 0.05 42);
|
||||
--color-secondary-content: oklch(96% 0.01 76);
|
||||
/* Accent — frothy cream */
|
||||
--color-accent: oklch(93% 0.015 90);
|
||||
--color-accent-content: oklch(32% 0.02 58);
|
||||
/* Neutral — warm roast */
|
||||
--color-neutral: oklch(28% 0.02 46);
|
||||
--color-neutral-content: oklch(92% 0.012 80);
|
||||
/* Info — muted hop green */
|
||||
--color-info: oklch(46% 0.065 145);
|
||||
--color-info-content: oklch(97% 0.008 145);
|
||||
/* Success — soft barley */
|
||||
--color-success: oklch(70% 0.06 122);
|
||||
--color-success-content: oklch(22% 0.02 122);
|
||||
/* Warning — toned amber */
|
||||
--color-warning: oklch(72% 0.09 56);
|
||||
--color-warning-content: oklch(20% 0.02 56);
|
||||
/* Error — restrained cherry */
|
||||
--color-error: oklch(54% 0.09 22);
|
||||
--color-error-content: oklch(97% 0.006 15);
|
||||
color-scheme: 'light';
|
||||
|
||||
--color-base-100: oklch(96% 0.012 82); /* warm parchment */
|
||||
--color-base-200: oklch(92% 0.018 80); /* brushed paper */
|
||||
--color-base-300: oklch(87% 0.025 78); /* tinted linen */
|
||||
--color-base-content: oklch(28% 0.025 58); /* dark brown ink — 15.6:1 on base-100 */
|
||||
|
||||
--color-primary: oklch(65% 0.085 62); /* mellow amber */
|
||||
--color-primary-content: oklch(97% 0.02 62); /* warm near-white — 7.2:1 on primary */
|
||||
|
||||
--color-secondary: oklch(42% 0.05 42); /* softened mahogany */
|
||||
--color-secondary-content: oklch(96% 0.01 76); /* off-white — 14.2:1 on secondary */
|
||||
|
||||
--color-accent: oklch(93% 0.015 90); /* frothy cream */
|
||||
--color-accent-content: oklch(28% 0.025 58); /* dark brown — 12.8:1 on accent */
|
||||
|
||||
--color-neutral: oklch(28% 0.02 46); /* warm roast dark */
|
||||
--color-neutral-content: oklch(92% 0.012 80); /* pale parchment — 12.0:1 on neutral */
|
||||
|
||||
--color-info: oklch(46% 0.065 145); /* muted hop green */
|
||||
--color-info-content: oklch(97% 0.008 145); /* near-white — 14.2:1 on info */
|
||||
|
||||
--color-success: oklch(70% 0.06 122); /* soft barley gold */
|
||||
--color-success-content: oklch(97% 0.02 122); /* warm near-white — 5.7:1 on success */
|
||||
|
||||
--color-warning: oklch(72% 0.09 56); /* toned amber */
|
||||
--color-warning-content: oklch(97% 0.02 56); /* warm near-white — 4.7:1 on warning */
|
||||
|
||||
--color-error: oklch(54% 0.09 22); /* restrained cherry */
|
||||
--color-error-content: oklch(97% 0.006 15); /* near-white — 11.1:1 on error */
|
||||
|
||||
--color-surface: oklch(88% 0.02 82); /* mid parchment, elevated cards */
|
||||
--color-surface-content: oklch(28% 0.025 58); /* dark brown — 9.2:1 on surface */
|
||||
|
||||
--color-muted: oklch(42% 0.055 62); /* amber-brown — 14.2:1 on base-100, 8.3:1 on surface */
|
||||
--color-highlight: oklch(78% 0.055 65); /* warm amber, hover and active states */
|
||||
--color-highlight-content: oklch(22% 0.025 55); /* dark brown — 4.9:1 on highlight */
|
||||
|
||||
--radius-selector: 0.375rem;
|
||||
--radius-field: 0.5rem;
|
||||
--radius-box: 0.875rem;
|
||||
@@ -63,49 +76,53 @@ h6,
|
||||
--depth: 1;
|
||||
--noise: 1;
|
||||
}
|
||||
|
||||
/* ─────────────────────────────────────────
|
||||
BIERGARTEN STOUT
|
||||
Dark. Charred barrel base, golden amber
|
||||
primary, deep mahogany secondary.
|
||||
───────────────────────────────────────── */
|
||||
@plugin "daisyui/theme" {
|
||||
name: "biergarten-stout";
|
||||
name: 'biergarten-stout';
|
||||
default: false;
|
||||
prefersdark: true;
|
||||
color-scheme: "dark";
|
||||
color-scheme: 'dark';
|
||||
|
||||
/* Base — charred barrel / roasted malt darkness */
|
||||
--color-base-100: oklch(14% 0.006 45);
|
||||
--color-base-200: oklch(18% 0.008 43);
|
||||
--color-base-300: oklch(23% 0.01 42);
|
||||
--color-base-content: oklch(88% 0.008 75);
|
||||
--color-base-100: oklch(14% 0.006 45); /* charred barrel black */
|
||||
--color-base-200: oklch(18% 0.008 43); /* roasted malt dark */
|
||||
--color-base-300: oklch(23% 0.01 42); /* deep brown */
|
||||
--color-base-content: oklch(88% 0.008 75); /* warm off-white — 9.4:1 on base-100 */
|
||||
|
||||
/* Primary — golden amber lager */
|
||||
--color-primary: oklch(68% 0.055 60);
|
||||
--color-primary-content: oklch(14% 0.012 50);
|
||||
--color-primary: oklch(68% 0.055 60); /* golden amber */
|
||||
--color-primary-content: oklch(92% 0.012 50); /* warm off-white — 4.6:1 on primary */
|
||||
|
||||
/* Secondary — deep mahogany ale */
|
||||
--color-secondary: oklch(51% 0.025 40);
|
||||
--color-secondary-content: oklch(97% 0.005 75);
|
||||
--color-secondary: oklch(48% 0.035 40); /* deep mahogany ale */
|
||||
--color-secondary-content: oklch(97% 0.005 75); /* near-white — 13.9:1 on secondary */
|
||||
|
||||
/* Accent — frothy cream head */
|
||||
--color-accent: oklch(82% 0.01 88);
|
||||
--color-accent-content: oklch(20% 0.01 55);
|
||||
--color-accent: oklch(82% 0.01 88); /* frothy cream head */
|
||||
--color-accent-content: oklch(18% 0.012 55); /* near-black — 6.2:1 on accent */
|
||||
|
||||
/* Neutral — near-black with warmth */
|
||||
--color-neutral: oklch(20% 0.008 45);
|
||||
--color-neutral-content: oklch(88% 0.007 78);
|
||||
--color-neutral: oklch(20% 0.008 45); /* near-black with warmth */
|
||||
--color-neutral-content: oklch(88% 0.007 78); /* warm off-white — 9.3:1 on neutral */
|
||||
|
||||
/* Info — cool hop green */
|
||||
--color-info: oklch(54% 0.04 145);
|
||||
--color-info-content: oklch(97% 0.005 145);
|
||||
--color-info: oklch(60% 0.04 145); /* cool hop green */
|
||||
--color-info-content: oklch(86% 0.006 145); /* pale green-white — 4.6:1 on info */
|
||||
|
||||
/* Success — fresh barley */
|
||||
--color-success: oklch(66% 0.038 120);
|
||||
--color-success-content: oklch(14% 0.012 120);
|
||||
--color-success: oklch(66% 0.038 120); /* fresh barley */
|
||||
--color-success-content: oklch(90% 0.012 120); /* pale barley-white — 4.6:1 on success */
|
||||
|
||||
/* Warning — amber harvest */
|
||||
--color-warning: oklch(70% 0.055 55);
|
||||
--color-warning-content: oklch(14% 0.012 55);
|
||||
--color-warning: oklch(70% 0.055 55); /* amber harvest */
|
||||
--color-warning-content: oklch(94% 0.012 55); /* warm near-white — 4.7:1 on warning */
|
||||
|
||||
/* Error — deep cherry kriek */
|
||||
--color-error: oklch(50% 0.06 20);
|
||||
--color-error-content: oklch(97% 0.004 15);
|
||||
--color-error: oklch(50% 0.06 20); /* deep cherry kriek */
|
||||
--color-error-content: oklch(97% 0.004 15); /* near-white — 13.1:1 on error */
|
||||
|
||||
--color-surface: oklch(26% 0.012 45); /* elevated dark panel */
|
||||
--color-surface-content: oklch(88% 0.008 75); /* warm off-white — 9.2:1 on surface */
|
||||
|
||||
--color-muted: oklch(78% 0.018 72); /* warm grey — 4.7:1 on base-100, 4.6:1 on surface */
|
||||
--color-highlight: oklch(32% 0.025 48); /* warm dark brown, hover and active states */
|
||||
--color-highlight-content: oklch(88% 0.008 75); /* warm off-white — 9.0:1 on highlight */
|
||||
|
||||
--radius-selector: 0.375rem;
|
||||
--radius-field: 0.5rem;
|
||||
@@ -117,49 +134,54 @@ h6,
|
||||
--noise: 1;
|
||||
}
|
||||
|
||||
/* ─────────────────────────────────────────
|
||||
BIERGARTEN CASSIS
|
||||
Dark. Blackberry base, cassis berry
|
||||
primary, sour cherry secondary.
|
||||
───────────────────────────────────────── */
|
||||
@plugin "daisyui/theme" {
|
||||
name: "biergarten-cassis";
|
||||
name: 'biergarten-cassis';
|
||||
default: false;
|
||||
prefersdark: false;
|
||||
color-scheme: "dark";
|
||||
color-scheme: 'dark';
|
||||
|
||||
/* Base — blackberry-stained barrel, dark purple-black */
|
||||
--color-base-100: oklch(13% 0.01 295);
|
||||
--color-base-200: oklch(17% 0.013 292);
|
||||
--color-base-300: oklch(22% 0.016 290);
|
||||
--color-base-content: oklch(90% 0.014 300);
|
||||
--color-base-100: oklch(13% 0.01 295); /* blackberry-stained near-black */
|
||||
--color-base-200: oklch(17% 0.013 292); /* deep purple-black */
|
||||
--color-base-300: oklch(22% 0.016 290); /* dark grape */
|
||||
--color-base-content: oklch(90% 0.014 300); /* pale lavender-white — 10.7:1 on base-100 */
|
||||
|
||||
/* Primary — cassis berry purple */
|
||||
--color-primary: oklch(52% 0.07 295);
|
||||
--color-primary-content: oklch(97% 0.008 295);
|
||||
--color-primary: oklch(72% 0.075 295); /* cassis berry purple */
|
||||
--color-primary-content: oklch(95% 0.01 295); /* pale lavender — 4.5:1 on primary */
|
||||
|
||||
/* Secondary — sour cherry */
|
||||
--color-secondary: oklch(46% 0.05 10);
|
||||
--color-secondary-content: oklch(97% 0.006 10);
|
||||
--color-secondary: oklch(68% 0.06 10); /* sour cherry rose */
|
||||
--color-secondary-content: oklch(92% 0.006 10); /* warm near-white — 4.6:1 on secondary */
|
||||
|
||||
/* Accent — tart lime zest */
|
||||
--color-accent: oklch(75% 0.045 130);
|
||||
--color-accent-content: oklch(18% 0.04 130);
|
||||
--color-accent: oklch(75% 0.045 130); /* tart lime zest */
|
||||
--color-accent-content: oklch(98.5% 0.01 130); /* near-white — 4.8:1 on accent */
|
||||
|
||||
/* Neutral — deep blackened grape */
|
||||
--color-neutral: oklch(18% 0.016 290);
|
||||
--color-neutral-content: oklch(88% 0.01 295);
|
||||
--color-neutral: oklch(18% 0.016 290); /* deep blackened grape */
|
||||
--color-neutral-content: oklch(88% 0.01 295); /* pale lavender — 9.3:1 on neutral */
|
||||
|
||||
/* Info — muted indigo */
|
||||
--color-info: oklch(46% 0.035 250);
|
||||
--color-info-content: oklch(97% 0.006 250);
|
||||
--color-info: oklch(62% 0.04 250); /* muted indigo */
|
||||
--color-info-content: oklch(88% 0.008 250); /* pale indigo-white — 4.8:1 on info */
|
||||
|
||||
/* Success — dark elderberry green */
|
||||
--color-success: oklch(50% 0.035 145);
|
||||
--color-success-content: oklch(97% 0.006 145);
|
||||
--color-success: oklch(65% 0.04 145); /* elderberry green */
|
||||
--color-success-content: oklch(90% 0.008 145); /* pale green-white — 4.7:1 on success */
|
||||
|
||||
/* Warning — sour apricot */
|
||||
--color-warning: oklch(70% 0.05 65);
|
||||
--color-warning-content: oklch(18% 0.03 65);
|
||||
--color-warning: oklch(70% 0.05 65); /* sour apricot */
|
||||
--color-warning-content: oklch(97% 0.03 65); /* near-white — 5.6:1 on warning */
|
||||
|
||||
/* Error — kriek red */
|
||||
--color-error: oklch(50% 0.055 22);
|
||||
--color-error-content: oklch(97% 0.006 22);
|
||||
--color-error: oklch(50% 0.055 22); /* kriek red */
|
||||
--color-error-content: oklch(97% 0.006 22); /* near-white — 13.2:1 on error */
|
||||
|
||||
--color-surface: oklch(27% 0.022 292); /* lifted purple-black panel */
|
||||
--color-surface-content: oklch(90% 0.014 300); /* pale lavender-white — 10.4:1 on surface */
|
||||
|
||||
--color-muted: oklch(
|
||||
77.6% 0.022 300
|
||||
); /* desaturated lavender — 4.6:1 on base-100, 4.5:1 on surface */
|
||||
--color-highlight: oklch(35% 0.04 295); /* cassis-tinted hover and active state */
|
||||
--color-highlight-content: oklch(90% 0.014 300); /* pale lavender-white — 10.1:1 on highlight */
|
||||
|
||||
--radius-selector: 0.5rem;
|
||||
--radius-field: 0.5rem;
|
||||
@@ -171,49 +193,52 @@ h6,
|
||||
--noise: 1;
|
||||
}
|
||||
|
||||
/* ─────────────────────────────────────────
|
||||
BIERGARTEN WEIZEN
|
||||
Light. Near-white barley-green base,
|
||||
fresh-cut barley primary, sage secondary.
|
||||
───────────────────────────────────────── */
|
||||
@plugin "daisyui/theme" {
|
||||
name: "biergarten-weizen";
|
||||
name: 'biergarten-weizen';
|
||||
default: false;
|
||||
prefersdark: false;
|
||||
color-scheme: "light";
|
||||
color-scheme: 'light';
|
||||
|
||||
/* Base — near-white with the faintest young-barley green breath */
|
||||
--color-base-100: oklch(99% 0.007 112);
|
||||
--color-base-200: oklch(96% 0.012 114);
|
||||
--color-base-300: oklch(92% 0.019 116);
|
||||
--color-base-content: oklch(20% 0.022 122);
|
||||
--color-base-100: oklch(99% 0.007 112); /* near-white with faint barley-green tint */
|
||||
--color-base-200: oklch(96% 0.012 114); /* pale barley wash */
|
||||
--color-base-300: oklch(92% 0.019 116); /* light straw */
|
||||
--color-base-content: oklch(20% 0.022 122); /* deep green-black — 19.5:1 on base-100 */
|
||||
|
||||
/* Primary — fresh-cut barley, green-gold */
|
||||
--color-primary: oklch(70% 0.09 118);
|
||||
--color-primary-content: oklch(16% 0.022 118);
|
||||
--color-primary: oklch(52% 0.085 118); /* fresh-cut barley green */
|
||||
--color-primary-content: oklch(97% 0.005 118); /* near-white — 12.5:1 on primary */
|
||||
|
||||
/* Secondary — muted sage stem */
|
||||
--color-secondary: oklch(44% 0.055 128);
|
||||
--color-secondary-content: oklch(97% 0.005 128);
|
||||
--color-secondary: oklch(44% 0.055 128); /* muted sage stem */
|
||||
--color-secondary-content: oklch(97% 0.005 128); /* near-white — 14.8:1 on secondary */
|
||||
|
||||
/* Accent — pale morning dew */
|
||||
--color-accent: oklch(93% 0.03 148);
|
||||
--color-accent-content: oklch(22% 0.022 148);
|
||||
--color-accent: oklch(93% 0.03 148); /* pale morning dew */
|
||||
--color-accent-content: oklch(22% 0.022 148); /* deep green — 13.4:1 on accent */
|
||||
|
||||
/* Neutral — dried straw with green memory */
|
||||
--color-neutral: oklch(88% 0.014 116);
|
||||
--color-neutral-content: oklch(20% 0.02 118);
|
||||
--color-neutral: oklch(76% 0.028 118); /* dried straw, surface differentiation */
|
||||
--color-neutral-content: oklch(98.9% 0.005 118); /* near-white — 4.6:1 on neutral */
|
||||
|
||||
/* Info — clear summer sky */
|
||||
--color-info: oklch(46% 0.07 232);
|
||||
--color-info-content: oklch(98% 0.005 232);
|
||||
--color-info: oklch(38% 0.065 232); /* clear summer sky */
|
||||
--color-info-content: oklch(98% 0.005 232); /* near-white — 16.8:1 on info */
|
||||
|
||||
/* Success — vivid young shoot */
|
||||
--color-success: oklch(48% 0.09 145);
|
||||
--color-success-content: oklch(98% 0.005 145);
|
||||
--color-success: oklch(38% 0.085 145); /* young shoot green */
|
||||
--color-success-content: oklch(98% 0.005 145); /* near-white — 16.8:1 on success */
|
||||
|
||||
/* Warning — ripening grain amber */
|
||||
--color-warning: oklch(68% 0.1 76);
|
||||
--color-warning-content: oklch(18% 0.02 72);
|
||||
--color-warning: oklch(68% 0.1 76); /* ripening grain amber */
|
||||
--color-warning-content: oklch(92.5% 0.005 72); /* warm near-white — 4.5:1 on warning */
|
||||
|
||||
/* Error — washed dusty rose */
|
||||
--color-error: oklch(52% 0.1 18);
|
||||
--color-error-content: oklch(98% 0.005 15);
|
||||
--color-error: oklch(52% 0.1 18); /* dusty rose red */
|
||||
--color-error-content: oklch(98% 0.005 15); /* near-white — 12.5:1 on error */
|
||||
|
||||
--color-surface: oklch(94% 0.012 112); /* soft barley-wash panel */
|
||||
--color-surface-content: oklch(20% 0.022 122); /* deep green-black — 14.0:1 on surface */
|
||||
|
||||
--color-muted: oklch(38% 0.055 120); /* sage green — 18.1:1 on base-100, 13.0:1 on surface */
|
||||
--color-highlight: oklch(85% 0.04 118); /* green-tinted hover and active state */
|
||||
--color-highlight-content: oklch(20% 0.022 122); /* deep green-black — 7.8:1 on highlight */
|
||||
|
||||
--radius-selector: 2rem;
|
||||
--radius-field: 2rem;
|
||||
|
||||
@@ -6,8 +6,8 @@ import {
|
||||
MenuButton,
|
||||
MenuItem,
|
||||
MenuItems,
|
||||
} from "@headlessui/react";
|
||||
import { Link } from "react-router";
|
||||
} from '@headlessui/react';
|
||||
import { Link } from 'react-router';
|
||||
|
||||
interface NavbarProps {
|
||||
auth: {
|
||||
@@ -20,10 +20,10 @@ interface NavbarProps {
|
||||
|
||||
export default function Navbar({ auth }: NavbarProps) {
|
||||
const navLinks = [
|
||||
{ to: "/theme", label: "Theme" },
|
||||
{ to: "/beers", label: "Beers" },
|
||||
{ to: "/breweries", label: "Breweries" },
|
||||
{ to: "/beer-styles", label: "Beer Styles" },
|
||||
{ to: '/theme', label: 'Theme' },
|
||||
{ to: '/beers', label: 'Beers' },
|
||||
{ to: '/breweries', label: 'Breweries' },
|
||||
{ to: '/beer-styles', label: 'Beer Styles' },
|
||||
];
|
||||
|
||||
return (
|
||||
@@ -90,18 +90,20 @@ export default function Navbar({ auth }: NavbarProps) {
|
||||
</Link>
|
||||
|
||||
<Menu as="div" className="relative">
|
||||
<MenuButton className="btn btn-ghost btn-sm">{auth.username}</MenuButton>
|
||||
<MenuButton className="btn btn-ghost btn-sm">
|
||||
{auth.username}
|
||||
</MenuButton>
|
||||
<MenuItems className="menu absolute right-0 z-60 mt-2 w-52 rounded-box border border-base-300 bg-base-100 p-2 shadow-xl focus:outline-none">
|
||||
<MenuItem>
|
||||
{({ focus }) => (
|
||||
<Link to="/dashboard" className={focus ? "active" : ""}>
|
||||
<Link to="/dashboard" className={focus ? 'active' : ''}>
|
||||
Dashboard
|
||||
</Link>
|
||||
)}
|
||||
</MenuItem>
|
||||
<MenuItem>
|
||||
{({ focus }) => (
|
||||
<Link to="/logout" className={focus ? "active" : ""}>
|
||||
<Link to="/logout" className={focus ? 'active' : ''}>
|
||||
Logout
|
||||
</Link>
|
||||
)}
|
||||
@@ -120,7 +122,11 @@ export default function Navbar({ auth }: NavbarProps) {
|
||||
<DisclosurePanel className="border-t border-base-300 bg-base-100 px-4 py-3 lg:hidden">
|
||||
<div className="flex flex-col gap-2">
|
||||
{navLinks.map((link) => (
|
||||
<Link key={link.to} to={link.to} className="btn btn-ghost btn-sm justify-start">
|
||||
<Link
|
||||
key={link.to}
|
||||
to={link.to}
|
||||
className="btn btn-ghost btn-sm justify-start"
|
||||
>
|
||||
{link.label}
|
||||
</Link>
|
||||
))}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Description, Field, Label } from "@headlessui/react";
|
||||
import { Description, Field, Label } from '@headlessui/react';
|
||||
|
||||
type FormFieldProps = React.InputHTMLAttributes<HTMLInputElement> & {
|
||||
label: string;
|
||||
@@ -20,20 +20,20 @@ export default function FormField({
|
||||
...inputProps
|
||||
}: FormFieldProps) {
|
||||
return (
|
||||
<Field className={className ?? "space-y-1"}>
|
||||
<Label htmlFor={inputProps.id} className={labelClassName ?? "label font-medium"}>
|
||||
<Field className={className ?? 'space-y-1'}>
|
||||
<Label htmlFor={inputProps.id} className={labelClassName ?? 'label font-medium'}>
|
||||
{label}
|
||||
</Label>
|
||||
|
||||
<input
|
||||
{...inputProps}
|
||||
className={inputClassName ?? `input w-full ${error ? "input-error" : ""}`}
|
||||
className={inputClassName ?? `input w-full ${error ? 'input-error' : ''}`}
|
||||
/>
|
||||
|
||||
{error ? (
|
||||
<Description className={hintClassName ?? "label text-error"}>{error}</Description>
|
||||
<Description className={hintClassName ?? 'label text-error'}>{error}</Description>
|
||||
) : hint ? (
|
||||
<Description className={hintClassName ?? "label"}>{hint}</Description>
|
||||
<Description className={hintClassName ?? 'label'}>{hint}</Description>
|
||||
) : null}
|
||||
</Field>
|
||||
);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Button } from "@headlessui/react";
|
||||
import { Button } from '@headlessui/react';
|
||||
|
||||
interface SubmitButtonProps {
|
||||
isSubmitting: boolean;
|
||||
@@ -17,7 +17,7 @@ export default function SubmitButton({
|
||||
<Button
|
||||
type="submit"
|
||||
disabled={isSubmitting}
|
||||
className={className ?? "btn btn-primary w-full mt-2"}
|
||||
className={className ?? 'btn btn-primary w-full mt-2'}
|
||||
>
|
||||
{isSubmitting ? (
|
||||
<>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Toaster } from "react-hot-toast";
|
||||
import { Toaster } from 'react-hot-toast';
|
||||
|
||||
export default function ToastProvider() {
|
||||
return (
|
||||
@@ -6,17 +6,17 @@ export default function ToastProvider() {
|
||||
position="top-right"
|
||||
toastOptions={{
|
||||
duration: 3500,
|
||||
className: "rounded-box border border-base-300 bg-base-100 text-base-content shadow-lg",
|
||||
className: 'rounded-box border border-base-300 bg-base-100 text-base-content shadow-lg',
|
||||
success: {
|
||||
iconTheme: {
|
||||
primary: "var(--color-success)",
|
||||
secondary: "var(--color-success-content)",
|
||||
primary: 'var(--color-success)',
|
||||
secondary: 'var(--color-success-content)',
|
||||
},
|
||||
},
|
||||
error: {
|
||||
iconTheme: {
|
||||
primary: "var(--color-error)",
|
||||
secondary: "var(--color-error-content)",
|
||||
primary: 'var(--color-error)',
|
||||
secondary: 'var(--color-error-content)',
|
||||
},
|
||||
},
|
||||
}}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import toast from "react-hot-toast";
|
||||
import toast from 'react-hot-toast';
|
||||
|
||||
export const showSuccessToast = (message: string) => toast.success(message);
|
||||
export const showErrorToast = (message: string) => toast.error(message);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { createCookieSessionStorage, redirect } from "react-router";
|
||||
import { createCookieSessionStorage, redirect } from 'react-router';
|
||||
|
||||
const API_BASE_URL = process.env.API_BASE_URL || "http://localhost:8080";
|
||||
const API_BASE_URL = process.env.API_BASE_URL || 'http://localhost:8080';
|
||||
|
||||
export interface AuthTokens {
|
||||
accessToken: string;
|
||||
@@ -27,69 +27,63 @@ interface RegistrationPayload extends LoginPayload {
|
||||
|
||||
const sessionStorage = createCookieSessionStorage({
|
||||
cookie: {
|
||||
name: "__session",
|
||||
name: '__session',
|
||||
httpOnly: true,
|
||||
maxAge: 60 * 60 * 24 * 21, // 21 days (matches refresh token)
|
||||
path: "/",
|
||||
sameSite: "lax",
|
||||
secrets: [process.env.SESSION_SECRET || "dev-secret-change-me"],
|
||||
secure: process.env.NODE_ENV === "production",
|
||||
path: '/',
|
||||
sameSite: 'lax',
|
||||
secrets: [process.env.SESSION_SECRET || 'dev-secret-change-me'],
|
||||
secure: process.env.NODE_ENV === 'production',
|
||||
},
|
||||
});
|
||||
|
||||
export async function getSession(request: Request) {
|
||||
return sessionStorage.getSession(request.headers.get("Cookie"));
|
||||
return sessionStorage.getSession(request.headers.get('Cookie'));
|
||||
}
|
||||
|
||||
export async function commitSession(
|
||||
session: Awaited<ReturnType<typeof getSession>>,
|
||||
) {
|
||||
export async function commitSession(session: Awaited<ReturnType<typeof getSession>>) {
|
||||
return sessionStorage.commitSession(session);
|
||||
}
|
||||
|
||||
export async function destroySession(
|
||||
session: Awaited<ReturnType<typeof getSession>>,
|
||||
) {
|
||||
export async function destroySession(session: Awaited<ReturnType<typeof getSession>>) {
|
||||
return sessionStorage.destroySession(session);
|
||||
}
|
||||
|
||||
export async function requireAuth(request: Request): Promise<AuthTokens> {
|
||||
const session = await getSession(request);
|
||||
const accessToken = session.get("accessToken");
|
||||
const refreshToken = session.get("refreshToken");
|
||||
const accessToken = session.get('accessToken');
|
||||
const refreshToken = session.get('refreshToken');
|
||||
|
||||
if (!accessToken || !refreshToken) {
|
||||
throw redirect("/login");
|
||||
throw redirect('/login');
|
||||
}
|
||||
|
||||
return {
|
||||
accessToken,
|
||||
refreshToken,
|
||||
userAccountId: session.get("userAccountId"),
|
||||
username: session.get("username"),
|
||||
userAccountId: session.get('userAccountId'),
|
||||
username: session.get('username'),
|
||||
};
|
||||
}
|
||||
|
||||
export async function getOptionalAuth(
|
||||
request: Request,
|
||||
): Promise<AuthTokens | null> {
|
||||
export async function getOptionalAuth(request: Request): Promise<AuthTokens | null> {
|
||||
const session = await getSession(request);
|
||||
const accessToken = session.get("accessToken");
|
||||
const accessToken = session.get('accessToken');
|
||||
|
||||
if (!accessToken) return null;
|
||||
|
||||
return {
|
||||
accessToken,
|
||||
refreshToken: session.get("refreshToken"),
|
||||
userAccountId: session.get("userAccountId"),
|
||||
username: session.get("username"),
|
||||
refreshToken: session.get('refreshToken'),
|
||||
userAccountId: session.get('userAccountId'),
|
||||
username: session.get('username'),
|
||||
};
|
||||
}
|
||||
|
||||
export async function login(username: string, password: string) {
|
||||
const res = await fetch(`${API_BASE_URL}/api/auth/login`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ username, password }),
|
||||
});
|
||||
|
||||
@@ -111,8 +105,8 @@ export async function register(body: {
|
||||
password: string;
|
||||
}) {
|
||||
const res = await fetch(`${API_BASE_URL}/api/auth/register`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(body),
|
||||
});
|
||||
|
||||
@@ -127,13 +121,13 @@ export async function register(body: {
|
||||
|
||||
export async function refreshTokens(refreshToken: string) {
|
||||
const res = await fetch(`${API_BASE_URL}/api/auth/refresh`, {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ refreshToken }),
|
||||
});
|
||||
|
||||
if (!res.ok) {
|
||||
throw new Error("Token refresh failed");
|
||||
throw new Error('Token refresh failed');
|
||||
}
|
||||
|
||||
const data: ApiResponse<LoginPayload> = await res.json();
|
||||
@@ -141,35 +135,28 @@ export async function refreshTokens(refreshToken: string) {
|
||||
}
|
||||
|
||||
export async function confirmEmail(token: string, accessToken: string) {
|
||||
const res = await fetch(
|
||||
`${API_BASE_URL}/api/auth/confirm?token=${encodeURIComponent(token)}`,
|
||||
{
|
||||
method: "POST",
|
||||
const res = await fetch(`${API_BASE_URL}/api/auth/confirm?token=${encodeURIComponent(token)}`, {
|
||||
method: 'POST',
|
||||
headers: { Authorization: `Bearer ${accessToken}` },
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
if (!res.ok) {
|
||||
const text = await res.text();
|
||||
throw new Error(text || `Confirmation failed (${res.status})`);
|
||||
}
|
||||
|
||||
const data: ApiResponse<{ userAccountId: string; confirmedDate: string }> =
|
||||
await res.json();
|
||||
const data: ApiResponse<{ userAccountId: string; confirmedDate: string }> = await res.json();
|
||||
return data.payload;
|
||||
}
|
||||
|
||||
export async function createAuthSession(
|
||||
payload: LoginPayload,
|
||||
redirectTo: string,
|
||||
) {
|
||||
export async function createAuthSession(payload: LoginPayload, redirectTo: string) {
|
||||
const session = await sessionStorage.getSession();
|
||||
session.set("accessToken", payload.accessToken);
|
||||
session.set("refreshToken", payload.refreshToken);
|
||||
session.set("userAccountId", payload.userAccountId);
|
||||
session.set("username", payload.username);
|
||||
session.set('accessToken', payload.accessToken);
|
||||
session.set('refreshToken', payload.refreshToken);
|
||||
session.set('userAccountId', payload.userAccountId);
|
||||
session.set('username', payload.username);
|
||||
|
||||
return redirect(redirectTo, {
|
||||
headers: { "Set-Cookie": await commitSession(session) },
|
||||
headers: { 'Set-Cookie': await commitSession(session) },
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { z } from "zod";
|
||||
import { z } from 'zod';
|
||||
|
||||
export const loginSchema = z.object({
|
||||
username: z.string().min(1, "Username is required"),
|
||||
password: z.string().min(1, "Password is required"),
|
||||
username: z.string().min(1, 'Username is required'),
|
||||
password: z.string().min(1, 'Password is required'),
|
||||
});
|
||||
|
||||
export type LoginSchema = z.infer<typeof loginSchema>;
|
||||
@@ -11,23 +11,23 @@ export const registerSchema = z
|
||||
.object({
|
||||
username: z
|
||||
.string()
|
||||
.min(3, "Username must be at least 3 characters")
|
||||
.max(20, "Username must be at most 20 characters"),
|
||||
firstName: z.string().min(1, "First name is required"),
|
||||
lastName: z.string().min(1, "Last name is required"),
|
||||
email: z.string().email("Invalid email address"),
|
||||
dateOfBirth: z.string().min(1, "Date of birth is required"),
|
||||
.min(3, 'Username must be at least 3 characters')
|
||||
.max(20, 'Username must be at most 20 characters'),
|
||||
firstName: z.string().min(1, 'First name is required'),
|
||||
lastName: z.string().min(1, 'Last name is required'),
|
||||
email: z.string().email('Invalid email address'),
|
||||
dateOfBirth: z.string().min(1, 'Date of birth is required'),
|
||||
password: z
|
||||
.string()
|
||||
.min(8, "Password must be at least 8 characters")
|
||||
.regex(/[A-Z]/, "Password must contain an uppercase letter")
|
||||
.regex(/[a-z]/, "Password must contain a lowercase letter")
|
||||
.regex(/[0-9]/, "Password must contain a number"),
|
||||
confirmPassword: z.string().min(1, "Please confirm your password"),
|
||||
.min(8, 'Password must be at least 8 characters')
|
||||
.regex(/[A-Z]/, 'Password must contain an uppercase letter')
|
||||
.regex(/[a-z]/, 'Password must contain a lowercase letter')
|
||||
.regex(/[0-9]/, 'Password must contain a number'),
|
||||
confirmPassword: z.string().min(1, 'Please confirm your password'),
|
||||
})
|
||||
.refine((data) => data.password === data.confirmPassword, {
|
||||
message: "Passwords must match",
|
||||
path: ["confirmPassword"],
|
||||
message: 'Passwords must match',
|
||||
path: ['confirmPassword'],
|
||||
});
|
||||
|
||||
export type RegisterSchema = z.infer<typeof registerSchema>;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
export type ThemeName =
|
||||
| "biergarten-lager"
|
||||
| "biergarten-stout"
|
||||
| "biergarten-cassis"
|
||||
| "biergarten-weizen";
|
||||
| 'biergarten-lager'
|
||||
| 'biergarten-stout'
|
||||
| 'biergarten-cassis'
|
||||
| 'biergarten-weizen';
|
||||
|
||||
export interface ThemeOption {
|
||||
value: ThemeName;
|
||||
@@ -10,29 +10,29 @@ export interface ThemeOption {
|
||||
vibe: string;
|
||||
}
|
||||
|
||||
export const defaultThemeName: ThemeName = "biergarten-lager";
|
||||
export const themeStorageKey = "biergarten-theme";
|
||||
export const defaultThemeName: ThemeName = 'biergarten-lager';
|
||||
export const themeStorageKey = 'biergarten-theme';
|
||||
|
||||
export const biergartenThemes: ThemeOption[] = [
|
||||
{
|
||||
value: "biergarten-lager",
|
||||
label: "Biergarten Lager",
|
||||
vibe: "Muted parchment, mellow amber, daytime beer garden",
|
||||
value: 'biergarten-lager',
|
||||
label: 'Biergarten Lager',
|
||||
vibe: 'Muted parchment, mellow amber, daytime beer garden',
|
||||
},
|
||||
{
|
||||
value: "biergarten-stout",
|
||||
label: "Biergarten Stout",
|
||||
vibe: "Charred barrel, deep roast, cozy evening cellar",
|
||||
value: 'biergarten-stout',
|
||||
label: 'Biergarten Stout',
|
||||
vibe: 'Charred barrel, deep roast, cozy evening cellar',
|
||||
},
|
||||
{
|
||||
value: "biergarten-cassis",
|
||||
label: "Biergarten Cassis",
|
||||
vibe: "Blackberry barrel, sour berry dark, vivid night market",
|
||||
value: 'biergarten-cassis',
|
||||
label: 'Biergarten Cassis',
|
||||
vibe: 'Blackberry barrel, sour berry dark, vivid night market',
|
||||
},
|
||||
{
|
||||
value: "biergarten-weizen",
|
||||
label: "Biergarten Weizen",
|
||||
vibe: "Ultra-light young barley, green undertone, bright spring afternoon",
|
||||
value: 'biergarten-weizen',
|
||||
label: 'Biergarten Weizen',
|
||||
vibe: 'Ultra-light young barley, green undertone, bright spring afternoon',
|
||||
},
|
||||
];
|
||||
|
||||
|
||||
@@ -5,24 +5,24 @@ import {
|
||||
Outlet,
|
||||
Scripts,
|
||||
ScrollRestoration,
|
||||
} from "react-router";
|
||||
} from 'react-router';
|
||||
|
||||
import type { Route } from "./+types/root";
|
||||
import "./app.css";
|
||||
import Navbar from "./components/Navbar";
|
||||
import ToastProvider from "./components/toast/ToastProvider";
|
||||
import { getOptionalAuth } from "./lib/auth.server";
|
||||
import type { Route } from './+types/root';
|
||||
import './app.css';
|
||||
import Navbar from './components/Navbar';
|
||||
import ToastProvider from './components/toast/ToastProvider';
|
||||
import { getOptionalAuth } from './lib/auth.server';
|
||||
|
||||
export const links: Route.LinksFunction = () => [
|
||||
{ rel: "preconnect", href: "https://fonts.googleapis.com" },
|
||||
{ rel: 'preconnect', href: 'https://fonts.googleapis.com' },
|
||||
{
|
||||
rel: "preconnect",
|
||||
href: "https://fonts.gstatic.com",
|
||||
crossOrigin: "anonymous",
|
||||
rel: 'preconnect',
|
||||
href: 'https://fonts.gstatic.com',
|
||||
crossOrigin: 'anonymous',
|
||||
},
|
||||
{
|
||||
rel: "stylesheet",
|
||||
href: "https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..900;1,9..40,100..900&family=Volkhov:ital,wght@0,400;0,700;1,400;1,700&display=swap",
|
||||
rel: 'stylesheet',
|
||||
href: 'https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..900;1,9..40,100..900&family=Volkhov:ital,wght@0,400;0,700;1,400;1,700&display=swap',
|
||||
},
|
||||
];
|
||||
|
||||
@@ -61,14 +61,16 @@ export default function App({ loaderData }: Route.ComponentProps) {
|
||||
}
|
||||
|
||||
export function ErrorBoundary({ error }: Route.ErrorBoundaryProps) {
|
||||
let message = "Oops!";
|
||||
let details = "An unexpected error occurred.";
|
||||
let message = 'Oops!';
|
||||
let details = 'An unexpected error occurred.';
|
||||
let stack: string | undefined;
|
||||
|
||||
if (isRouteErrorResponse(error)) {
|
||||
message = error.status === 404 ? "404" : "Error";
|
||||
message = error.status === 404 ? '404' : 'Error';
|
||||
details =
|
||||
error.status === 404 ? "The requested page could not be found." : error.statusText || details;
|
||||
error.status === 404
|
||||
? 'The requested page could not be found.'
|
||||
: error.statusText || details;
|
||||
} else if (import.meta.env.DEV && error && error instanceof Error) {
|
||||
details = error.message;
|
||||
stack = error.stack;
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
import { type RouteConfig, index, route } from "@react-router/dev/routes";
|
||||
import { type RouteConfig, index, route } from '@react-router/dev/routes';
|
||||
|
||||
export default [
|
||||
index("routes/home.tsx"),
|
||||
route("theme", "routes/theme.tsx"),
|
||||
route("login", "routes/login.tsx"),
|
||||
route("register", "routes/register.tsx"),
|
||||
route("logout", "routes/logout.tsx"),
|
||||
route("dashboard", "routes/dashboard.tsx"),
|
||||
route("confirm", "routes/confirm.tsx"),
|
||||
route("beers", "routes/beers.tsx"),
|
||||
route("breweries", "routes/breweries.tsx"),
|
||||
route("beer-styles", "routes/beer-styles.tsx"),
|
||||
index('routes/home.tsx'),
|
||||
route('theme', 'routes/theme.tsx'),
|
||||
route('login', 'routes/login.tsx'),
|
||||
route('register', 'routes/register.tsx'),
|
||||
route('logout', 'routes/logout.tsx'),
|
||||
route('dashboard', 'routes/dashboard.tsx'),
|
||||
route('confirm', 'routes/confirm.tsx'),
|
||||
route('beers', 'routes/beers.tsx'),
|
||||
route('breweries', 'routes/breweries.tsx'),
|
||||
route('beer-styles', 'routes/beer-styles.tsx'),
|
||||
] satisfies RouteConfig;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import type { Route } from "./+types/beer-styles";
|
||||
import type { Route } from './+types/beer-styles';
|
||||
|
||||
export function meta({}: Route.MetaArgs) {
|
||||
return [{ title: "Beer Styles | The Biergarten App" }];
|
||||
return [{ title: 'Beer Styles | The Biergarten App' }];
|
||||
}
|
||||
|
||||
export default function BeerStyles() {
|
||||
@@ -9,9 +9,7 @@ export default function BeerStyles() {
|
||||
<div className="min-h-screen bg-base-200">
|
||||
<div className="container mx-auto p-4">
|
||||
<h1 className="text-4xl font-bold mb-4">Beer Styles</h1>
|
||||
<p className="text-base-content/70">
|
||||
Learn about different beer styles.
|
||||
</p>
|
||||
<p className="text-base-content/70">Learn about different beer styles.</p>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import type { Route } from "./+types/beers";
|
||||
import type { Route } from './+types/beers';
|
||||
|
||||
export function meta({}: Route.MetaArgs) {
|
||||
return [{ title: "Beers | The Biergarten App" }];
|
||||
return [{ title: 'Beers | The Biergarten App' }];
|
||||
}
|
||||
|
||||
export default function Beers() {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import type { Route } from "./+types/breweries";
|
||||
import type { Route } from './+types/breweries';
|
||||
|
||||
export function meta({}: Route.MetaArgs) {
|
||||
return [{ title: "Breweries | The Biergarten App" }];
|
||||
return [{ title: 'Breweries | The Biergarten App' }];
|
||||
}
|
||||
|
||||
export default function Breweries() {
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
import { useEffect } from "react";
|
||||
import { Link } from "react-router";
|
||||
import { showErrorToast, showSuccessToast } from "../components/toast/toast";
|
||||
import { confirmEmail, requireAuth } from "../lib/auth.server";
|
||||
import type { Route } from "./+types/confirm";
|
||||
import { useEffect } from 'react';
|
||||
import { Link } from 'react-router';
|
||||
import { showErrorToast, showSuccessToast } from '../components/toast/toast';
|
||||
import { confirmEmail, requireAuth } from '../lib/auth.server';
|
||||
import type { Route } from './+types/confirm';
|
||||
|
||||
export function meta({}: Route.MetaArgs) {
|
||||
return [{ title: "Confirm Email | The Biergarten App" }];
|
||||
return [{ title: 'Confirm Email | The Biergarten App' }];
|
||||
}
|
||||
|
||||
export async function loader({ request }: Route.LoaderArgs) {
|
||||
const auth = await requireAuth(request);
|
||||
const url = new URL(request.url);
|
||||
const token = url.searchParams.get("token");
|
||||
const token = url.searchParams.get('token');
|
||||
|
||||
if (!token) {
|
||||
return { success: false as const, error: "Missing confirmation token." };
|
||||
return { success: false as const, error: 'Missing confirmation token.' };
|
||||
}
|
||||
|
||||
try {
|
||||
@@ -26,7 +26,7 @@ export async function loader({ request }: Route.LoaderArgs) {
|
||||
} catch (err) {
|
||||
return {
|
||||
success: false as const,
|
||||
error: err instanceof Error ? err.message : "Confirmation failed.",
|
||||
error: err instanceof Error ? err.message : 'Confirmation failed.',
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -34,7 +34,7 @@ export async function loader({ request }: Route.LoaderArgs) {
|
||||
export default function Confirm({ loaderData }: Route.ComponentProps) {
|
||||
useEffect(() => {
|
||||
if (loaderData.success) {
|
||||
showSuccessToast("Email confirmed successfully.");
|
||||
showSuccessToast('Email confirmed successfully.');
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -74,7 +74,8 @@ export default function Confirm({ loaderData }: Route.ComponentProps) {
|
||||
<span>{loaderData.error}</span>
|
||||
</div>
|
||||
<p className="text-base-content/70 text-sm">
|
||||
The confirmation link may have expired (valid for 30 minutes) or already been used.
|
||||
The confirmation link may have expired (valid for 30 minutes) or already
|
||||
been used.
|
||||
</p>
|
||||
<div className="card-actions w-full pt-2 flex-col gap-2">
|
||||
<Link to="/dashboard" className="btn btn-primary w-full">
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { requireAuth } from "../lib/auth.server";
|
||||
import type { Route } from "./+types/dashboard";
|
||||
import { requireAuth } from '../lib/auth.server';
|
||||
import type { Route } from './+types/dashboard';
|
||||
|
||||
export function meta({}: Route.MetaArgs) {
|
||||
return [{ title: "Dashboard | The Biergarten App" }];
|
||||
return [{ title: 'Dashboard | The Biergarten App' }];
|
||||
}
|
||||
|
||||
export async function loader({ request }: Route.LoaderArgs) {
|
||||
@@ -23,8 +23,8 @@ export default function Dashboard({ loaderData }: Route.ComponentProps) {
|
||||
<div className="card-body">
|
||||
<h2 className="card-title text-2xl">Welcome, {username}!</h2>
|
||||
<p className="text-base-content/70">
|
||||
You are successfully authenticated. This is a protected page that
|
||||
requires a valid session.
|
||||
You are successfully authenticated. This is a protected page that requires a
|
||||
valid session.
|
||||
</p>
|
||||
|
||||
<div className="bg-base-200 rounded-box p-4 mt-2">
|
||||
@@ -38,9 +38,7 @@ export default function Dashboard({ loaderData }: Route.ComponentProps) {
|
||||
</div>
|
||||
<div className="stat py-2">
|
||||
<div className="stat-title">User ID</div>
|
||||
<div className="stat-desc font-mono text-xs mt-1">
|
||||
{userAccountId}
|
||||
</div>
|
||||
<div className="stat-desc font-mono text-xs mt-1">{userAccountId}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -58,8 +56,8 @@ export default function Dashboard({ loaderData }: Route.ComponentProps) {
|
||||
<div>
|
||||
<p className="font-semibold">Login</p>
|
||||
<p className="text-sm text-base-content/60">
|
||||
POST to <code className="kbd kbd-sm">/api/auth/login</code>{" "}
|
||||
with username & password
|
||||
POST to <code className="kbd kbd-sm">/api/auth/login</code> with
|
||||
username & password
|
||||
</p>
|
||||
</div>
|
||||
</li>
|
||||
@@ -67,8 +65,7 @@ export default function Dashboard({ loaderData }: Route.ComponentProps) {
|
||||
<div>
|
||||
<p className="font-semibold">Register</p>
|
||||
<p className="text-sm text-base-content/60">
|
||||
POST to{" "}
|
||||
<code className="kbd kbd-sm">/api/auth/register</code> with
|
||||
POST to <code className="kbd kbd-sm">/api/auth/register</code> with
|
||||
full user details
|
||||
</p>
|
||||
</div>
|
||||
@@ -77,8 +74,7 @@ export default function Dashboard({ loaderData }: Route.ComponentProps) {
|
||||
<div>
|
||||
<p className="font-semibold">Session</p>
|
||||
<p className="text-sm text-base-content/60">
|
||||
JWT access & refresh tokens stored in an HTTP-only
|
||||
cookie
|
||||
JWT access & refresh tokens stored in an HTTP-only cookie
|
||||
</p>
|
||||
</div>
|
||||
</li>
|
||||
@@ -86,7 +82,7 @@ export default function Dashboard({ loaderData }: Route.ComponentProps) {
|
||||
<div>
|
||||
<p className="font-semibold">Protected Routes</p>
|
||||
<p className="text-sm text-base-content/60">
|
||||
This dashboard requires authentication via{" "}
|
||||
This dashboard requires authentication via{' '}
|
||||
<code className="kbd kbd-sm">requireAuth()</code>
|
||||
</p>
|
||||
</div>
|
||||
@@ -95,8 +91,7 @@ export default function Dashboard({ loaderData }: Route.ComponentProps) {
|
||||
<div>
|
||||
<p className="font-semibold">Token Refresh</p>
|
||||
<p className="text-sm text-base-content/60">
|
||||
POST to{" "}
|
||||
<code className="kbd kbd-sm">/api/auth/refresh</code> with
|
||||
POST to <code className="kbd kbd-sm">/api/auth/refresh</code> with
|
||||
refresh token
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import { Link } from "react-router";
|
||||
import { getOptionalAuth } from "../lib/auth.server";
|
||||
import type { Route } from "./+types/home";
|
||||
import { Link } from 'react-router';
|
||||
import { getOptionalAuth } from '../lib/auth.server';
|
||||
import type { Route } from './+types/home';
|
||||
|
||||
export function meta({}: Route.MetaArgs) {
|
||||
return [
|
||||
{ title: "The Biergarten App" },
|
||||
{ name: "description", content: "Welcome to The Biergarten App" },
|
||||
{ title: 'The Biergarten App' },
|
||||
{ name: 'description', content: 'Welcome to The Biergarten App' },
|
||||
];
|
||||
}
|
||||
|
||||
@@ -27,8 +27,8 @@ export default function Home({ loaderData }: Route.ComponentProps) {
|
||||
{username ? (
|
||||
<>
|
||||
<p className="text-base-content/80">
|
||||
Welcome back,{" "}
|
||||
<span className="font-semibold text-primary">{username}</span>!
|
||||
Welcome back, <span className="font-semibold text-primary">{username}</span>
|
||||
!
|
||||
</p>
|
||||
<div className="flex gap-3 justify-center">
|
||||
<Link to="/dashboard" className="btn btn-primary">
|
||||
|
||||
@@ -1,30 +1,30 @@
|
||||
import { zodResolver } from "@hookform/resolvers/zod";
|
||||
import { HomeSimpleDoor, LogIn, UserPlus } from "iconoir-react";
|
||||
import { useEffect } from "react";
|
||||
import { useForm } from "react-hook-form";
|
||||
import { Link, redirect, useNavigation, useSubmit } from "react-router";
|
||||
import FormField from "../components/forms/FormField";
|
||||
import SubmitButton from "../components/forms/SubmitButton";
|
||||
import { showErrorToast } from "../components/toast/toast";
|
||||
import { createAuthSession, getOptionalAuth, login } from "../lib/auth.server";
|
||||
import { loginSchema, type LoginSchema } from "../lib/schemas";
|
||||
import type { Route } from "./+types/login";
|
||||
import { zodResolver } from '@hookform/resolvers/zod';
|
||||
import { HomeSimpleDoor, LogIn, UserPlus } from 'iconoir-react';
|
||||
import { useEffect } from 'react';
|
||||
import { useForm } from 'react-hook-form';
|
||||
import { Link, redirect, useNavigation, useSubmit } from 'react-router';
|
||||
import FormField from '../components/forms/FormField';
|
||||
import SubmitButton from '../components/forms/SubmitButton';
|
||||
import { showErrorToast } from '../components/toast/toast';
|
||||
import { createAuthSession, getOptionalAuth, login } from '../lib/auth.server';
|
||||
import { loginSchema, type LoginSchema } from '../lib/schemas';
|
||||
import type { Route } from './+types/login';
|
||||
|
||||
export function meta({}: Route.MetaArgs) {
|
||||
return [{ title: "Login | The Biergarten App" }];
|
||||
return [{ title: 'Login | The Biergarten App' }];
|
||||
}
|
||||
|
||||
export async function loader({ request }: Route.LoaderArgs) {
|
||||
const auth = await getOptionalAuth(request);
|
||||
if (auth) throw redirect("/dashboard");
|
||||
if (auth) throw redirect('/dashboard');
|
||||
return null;
|
||||
}
|
||||
|
||||
export async function action({ request }: Route.ActionArgs) {
|
||||
const formData = await request.formData();
|
||||
const result = loginSchema.safeParse({
|
||||
username: formData.get("username"),
|
||||
password: formData.get("password"),
|
||||
username: formData.get('username'),
|
||||
password: formData.get('password'),
|
||||
});
|
||||
|
||||
if (!result.success) {
|
||||
@@ -33,16 +33,16 @@ export async function action({ request }: Route.ActionArgs) {
|
||||
|
||||
try {
|
||||
const payload = await login(result.data.username, result.data.password);
|
||||
return createAuthSession(payload, "/dashboard");
|
||||
return createAuthSession(payload, '/dashboard');
|
||||
} catch (err) {
|
||||
return { error: err instanceof Error ? err.message : "Login failed." };
|
||||
return { error: err instanceof Error ? err.message : 'Login failed.' };
|
||||
}
|
||||
}
|
||||
|
||||
export default function Login({ actionData }: Route.ComponentProps) {
|
||||
const navigation = useNavigation();
|
||||
const submit = useSubmit();
|
||||
const isSubmitting = navigation.state === "submitting";
|
||||
const isSubmitting = navigation.state === 'submitting';
|
||||
|
||||
const {
|
||||
register,
|
||||
@@ -51,7 +51,7 @@ export default function Login({ actionData }: Route.ComponentProps) {
|
||||
} = useForm<LoginSchema>({ resolver: zodResolver(loginSchema) });
|
||||
|
||||
const onSubmit = handleSubmit((data) => {
|
||||
submit(data, { method: "post" });
|
||||
submit(data, { method: 'post' });
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
@@ -86,7 +86,7 @@ export default function Login({ actionData }: Route.ComponentProps) {
|
||||
placeholder="your_username"
|
||||
label="Username"
|
||||
error={errors.username?.message}
|
||||
{...register("username")}
|
||||
{...register('username')}
|
||||
/>
|
||||
|
||||
<FormField
|
||||
@@ -96,7 +96,7 @@ export default function Login({ actionData }: Route.ComponentProps) {
|
||||
placeholder="••••••••"
|
||||
label="Password"
|
||||
error={errors.password?.message}
|
||||
{...register("password")}
|
||||
{...register('password')}
|
||||
/>
|
||||
|
||||
<SubmitButton
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import { redirect } from "react-router";
|
||||
import { destroySession, getSession } from "../lib/auth.server";
|
||||
import type { Route } from "./+types/logout";
|
||||
import { redirect } from 'react-router';
|
||||
import { destroySession, getSession } from '../lib/auth.server';
|
||||
import type { Route } from './+types/logout';
|
||||
|
||||
export async function loader({ request }: Route.LoaderArgs) {
|
||||
const session = await getSession(request);
|
||||
return redirect("/", {
|
||||
headers: { "Set-Cookie": await destroySession(session) },
|
||||
return redirect('/', {
|
||||
headers: { 'Set-Cookie': await destroySession(session) },
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,34 +1,34 @@
|
||||
import { zodResolver } from "@hookform/resolvers/zod";
|
||||
import { useEffect } from "react";
|
||||
import { useForm } from "react-hook-form";
|
||||
import { Link, redirect, useNavigation, useSubmit } from "react-router";
|
||||
import FormField from "../components/forms/FormField";
|
||||
import SubmitButton from "../components/forms/SubmitButton";
|
||||
import { showErrorToast } from "../components/toast/toast";
|
||||
import { createAuthSession, getOptionalAuth, register } from "../lib/auth.server";
|
||||
import { registerSchema, type RegisterSchema } from "../lib/schemas";
|
||||
import type { Route } from "./+types/register";
|
||||
import { zodResolver } from '@hookform/resolvers/zod';
|
||||
import { useEffect } from 'react';
|
||||
import { useForm } from 'react-hook-form';
|
||||
import { Link, redirect, useNavigation, useSubmit } from 'react-router';
|
||||
import FormField from '../components/forms/FormField';
|
||||
import SubmitButton from '../components/forms/SubmitButton';
|
||||
import { showErrorToast } from '../components/toast/toast';
|
||||
import { createAuthSession, getOptionalAuth, register } from '../lib/auth.server';
|
||||
import { registerSchema, type RegisterSchema } from '../lib/schemas';
|
||||
import type { Route } from './+types/register';
|
||||
|
||||
export function meta({}: Route.MetaArgs) {
|
||||
return [{ title: "Register | The Biergarten App" }];
|
||||
return [{ title: 'Register | The Biergarten App' }];
|
||||
}
|
||||
|
||||
export async function loader({ request }: Route.LoaderArgs) {
|
||||
const auth = await getOptionalAuth(request);
|
||||
if (auth) throw redirect("/dashboard");
|
||||
if (auth) throw redirect('/dashboard');
|
||||
return null;
|
||||
}
|
||||
|
||||
export async function action({ request }: Route.ActionArgs) {
|
||||
const formData = await request.formData();
|
||||
const result = registerSchema.safeParse({
|
||||
username: formData.get("username"),
|
||||
firstName: formData.get("firstName"),
|
||||
lastName: formData.get("lastName"),
|
||||
email: formData.get("email"),
|
||||
dateOfBirth: formData.get("dateOfBirth"),
|
||||
password: formData.get("password"),
|
||||
confirmPassword: formData.get("confirmPassword"),
|
||||
username: formData.get('username'),
|
||||
firstName: formData.get('firstName'),
|
||||
lastName: formData.get('lastName'),
|
||||
email: formData.get('email'),
|
||||
dateOfBirth: formData.get('dateOfBirth'),
|
||||
password: formData.get('password'),
|
||||
confirmPassword: formData.get('confirmPassword'),
|
||||
});
|
||||
|
||||
if (!result.success) {
|
||||
@@ -46,10 +46,10 @@ export async function action({ request }: Route.ActionArgs) {
|
||||
password: result.data.password,
|
||||
};
|
||||
const payload = await register(body);
|
||||
return createAuthSession(payload, "/dashboard");
|
||||
return createAuthSession(payload, '/dashboard');
|
||||
} catch (err) {
|
||||
return {
|
||||
error: err instanceof Error ? err.message : "Registration failed.",
|
||||
error: err instanceof Error ? err.message : 'Registration failed.',
|
||||
fieldErrors: null,
|
||||
};
|
||||
}
|
||||
@@ -58,7 +58,7 @@ export async function action({ request }: Route.ActionArgs) {
|
||||
export default function Register({ actionData }: Route.ComponentProps) {
|
||||
const navigation = useNavigation();
|
||||
const submit = useSubmit();
|
||||
const isSubmitting = navigation.state === "submitting";
|
||||
const isSubmitting = navigation.state === 'submitting';
|
||||
|
||||
const {
|
||||
register: field,
|
||||
@@ -67,7 +67,7 @@ export default function Register({ actionData }: Route.ComponentProps) {
|
||||
} = useForm<RegisterSchema>({ resolver: zodResolver(registerSchema) });
|
||||
|
||||
const onSubmit = handleSubmit((data) => {
|
||||
submit(data, { method: "post" });
|
||||
submit(data, { method: 'post' });
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
@@ -100,7 +100,7 @@ export default function Register({ actionData }: Route.ComponentProps) {
|
||||
label="Username"
|
||||
hint="3-64 characters, alphanumeric and . _ -"
|
||||
error={errors.username?.message}
|
||||
{...field("username")}
|
||||
{...field('username')}
|
||||
/>
|
||||
|
||||
<div className="grid grid-cols-2 gap-3">
|
||||
@@ -111,7 +111,7 @@ export default function Register({ actionData }: Route.ComponentProps) {
|
||||
placeholder="Jane"
|
||||
label="First Name"
|
||||
error={errors.firstName?.message}
|
||||
{...field("firstName")}
|
||||
{...field('firstName')}
|
||||
/>
|
||||
|
||||
<FormField
|
||||
@@ -121,7 +121,7 @@ export default function Register({ actionData }: Route.ComponentProps) {
|
||||
placeholder="Doe"
|
||||
label="Last Name"
|
||||
error={errors.lastName?.message}
|
||||
{...field("lastName")}
|
||||
{...field('lastName')}
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -132,7 +132,7 @@ export default function Register({ actionData }: Route.ComponentProps) {
|
||||
placeholder="jane@example.com"
|
||||
label="Email"
|
||||
error={errors.email?.message}
|
||||
{...field("email")}
|
||||
{...field('email')}
|
||||
/>
|
||||
|
||||
<FormField
|
||||
@@ -141,7 +141,7 @@ export default function Register({ actionData }: Route.ComponentProps) {
|
||||
label="Date of Birth"
|
||||
hint="Must be 19 years or older"
|
||||
error={errors.dateOfBirth?.message}
|
||||
{...field("dateOfBirth")}
|
||||
{...field('dateOfBirth')}
|
||||
/>
|
||||
|
||||
<FormField
|
||||
@@ -152,7 +152,7 @@ export default function Register({ actionData }: Route.ComponentProps) {
|
||||
label="Password"
|
||||
hint="8+ chars: uppercase, lowercase, digit, special character"
|
||||
error={errors.password?.message}
|
||||
{...field("password")}
|
||||
{...field('password')}
|
||||
/>
|
||||
|
||||
<FormField
|
||||
@@ -162,7 +162,7 @@ export default function Register({ actionData }: Route.ComponentProps) {
|
||||
placeholder="••••••••"
|
||||
label="Confirm Password"
|
||||
error={errors.confirmPassword?.message}
|
||||
{...field("confirmPassword")}
|
||||
{...field('confirmPassword')}
|
||||
/>
|
||||
|
||||
<SubmitButton
|
||||
|
||||
@@ -1,31 +1,31 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { useEffect, useState } from 'react';
|
||||
import {
|
||||
biergartenThemes,
|
||||
defaultThemeName,
|
||||
isBiergartenTheme,
|
||||
themeStorageKey,
|
||||
type ThemeName,
|
||||
} from "../lib/themes";
|
||||
import type { Route } from "./+types/theme";
|
||||
} from '../lib/themes';
|
||||
import type { Route } from './+types/theme';
|
||||
|
||||
export function meta({}: Route.MetaArgs) {
|
||||
return [
|
||||
{ title: "Theme | The Biergarten App" },
|
||||
{ title: 'Theme | The Biergarten App' },
|
||||
{
|
||||
name: "description",
|
||||
content: "Theme guide and switcher for The Biergarten App",
|
||||
name: 'description',
|
||||
content: 'Theme guide and switcher for The Biergarten App',
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
function applyTheme(theme: ThemeName) {
|
||||
document.documentElement.setAttribute("data-theme", theme);
|
||||
document.documentElement.setAttribute('data-theme', theme);
|
||||
localStorage.setItem(themeStorageKey, theme);
|
||||
}
|
||||
|
||||
export default function ThemePage() {
|
||||
const [selectedTheme, setSelectedTheme] = useState<ThemeName>(() => {
|
||||
if (typeof window === "undefined") {
|
||||
if (typeof window === 'undefined') {
|
||||
return defaultThemeName;
|
||||
}
|
||||
|
||||
@@ -47,9 +47,10 @@ export default function ThemePage() {
|
||||
<div className="card-body gap-4">
|
||||
<h1 className="card-title text-3xl sm:text-4xl">Theme Guide</h1>
|
||||
<p className="text-base-content/70">
|
||||
Four themes, four moods — from the sun-bleached clarity of a Weizen afternoon to the
|
||||
deep berry dark of a Cassis barrel. Every theme shares the same semantic token
|
||||
structure so components stay consistent while the atmosphere shifts completely.
|
||||
Four themes, four moods — from the sun-bleached clarity of a Weizen afternoon
|
||||
to the deep berry dark of a Cassis barrel. Every theme shares the same semantic
|
||||
token structure so components stay consistent while the atmosphere shifts
|
||||
completely.
|
||||
</p>
|
||||
<div className="alert alert-info alert-soft">
|
||||
<span>
|
||||
@@ -75,7 +76,7 @@ export default function ThemePage() {
|
||||
return (
|
||||
<label
|
||||
key={theme.value}
|
||||
className={`btn join-item ${checked ? "btn-primary" : "btn-outline"}`}
|
||||
className={`btn join-item ${checked ? 'btn-primary' : 'btn-outline'}`}
|
||||
>
|
||||
<input
|
||||
type="radio"
|
||||
@@ -101,10 +102,16 @@ export default function ThemePage() {
|
||||
<div className="card-body">
|
||||
<h3 className="card-title">Brand colors</h3>
|
||||
<div className="grid grid-cols-2 gap-2 text-sm font-medium">
|
||||
<div className="rounded-box bg-primary p-3 text-primary-content">Primary</div>
|
||||
<div className="rounded-box bg-secondary p-3 text-secondary-content">Secondary</div>
|
||||
<div className="rounded-box bg-primary p-3 text-primary-content">
|
||||
Primary
|
||||
</div>
|
||||
<div className="rounded-box bg-secondary p-3 text-secondary-content">
|
||||
Secondary
|
||||
</div>
|
||||
<div className="rounded-box bg-accent p-3 text-accent-content">Accent</div>
|
||||
<div className="rounded-box bg-neutral p-3 text-neutral-content">Neutral</div>
|
||||
<div className="rounded-box bg-neutral p-3 text-neutral-content">
|
||||
Neutral
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -114,8 +121,12 @@ export default function ThemePage() {
|
||||
<h3 className="card-title">Status colors</h3>
|
||||
<div className="space-y-2 text-sm font-medium">
|
||||
<div className="rounded-box bg-info p-3 text-info-content">Info</div>
|
||||
<div className="rounded-box bg-success p-3 text-success-content">Success</div>
|
||||
<div className="rounded-box bg-warning p-3 text-warning-content">Warning</div>
|
||||
<div className="rounded-box bg-success p-3 text-success-content">
|
||||
Success
|
||||
</div>
|
||||
<div className="rounded-box bg-warning p-3 text-warning-content">
|
||||
Warning
|
||||
</div>
|
||||
<div className="rounded-box bg-error p-3 text-error-content">Error</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,24 +1,26 @@
|
||||
// For more info, see https://github.com/storybookjs/eslint-plugin-storybook#configuration-flat-config-format
|
||||
import storybook from "eslint-plugin-storybook";
|
||||
import storybook from 'eslint-plugin-storybook';
|
||||
|
||||
import js from "@eslint/js";
|
||||
import prettierConfig from "eslint-config-prettier";
|
||||
import reactHooks from "eslint-plugin-react-hooks";
|
||||
import globals from "globals";
|
||||
import tseslint from "typescript-eslint";
|
||||
import js from '@eslint/js';
|
||||
import prettierConfig from 'eslint-config-prettier';
|
||||
import reactHooks from 'eslint-plugin-react-hooks';
|
||||
import globals from 'globals';
|
||||
import tseslint from 'typescript-eslint';
|
||||
|
||||
export default tseslint.config({
|
||||
ignores: ["build/**", "node_modules/**", ".react-router/**", "coverage/**"],
|
||||
}, {
|
||||
files: ["**/*.{ts,tsx}"],
|
||||
export default tseslint.config(
|
||||
{
|
||||
ignores: ['build/**', 'node_modules/**', '.react-router/**', 'coverage/**'],
|
||||
},
|
||||
{
|
||||
files: ['**/*.{ts,tsx}'],
|
||||
extends: [
|
||||
js.configs.recommended,
|
||||
...tseslint.configs.recommended,
|
||||
...tseslint.configs.stylistic,
|
||||
],
|
||||
languageOptions: {
|
||||
ecmaVersion: "latest",
|
||||
sourceType: "module",
|
||||
ecmaVersion: 'latest',
|
||||
sourceType: 'module',
|
||||
globals: {
|
||||
...globals.browser,
|
||||
...globals.node,
|
||||
@@ -30,18 +32,21 @@ export default tseslint.config({
|
||||
},
|
||||
},
|
||||
plugins: {
|
||||
"react-hooks": reactHooks,
|
||||
'react-hooks': reactHooks,
|
||||
},
|
||||
rules: {
|
||||
...reactHooks.configs.recommended.rules,
|
||||
"no-empty-pattern": "off",
|
||||
"@typescript-eslint/no-unused-vars": [
|
||||
"warn",
|
||||
'no-empty-pattern': 'off',
|
||||
'@typescript-eslint/no-unused-vars': [
|
||||
'warn',
|
||||
{
|
||||
argsIgnorePattern: "^_",
|
||||
varsIgnorePattern: "^_",
|
||||
caughtErrorsIgnorePattern: "^_",
|
||||
argsIgnorePattern: '^_',
|
||||
varsIgnorePattern: '^_',
|
||||
caughtErrorsIgnorePattern: '^_',
|
||||
},
|
||||
],
|
||||
},
|
||||
}, prettierConfig, storybook.configs["flat/recommended"]);
|
||||
},
|
||||
prettierConfig,
|
||||
storybook.configs['flat/recommended'],
|
||||
);
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
import { defineConfig } from "@playwright/test";
|
||||
import { defineConfig } from '@playwright/test';
|
||||
|
||||
const port = process.env.STORYBOOK_PORT ?? "6006";
|
||||
const port = process.env.STORYBOOK_PORT ?? '6006';
|
||||
const baseURL = process.env.STORYBOOK_URL ?? `http://127.0.0.1:${port}`;
|
||||
|
||||
export default defineConfig({
|
||||
testDir: "./tests/playwright",
|
||||
testDir: './tests/playwright',
|
||||
timeout: 30_000,
|
||||
retries: process.env.CI ? 2 : 0,
|
||||
use: {
|
||||
baseURL,
|
||||
trace: "on-first-retry",
|
||||
trace: 'on-first-retry',
|
||||
},
|
||||
webServer: {
|
||||
command: `npm run storybook -- --ci --port ${port}`,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
export default {
|
||||
plugins: {
|
||||
"@tailwindcss/postcss": {},
|
||||
'@tailwindcss/postcss': {},
|
||||
},
|
||||
};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { Config } from "@react-router/dev/config";
|
||||
import type { Config } from '@react-router/dev/config';
|
||||
|
||||
export default {
|
||||
ssr: true,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Meta } from "@storybook/addon-docs/blocks";
|
||||
import { Meta } from '@storybook/addon-docs/blocks';
|
||||
|
||||
<Meta title="Docs/Storybook" />
|
||||
|
||||
|
||||
@@ -1,21 +1,28 @@
|
||||
import type { Meta, StoryObj } from "@storybook/react-vite";
|
||||
import { expect, within } from "storybook/test";
|
||||
import FormField from "../app/components/forms/FormField";
|
||||
import type { Meta, StoryObj } from '@storybook/react-vite';
|
||||
import { expect, within } from 'storybook/test';
|
||||
import FormField from '../app/components/forms/FormField';
|
||||
|
||||
const formFieldDescription = `Reusable labeled input for Biergarten forms. This page shows guided, error, and password states so you can review label spacing, helper text, validation messaging, and ARIA behavior in the same card layout used across the app.`;
|
||||
|
||||
const meta = {
|
||||
title: "Forms/FormField",
|
||||
title: 'Forms/FormField',
|
||||
component: FormField,
|
||||
tags: ["autodocs"],
|
||||
tags: ['autodocs'],
|
||||
args: {
|
||||
id: "email",
|
||||
name: "email",
|
||||
type: "email",
|
||||
label: "Email address",
|
||||
placeholder: "you@example.com",
|
||||
hint: "We only use this to manage your account.",
|
||||
id: 'email',
|
||||
name: 'email',
|
||||
type: 'email',
|
||||
label: 'Email address',
|
||||
placeholder: 'you@example.com',
|
||||
hint: 'We only use this to manage your account.',
|
||||
},
|
||||
parameters: {
|
||||
layout: "centered",
|
||||
layout: 'centered',
|
||||
docs: {
|
||||
description: {
|
||||
component: formFieldDescription,
|
||||
},
|
||||
},
|
||||
},
|
||||
render: (args) => (
|
||||
<div className="w-full max-w-md rounded-box bg-base-100 p-6 shadow-lg">
|
||||
@@ -37,25 +44,25 @@ export const WithHint: Story = {
|
||||
|
||||
export const WithError: Story = {
|
||||
args: {
|
||||
error: "Please enter a valid email address.",
|
||||
error: 'Please enter a valid email address.',
|
||||
hint: undefined,
|
||||
"aria-invalid": true,
|
||||
defaultValue: "not-an-email",
|
||||
'aria-invalid': true,
|
||||
defaultValue: 'not-an-email',
|
||||
},
|
||||
play: async ({ canvasElement }) => {
|
||||
const canvas = within(canvasElement);
|
||||
await expect(canvas.getByText(/valid email address/i)).toBeInTheDocument();
|
||||
await expect(canvas.getByLabelText(/email address/i)).toHaveAttribute("aria-invalid", "true");
|
||||
await expect(canvas.getByLabelText(/email address/i)).toHaveAttribute('aria-invalid', 'true');
|
||||
},
|
||||
};
|
||||
|
||||
export const PasswordField: Story = {
|
||||
args: {
|
||||
id: "password",
|
||||
name: "password",
|
||||
type: "password",
|
||||
label: "Password",
|
||||
placeholder: "Enter a strong password",
|
||||
hint: "Use 12 or more characters.",
|
||||
id: 'password',
|
||||
name: 'password',
|
||||
type: 'password',
|
||||
label: 'Password',
|
||||
placeholder: 'Enter a strong password',
|
||||
hint: 'Use 12 or more characters.',
|
||||
},
|
||||
};
|
||||
|
||||
@@ -1,13 +1,20 @@
|
||||
import type { Meta, StoryObj } from "@storybook/react-vite";
|
||||
import { expect, userEvent, within } from "storybook/test";
|
||||
import Navbar from "../app/components/Navbar";
|
||||
import type { Meta, StoryObj } from '@storybook/react-vite';
|
||||
import { expect, userEvent, within } from 'storybook/test';
|
||||
import Navbar from '../app/components/Navbar';
|
||||
|
||||
const navbarDescription = `Top-level navigation for the Biergarten website. These stories cover guest, authenticated, and mobile states so you can review branding, route visibility, account menu behavior, and responsive collapse without leaving Storybook.`;
|
||||
|
||||
const meta = {
|
||||
title: "Navigation/Navbar",
|
||||
title: 'Navigation/Navbar',
|
||||
component: Navbar,
|
||||
tags: ["autodocs"],
|
||||
tags: ['autodocs'],
|
||||
parameters: {
|
||||
layout: "fullscreen",
|
||||
layout: 'fullscreen',
|
||||
docs: {
|
||||
description: {
|
||||
component: navbarDescription,
|
||||
},
|
||||
},
|
||||
},
|
||||
} satisfies Meta<typeof Navbar>;
|
||||
|
||||
@@ -20,28 +27,28 @@ export const Guest: Story = {
|
||||
},
|
||||
play: async ({ canvasElement }) => {
|
||||
const canvas = within(canvasElement);
|
||||
await expect(canvas.getByRole("link", { name: /the biergarten app/i })).toBeInTheDocument();
|
||||
await expect(canvas.getByRole("link", { name: /login/i })).toBeInTheDocument();
|
||||
await expect(canvas.getByRole("link", { name: /register user/i })).toBeInTheDocument();
|
||||
await expect(canvas.getByRole('link', { name: /the biergarten app/i })).toBeInTheDocument();
|
||||
await expect(canvas.getByRole('link', { name: /login/i })).toBeInTheDocument();
|
||||
await expect(canvas.getByRole('link', { name: /register user/i })).toBeInTheDocument();
|
||||
},
|
||||
};
|
||||
|
||||
export const Authenticated: Story = {
|
||||
args: {
|
||||
auth: {
|
||||
username: "Hans",
|
||||
accessToken: "access-token",
|
||||
refreshToken: "refresh-token",
|
||||
userAccountId: "user-1",
|
||||
username: 'Hans',
|
||||
accessToken: 'access-token',
|
||||
refreshToken: 'refresh-token',
|
||||
userAccountId: 'user-1',
|
||||
},
|
||||
},
|
||||
play: async ({ canvasElement }) => {
|
||||
const canvas = within(canvasElement);
|
||||
const userButton = canvas.getByRole("button", { name: /hans/i });
|
||||
const userButton = canvas.getByRole('button', { name: /hans/i });
|
||||
await expect(userButton).toBeInTheDocument();
|
||||
await userEvent.click(userButton);
|
||||
await expect(canvas.getByRole("menuitem", { name: /dashboard/i })).toBeInTheDocument();
|
||||
await expect(canvas.getByRole("menuitem", { name: /logout/i })).toBeInTheDocument();
|
||||
await expect(canvas.getByRole('menuitem', { name: /dashboard/i })).toBeInTheDocument();
|
||||
await expect(canvas.getByRole('menuitem', { name: /logout/i })).toBeInTheDocument();
|
||||
},
|
||||
};
|
||||
|
||||
@@ -51,12 +58,12 @@ export const MobileMenu: Story = {
|
||||
},
|
||||
parameters: {
|
||||
viewport: {
|
||||
defaultViewport: "mobile1",
|
||||
defaultViewport: 'mobile1',
|
||||
},
|
||||
},
|
||||
play: async ({ canvasElement }) => {
|
||||
const canvas = within(canvasElement);
|
||||
await userEvent.click(canvas.getByRole("button", { name: /toggle navigation/i }));
|
||||
await expect(canvas.getByRole("link", { name: /beer styles/i })).toBeInTheDocument();
|
||||
await userEvent.click(canvas.getByRole('button', { name: /toggle navigation/i }));
|
||||
await expect(canvas.getByRole('link', { name: /beer styles/i })).toBeInTheDocument();
|
||||
},
|
||||
};
|
||||
|
||||
@@ -1,18 +1,25 @@
|
||||
import type { Meta, StoryObj } from "@storybook/react-vite";
|
||||
import { expect, within } from "storybook/test";
|
||||
import SubmitButton from "../app/components/forms/SubmitButton";
|
||||
import type { Meta, StoryObj } from '@storybook/react-vite';
|
||||
import { expect, within } from 'storybook/test';
|
||||
import SubmitButton from '../app/components/forms/SubmitButton';
|
||||
|
||||
const submitButtonDescription = `Shared submit action for Biergarten forms. These stories cover the idle, loading, and custom-width states so you can verify button copy, disabled behavior during submission, and theme styling without wiring up a full form flow.`;
|
||||
|
||||
const meta = {
|
||||
title: "Forms/SubmitButton",
|
||||
title: 'Forms/SubmitButton',
|
||||
component: SubmitButton,
|
||||
tags: ["autodocs"],
|
||||
tags: ['autodocs'],
|
||||
args: {
|
||||
idleText: "Save changes",
|
||||
submittingText: "Saving changes",
|
||||
idleText: 'Save changes',
|
||||
submittingText: 'Saving changes',
|
||||
isSubmitting: false,
|
||||
},
|
||||
parameters: {
|
||||
layout: "centered",
|
||||
layout: 'centered',
|
||||
docs: {
|
||||
description: {
|
||||
component: submitButtonDescription,
|
||||
},
|
||||
},
|
||||
},
|
||||
} satisfies Meta<typeof SubmitButton>;
|
||||
|
||||
@@ -22,7 +29,7 @@ type Story = StoryObj<typeof meta>;
|
||||
export const Idle: Story = {
|
||||
play: async ({ canvasElement }) => {
|
||||
const canvas = within(canvasElement);
|
||||
await expect(canvas.getByRole("button", { name: /save changes/i })).toBeEnabled();
|
||||
await expect(canvas.getByRole('button', { name: /save changes/i })).toBeEnabled();
|
||||
},
|
||||
};
|
||||
|
||||
@@ -32,14 +39,14 @@ export const Submitting: Story = {
|
||||
},
|
||||
play: async ({ canvasElement }) => {
|
||||
const canvas = within(canvasElement);
|
||||
await expect(canvas.getByRole("button", { name: /saving changes/i })).toBeDisabled();
|
||||
await expect(canvas.getByRole('button', { name: /saving changes/i })).toBeDisabled();
|
||||
},
|
||||
};
|
||||
|
||||
export const CustomWidth: Story = {
|
||||
args: {
|
||||
className: "btn btn-secondary min-w-64",
|
||||
idleText: "Register user",
|
||||
submittingText: "Registering user",
|
||||
className: 'btn btn-secondary min-w-64',
|
||||
idleText: 'Register user',
|
||||
submittingText: 'Registering user',
|
||||
},
|
||||
};
|
||||
|
||||
@@ -1,11 +1,46 @@
|
||||
import type { Meta, StoryObj } from "@storybook/react-vite";
|
||||
import { expect, within } from "storybook/test";
|
||||
import { biergartenThemes } from "../app/lib/themes";
|
||||
import type { Meta, StoryObj } from '@storybook/react-vite';
|
||||
import { expect, within } from 'storybook/test';
|
||||
import { biergartenThemes } from '../app/lib/themes';
|
||||
|
||||
const themesDescription = `Palette reference for all Biergarten themes. Each panel shows the main semantic color pairs, status tokens, and custom content tokens so you can catch contrast issues, pairing mistakes, and mood drift before they show up in real components.`;
|
||||
|
||||
function ThemeSwatch({ label, className }: { label: string; className: string }) {
|
||||
return <div className={`rounded-box p-3 text-sm font-medium ${className}`}>{label}</div>;
|
||||
}
|
||||
|
||||
/** For custom tokens not covered by Tailwind utilities (surface, muted, highlight). */
|
||||
function CssVarSwatch({ label, bg, color }: { label: string; bg: string; color: string }) {
|
||||
return (
|
||||
<div
|
||||
className="rounded-box p-3 text-sm font-medium"
|
||||
style={{ backgroundColor: `var(${bg})`, color: `var(${color})` }}
|
||||
>
|
||||
{label}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function TextTokenSample({
|
||||
label,
|
||||
background,
|
||||
text,
|
||||
}: {
|
||||
label: string;
|
||||
background: string;
|
||||
text: string;
|
||||
}) {
|
||||
return (
|
||||
<div className="rounded-box p-3" style={{ backgroundColor: `var(${background})` }}>
|
||||
<p className="text-xs font-semibold uppercase tracking-wide text-base-content/50">
|
||||
{label}
|
||||
</p>
|
||||
<p className="mt-1 text-sm font-medium" style={{ color: `var(${text})` }}>
|
||||
Secondary copy, placeholders, and helper text.
|
||||
</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function ThemePanel({ label, value, vibe }: { label: string; value: string; vibe: string }) {
|
||||
return (
|
||||
<section
|
||||
@@ -18,12 +53,62 @@ function ThemePanel({ label, value, vibe }: { label: string; value: string; vibe
|
||||
<p className="text-sm text-base-content/70">{vibe}</p>
|
||||
</div>
|
||||
|
||||
{/* Core palette */}
|
||||
<div>
|
||||
<p className="mb-1.5 text-xs font-semibold uppercase tracking-wide text-base-content/50">
|
||||
Core
|
||||
</p>
|
||||
<div className="grid gap-2 sm:grid-cols-2">
|
||||
<ThemeSwatch label="Primary" className="bg-primary text-primary-content" />
|
||||
<ThemeSwatch label="Secondary" className="bg-secondary text-secondary-content" />
|
||||
<ThemeSwatch label="Accent" className="bg-accent text-accent-content" />
|
||||
<ThemeSwatch label="Neutral" className="bg-neutral text-neutral-content" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Status tokens */}
|
||||
<div>
|
||||
<p className="mb-1.5 text-xs font-semibold uppercase tracking-wide text-base-content/50">
|
||||
Status
|
||||
</p>
|
||||
<div className="grid gap-2 grid-cols-2 sm:grid-cols-4">
|
||||
<ThemeSwatch label="Info" className="bg-info text-info-content" />
|
||||
<ThemeSwatch label="Success" className="bg-success text-success-content" />
|
||||
<ThemeSwatch label="Warning" className="bg-warning text-warning-content" />
|
||||
<ThemeSwatch label="Error" className="bg-error text-error-content" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Content tokens (custom) */}
|
||||
<div>
|
||||
<p className="mb-1.5 text-xs font-semibold uppercase tracking-wide text-base-content/50">
|
||||
Content
|
||||
</p>
|
||||
<div className="grid gap-2 sm:grid-cols-3">
|
||||
<CssVarSwatch
|
||||
label="Surface"
|
||||
bg="--color-surface"
|
||||
color="--color-surface-content"
|
||||
/>
|
||||
<TextTokenSample
|
||||
label="Muted on Base"
|
||||
background="--color-base-100"
|
||||
text="--color-muted"
|
||||
/>
|
||||
<CssVarSwatch
|
||||
label="Highlight"
|
||||
bg="--color-highlight"
|
||||
color="--color-highlight-content"
|
||||
/>
|
||||
</div>
|
||||
<div className="mt-2">
|
||||
<TextTokenSample
|
||||
label="Muted on Surface"
|
||||
background="--color-surface"
|
||||
text="--color-muted"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex flex-wrap gap-2">
|
||||
<button className="btn btn-primary btn-sm">Primary</button>
|
||||
@@ -31,7 +116,7 @@ function ThemePanel({ label, value, vibe }: { label: string; value: string; vibe
|
||||
<button className="btn btn-outline btn-sm">Outline</button>
|
||||
</div>
|
||||
|
||||
<div role="alert" className="alert alert-info alert-soft">
|
||||
<div role="alert" className="alert alert-success alert-soft">
|
||||
<span>Semantic tokens stay stable while the atmosphere changes.</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -40,11 +125,16 @@ function ThemePanel({ label, value, vibe }: { label: string; value: string; vibe
|
||||
}
|
||||
|
||||
const meta = {
|
||||
title: "Themes/Biergarten Themes",
|
||||
title: 'Themes/Biergarten Themes',
|
||||
parameters: {
|
||||
layout: "fullscreen",
|
||||
layout: 'fullscreen',
|
||||
docs: {
|
||||
description: {
|
||||
component: themesDescription,
|
||||
},
|
||||
tags: ["autodocs"],
|
||||
},
|
||||
},
|
||||
tags: ['autodocs'],
|
||||
render: () => (
|
||||
<div className="grid gap-6 p-6 lg:grid-cols-2">
|
||||
{biergartenThemes.map((theme) => (
|
||||
@@ -61,7 +151,7 @@ export const Gallery: Story = {
|
||||
play: async ({ canvasElement }) => {
|
||||
const canvas = within(canvasElement);
|
||||
for (const theme of biergartenThemes) {
|
||||
await expect(canvas.getByRole("heading", { name: theme.label })).toBeInTheDocument();
|
||||
await expect(canvas.getByRole('heading', { name: theme.label })).toBeInTheDocument();
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
import type { Meta, StoryObj } from "@storybook/react-vite";
|
||||
import { expect, screen, userEvent, within } from "storybook/test";
|
||||
import ToastProvider from "../app/components/toast/ToastProvider";
|
||||
import type { Meta, StoryObj } from '@storybook/react-vite';
|
||||
import { expect, screen, userEvent, within } from 'storybook/test';
|
||||
import ToastProvider from '../app/components/toast/ToastProvider';
|
||||
import {
|
||||
dismissToasts,
|
||||
showErrorToast,
|
||||
showInfoToast,
|
||||
showSuccessToast,
|
||||
} from "../app/components/toast/toast";
|
||||
} from '../app/components/toast/toast';
|
||||
|
||||
const toastDescription = `Theme-aware toast feedback built on react-hot-toast. Use this page to trigger success, error, and info messages, check icon contrast and surface styling, and confirm notifications feel consistent across Biergarten themes.`;
|
||||
|
||||
function ToastDemo() {
|
||||
return (
|
||||
@@ -15,23 +17,25 @@ function ToastDemo() {
|
||||
<div className="card border border-base-300 bg-base-100 shadow-md">
|
||||
<div className="card-body">
|
||||
<h2 className="card-title">Toast demo</h2>
|
||||
<p className="text-sm text-base-content/70">Use these actions to preview toast styles.</p>
|
||||
<p className="text-sm text-base-content/70">
|
||||
Use these actions to preview toast styles.
|
||||
</p>
|
||||
<div className="flex flex-wrap gap-2">
|
||||
<button
|
||||
className="btn btn-success btn-sm"
|
||||
onClick={() => showSuccessToast("Saved successfully")}
|
||||
onClick={() => showSuccessToast('Saved successfully')}
|
||||
>
|
||||
Success
|
||||
</button>
|
||||
<button
|
||||
className="btn btn-error btn-sm"
|
||||
onClick={() => showErrorToast("Something went wrong")}
|
||||
onClick={() => showErrorToast('Something went wrong')}
|
||||
>
|
||||
Error
|
||||
</button>
|
||||
<button
|
||||
className="btn btn-info btn-sm"
|
||||
onClick={() => showInfoToast("Heads up: check your email")}
|
||||
onClick={() => showInfoToast('Heads up: check your email')}
|
||||
>
|
||||
Info
|
||||
</button>
|
||||
@@ -46,9 +50,16 @@ function ToastDemo() {
|
||||
}
|
||||
|
||||
const meta = {
|
||||
title: "Feedback/Toast",
|
||||
title: 'Feedback/Toast',
|
||||
component: ToastDemo,
|
||||
tags: ["autodocs"],
|
||||
tags: ['autodocs'],
|
||||
parameters: {
|
||||
docs: {
|
||||
description: {
|
||||
component: toastDescription,
|
||||
},
|
||||
},
|
||||
},
|
||||
} satisfies Meta<typeof ToastDemo>;
|
||||
|
||||
export default meta;
|
||||
@@ -57,7 +68,7 @@ type Story = StoryObj<typeof meta>;
|
||||
export const Playground: Story = {
|
||||
play: async ({ canvasElement }) => {
|
||||
const canvas = within(canvasElement);
|
||||
await userEvent.click(canvas.getByRole("button", { name: /success/i }));
|
||||
await userEvent.click(canvas.getByRole('button', { name: /success/i }));
|
||||
await expect(screen.getByText(/saved successfully/i)).toBeInTheDocument();
|
||||
},
|
||||
};
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/** @type {import('tailwindcss').Config} */
|
||||
export default {
|
||||
content: ["./app/**/*.{ts,tsx}"],
|
||||
content: ['./app/**/*.{ts,tsx}'],
|
||||
theme: {
|
||||
extend: {},
|
||||
},
|
||||
plugins: [require("daisyui")],
|
||||
plugins: [require('daisyui')],
|
||||
};
|
||||
|
||||
@@ -1,49 +1,49 @@
|
||||
import { expect, test } from "@playwright/test";
|
||||
import { expect, test } from '@playwright/test';
|
||||
|
||||
const themes = [
|
||||
"biergarten-lager",
|
||||
"biergarten-stout",
|
||||
"biergarten-cassis",
|
||||
"biergarten-weizen",
|
||||
'biergarten-lager',
|
||||
'biergarten-stout',
|
||||
'biergarten-cassis',
|
||||
'biergarten-weizen',
|
||||
] as const;
|
||||
|
||||
test.describe("storybook component coverage", () => {
|
||||
test.describe('storybook component coverage', () => {
|
||||
for (const theme of themes) {
|
||||
test(`SubmitButton idle renders in ${theme}`, async ({ page }) => {
|
||||
await page.goto(`/iframe.html?id=forms-submitbutton--idle&globals=theme:${theme}`);
|
||||
await expect(page.getByRole("button", { name: /save changes/i })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /save changes/i })).toBeVisible();
|
||||
await expect(page.locator(`[data-theme=\"${theme}\"]`)).toBeVisible();
|
||||
});
|
||||
|
||||
test(`FormField error renders in ${theme}`, async ({ page }) => {
|
||||
await page.goto(`/iframe.html?id=forms-formfield--with-error&globals=theme:${theme}`);
|
||||
await expect(page.getByLabel("Email address")).toBeVisible();
|
||||
await expect(page.getByLabel('Email address')).toBeVisible();
|
||||
await expect(page.getByText(/valid email address/i)).toBeVisible();
|
||||
await expect(page.locator(`[data-theme=\"${theme}\"]`)).toBeVisible();
|
||||
});
|
||||
|
||||
test(`Navbar guest renders in ${theme}`, async ({ page }) => {
|
||||
await page.goto(`/iframe.html?id=navigation-navbar--guest&globals=theme:${theme}`);
|
||||
await expect(page.getByRole("link", { name: /the biergarten app/i })).toBeVisible();
|
||||
await expect(page.getByRole("link", { name: /^login$/i })).toBeVisible();
|
||||
await expect(page.getByRole('link', { name: /the biergarten app/i })).toBeVisible();
|
||||
await expect(page.getByRole('link', { name: /^login$/i })).toBeVisible();
|
||||
await expect(page.locator(`[data-theme=\"${theme}\"]`)).toBeVisible();
|
||||
});
|
||||
}
|
||||
|
||||
test("Navbar authenticated state renders", async ({ page }) => {
|
||||
test('Navbar authenticated state renders', async ({ page }) => {
|
||||
await page.goto(
|
||||
`/iframe.html?id=navigation-navbar--authenticated&globals=theme:biergarten-stout`,
|
||||
);
|
||||
await expect(page.getByRole("button", { name: /hans/i })).toBeVisible();
|
||||
await expect(page.getByRole('button', { name: /hans/i })).toBeVisible();
|
||||
});
|
||||
|
||||
test("Theme gallery shows all themes", async ({ page }) => {
|
||||
test('Theme gallery shows all themes', async ({ page }) => {
|
||||
await page.goto(
|
||||
`/iframe.html?id=themes-biergarten-themes--gallery&globals=theme:biergarten-lager`,
|
||||
);
|
||||
await expect(page.getByRole("heading", { name: "Biergarten Lager" })).toBeVisible();
|
||||
await expect(page.getByRole("heading", { name: "Biergarten Stout" })).toBeVisible();
|
||||
await expect(page.getByRole("heading", { name: "Biergarten Cassis" })).toBeVisible();
|
||||
await expect(page.getByRole("heading", { name: "Biergarten Weizen" })).toBeVisible();
|
||||
await expect(page.getByRole('heading', { name: 'Biergarten Lager' })).toBeVisible();
|
||||
await expect(page.getByRole('heading', { name: 'Biergarten Stout' })).toBeVisible();
|
||||
await expect(page.getByRole('heading', { name: 'Biergarten Cassis' })).toBeVisible();
|
||||
await expect(page.getByRole('heading', { name: 'Biergarten Weizen' })).toBeVisible();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
/// <reference types="vitest/config" />
|
||||
import { reactRouter } from "@react-router/dev/vite";
|
||||
import { storybookTest } from "@storybook/addon-vitest/vitest-plugin";
|
||||
import { playwright } from "@vitest/browser-playwright";
|
||||
import path from "node:path";
|
||||
import { fileURLToPath } from "node:url";
|
||||
import { defineConfig } from "vite";
|
||||
import { reactRouter } from '@react-router/dev/vite';
|
||||
import { storybookTest } from '@storybook/addon-vitest/vitest-plugin';
|
||||
import { playwright } from '@vitest/browser-playwright';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { defineConfig } from 'vite';
|
||||
const dirname =
|
||||
typeof __dirname !== "undefined" ? __dirname : path.dirname(fileURLToPath(import.meta.url));
|
||||
typeof __dirname !== 'undefined' ? __dirname : path.dirname(fileURLToPath(import.meta.url));
|
||||
const isStorybook =
|
||||
process.env.STORYBOOK === "true" || process.argv.some((arg) => arg.includes("storybook"));
|
||||
process.env.STORYBOOK === 'true' || process.argv.some((arg) => arg.includes('storybook'));
|
||||
|
||||
// More info at: https://storybook.js.org/docs/next/writing-tests/integrations/vitest-addon
|
||||
export default defineConfig({
|
||||
plugins: isStorybook ? [] : [reactRouter()],
|
||||
resolve: {
|
||||
dedupe: ["react", "react-dom"],
|
||||
dedupe: ['react', 'react-dom'],
|
||||
},
|
||||
test: {
|
||||
projects: [
|
||||
@@ -24,22 +24,22 @@ export default defineConfig({
|
||||
// The plugin will run tests for the stories defined in your Storybook config
|
||||
// See options at: https://storybook.js.org/docs/next/writing-tests/integrations/vitest-addon#storybooktest
|
||||
storybookTest({
|
||||
configDir: path.join(dirname, ".storybook"),
|
||||
configDir: path.join(dirname, '.storybook'),
|
||||
}),
|
||||
],
|
||||
test: {
|
||||
name: "storybook",
|
||||
name: 'storybook',
|
||||
browser: {
|
||||
enabled: true,
|
||||
headless: true,
|
||||
provider: playwright({}),
|
||||
instances: [
|
||||
{
|
||||
browser: "chromium",
|
||||
browser: 'chromium',
|
||||
},
|
||||
],
|
||||
},
|
||||
setupFiles: [".storybook/vitest.setup.ts"],
|
||||
setupFiles: ['.storybook/vitest.setup.ts'],
|
||||
},
|
||||
},
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user