Compare commits

2 Commits

Author SHA1 Message Date
Aaron Po
30ad304a11 Squash merge main into feature branch 2026-10-11 20:40:20 -04:00
Aaron Po
bce8fb0472 Load the current avatar photo alongside user accounts 2026-10-02 20:30:09 -04:00
81 changed files with 2013 additions and 298 deletions

View File

@@ -565,11 +565,12 @@ are not seeded either.
**Environments**: **Environments**:
| Environment | Compose file | | Environment | Compose file |
| ----------- | -------------------------- | | --------------- | ------------------------------- |
| Development | `docker-compose.dev.yaml` | | Development | `docker-compose.dev.yaml` |
| Testing | `docker-compose.test.yaml` | | Testing | `docker-compose.test.yaml` |
| Production | `docker-compose.prod.yaml` | | Production | `docker-compose.prod.yaml` |
| Production seed | `docker-compose.prod.seed.yaml` |
For details, see [Docker Guide](docker.md). For details, see [Docker Guide](docker.md).

View File

@@ -41,7 +41,7 @@ no data flowing over them.
| ------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | ------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| **Dev network** (`devnet`, bridge) | Internal DNS resolves service names such as `sqlserver` and `api.core`. Volumes: `sqlserverdata-dev`, `nuget-cache-dev`, `seaweedfsdata-dev`. Startup order: SQL Server (health check) → migrations (run-once) → seed (run-once, depends on `seaweedfs`) → API (long-running, depends on seed). | | **Dev network** (`devnet`, bridge) | Internal DNS resolves service names such as `sqlserver` and `api.core`. Volumes: `sqlserverdata-dev`, `nuget-cache-dev`, `seaweedfsdata-dev`. Startup order: SQL Server (health check) → migrations (run-once) → seed (run-once, depends on `seaweedfs`) → API (long-running, depends on seed). |
| **Test network** (`testnet`, bridge) | All test components are isolated; fresh DB instance each run (`CLEAR_DATABASE=true`, ephemeral `sqlserverdata-test` / `seaweedfsdata-test` volumes). `api.specs`, `unit.tests`, and `frontend.tests` all run as separate containers, in parallel once seeding completes; results are aggregated. | | **Test network** (`testnet`, bridge) | All test components are isolated; fresh DB instance each run (`CLEAR_DATABASE=true`, ephemeral `sqlserverdata-test` / `seaweedfsdata-test` volumes). `api.specs`, `unit.tests`, and `frontend.tests` all run as separate containers, in parallel once seeding completes; results are aggregated. |
| **Prod network** (`prodnet`, bridge) | Isolated from dev/test networks. Volumes: `sqlserverdata-prod`, `nuget-cache-prod`. No seed step in production. | | **Prod network** (`prodnet`, bridge, named `biergarten-prodnet`) | Isolated from dev/test networks. Volumes: `biergartendata-prod` and `seaweedfsdata-prod`, both external, so `down -v` keeps them. Startup order: SeaweedFS (health check) → API (health check) → frontend, with `frontend` the only service publishing a host port, bound to `127.0.0.1`. Migrating and seeding run on demand as their own run-once jobs joining `biergarten-prodnet`, so an `up` or a reboot replays neither. |
| **Database-only environment** | Same devnet volumes/images as `docker-compose.dev.yaml`, minus `api.core`, `frontend`, and `mailpit` — for working against the database (and object storage, since `seaweedfs` is still included) without running the API or website. | | **Database-only environment** | Same devnet volumes/images as `docker-compose.dev.yaml`, minus `api.core`, `frontend`, and `mailpit` — for working against the database (and object storage, since `seaweedfs` is still included) without running the API or website. |
| **Minimal environment** | Database + migrations + seed + `seaweedfs` + mailpit, no API or frontend container — for frontend development against an `API.Core` process run outside Docker. | | **Minimal environment** | Database + migrations + seed + `seaweedfs` + mailpit, no API or frontend container — for frontend development against an `API.Core` process run outside Docker. |
| `unit.tests` | Builds `Dockerfile.tests`, which restores/builds against `Biergarten.API.slnx` and then runs `dotnet test` for every `Features/*.Tests` project in turn (`Features.Users.Tests`, `Features.Breweries.Tests`, `Features.Emails.Tests`, `Features.PhotoUpload.Tests`), mocking each handler's repository/service dependencies with Moq — no real database needed. | | `unit.tests` | Builds `Dockerfile.tests`, which restores/builds against `Biergarten.API.slnx` and then runs `dotnet test` for every `Features/*.Tests` project in turn (`Features.Users.Tests`, `Features.Breweries.Tests`, `Features.Emails.Tests`, `Features.PhotoUpload.Tests`), mocking each handler's repository/service dependencies with Moq — no real database needed. |

View File

@@ -1,11 +1,13 @@
sequenceDiagram sequenceDiagram
box Production Environment (docker-compose.prod.yaml) box Production Environment (docker-compose.prod.yaml)
participant ProdDB as SQL Server 2022<br/>Biergarten Database<br/>no host port published participant ProdDB as SQL Server 2022<br/>Biergarten Database<br/>no host port published
participant ProdMig as Migrations (run-once) participant ProdS3 as SeaweedFS<br/>S3 gateway :8333<br/>no host port published
participant ProdAPI as API Container<br/>ASP.NET Core 10<br/>:8080 HTTP / :8081 HTTPS participant ProdAPI as API Container<br/>ASP.NET Core 10<br/>:8080 HTTP / :8081 HTTPS
participant ProdWeb as Frontend Container<br/>Express + React Router<br/>127.0.0.1:5656
end end
ProdMig-->>ProdDB: depends_on ProdAPI-->>ProdS3: depends_on: seaweedfs healthy
ProdMig->>ProdDB: Run migrations ProdWeb-->>ProdAPI: depends_on: api.core healthy
ProdAPI-->>ProdDB: depends_on: sql-server healthy (not migrations/seed)
ProdAPI->>ProdDB: Connect and serve ProdAPI->>ProdDB: Connect and serve
ProdAPI->>ProdS3: Store and read photos
Note over ProdDB: Migrating and seeding are separate run-once jobs,<br/>run at deploy time rather than by the stack

View File

@@ -134,27 +134,136 @@ containers, which would end the run prematurely. See
- Production logging levels - Production logging levels
- No database clearing - No database clearing
- Optimized build configurations - Optimized build configurations
- Health checks enabled - Health checks on every long-running service
- Restart policies (unless-stopped) - Restart policies that survive a reboot (see
[Restart tolerance](#restart-tolerance))
- Security hardening - Security hardening
- Only `frontend` publishes a port to the host; `sqlserver` and `api.core` are - Only `frontend` publishes a port to the host, bound to `127.0.0.1` so a reverse
reachable only from other containers on `prodnet` proxy can sit in front of it; `sqlserver`, `api.core` and `seaweedfs` are
reachable only from other containers on `prodnet` (named `biergarten-prodnet`
so the seed job can join it from its own Compose project)
- Seeding is a separate, explicitly run compose file
(`docker-compose.prod.seed.yaml`), so an `up` or a restart leaves the existing
catalogue as it is. See [Production data](#production-data) below.
**Services**: **Services**:
```yaml ```yaml
sqlserver # Production SQL Server (internal only) sqlserver # Production SQL Server (internal only)
database.migrations # Schema updates only
api.core # Production API (internal only, no published ports) api.core # Production API (internal only, no published ports)
frontend # Production website (port 3000, the only public binding) seaweedfs # S3-compatible object storage (internal only)
frontend # Production website (127.0.0.1:5656, the only host binding)
``` ```
Migrating and seeding are run-once jobs kept outside this file, so an `up` or a
restart touches neither the schema nor the catalogue. Run them explicitly at
deploy time: see [Migrating production](#migrating-production) and
[Seeding production](#seeding-production-docker-composeprodseedyaml).
**Deploy Production**: **Deploy Production**:
```bash ```bash
# One time, before the first `up`: the data volumes are external, so Compose
# expects them to exist already.
docker volume create biergartendata-prod
docker volume create seaweedfsdata-prod
docker compose --env-file web/.env.prod -f web/docker-compose.prod.yaml up -d docker compose --env-file web/.env.prod -f web/docker-compose.prod.yaml up -d
``` ```
Docker seeds each volume with the ownership the image expects and labels it for
SELinux, so the host needs no `chown` and no `:z`/`:Z` mount options on
enforcing distributions such as RHEL, AlmaLinux and Fedora.
#### Migrating production
`database.migrations` is a run-once job rather than a service in the prod stack,
so the schema is migrated when an operator asks for it instead of on every boot.
Build the image and run it against the network the prod stack creates:
```bash
docker build -t database.migrations \
-f web/backend/Database/Database.Migrations/Dockerfile \
--build-arg BUILD_CONFIGURATION=Release --build-arg APP_UID=1000 \
web/backend
docker run --rm --env-file web/.env.prod --network biergarten-prodnet \
-e DOTNET_RUNNING_IN_CONTAINER=true database.migrations
```
DbUp records every script it has applied, so a re-run applies only what is new.
Run this with `sqlserver` already up and healthy, and before the seed job.
#### Restart tolerance
`sqlserver`, `api.core`, `seaweedfs` and `frontend` run under
`restart: unless-stopped`, so the stack returns on its own after a container
crash, a Docker daemon restart or a host reboot, provided Docker itself starts at
boot (`systemctl enable docker`). The migration and seed jobs stay out of the
stack, so a reboot replays neither.
The daemon replays restart policies without replaying the `depends_on` graph, so
after a reboot the containers come back in arbitrary order and each one tolerates
a dependency that arrives late. `api.core` opens its database and S3 connections
per request rather than at startup, and `frontend` answers with its own error
states while `api.core` is still coming up.
Health checks report when the stack has converged:
| Service | Probe |
| --- | --- |
| `sqlserver` | `sqlcmd -Q 'SELECT 1'`, with a 30s start period and 12 retries |
| `api.core` | `GET /health` spoken over bash's `/dev/tcp` — the .NET runtime image carries bash and no HTTP client |
| `seaweedfs` | `curl http://localhost:8333/status`, the S3 gateway, which serves once the master, volume and filer servers are up |
| `frontend` | `wget --spider http://127.0.0.1:5656/healthz`, answered by Express alone and so independent of the API |
`sqlserver` also carries `stop_grace_period: 60s`, giving a checkpoint time to
finish on shutdown instead of being recovered on the next start.
Deploy and wait for the stack to report healthy, or check convergence after a
reboot:
```bash
docker compose --env-file web/.env.prod -f web/docker-compose.prod.yaml up -d --wait
docker compose --env-file web/.env.prod -f web/docker-compose.prod.yaml ps
```
#### Seeding production (`docker-compose.prod.seed.yaml`)
`database.seed` lives in its own compose file, run on demand once the prod stack
is up, `sqlserver` is healthy, and the schema is migrated:
```bash
docker compose --env-file web/.env.prod -f web/docker-compose.prod.seed.yaml \
run --rm --build database.seed
```
The job runs as the `biergarten-prod-seed` Compose project and attaches to the
external `biergarten-prodnet` network, which the main prod stack creates, so it
reaches `sqlserver` and `seaweedfs` under the same hostnames the API uses. It
exits when seeding finishes; `--rm` removes the container. Bring the prod stack
up first, because the seed project has no visibility into the other project's
health checks, so a run started before SQL Server is accepting connections fails.
#### Production data
A production deployment seeded this way serves the AI-generated fixture data
produced by the pipeline. Per
[Pipeline ethics, bias, and known issues](../pipeline/ETHICS-AND-KNOWN-ISSUES.md),
anyone interacting with an application seeded from it has to be told upfront that
the content is AI-generated.
The website meets that obligation with `AiDisclosureDialog`
(`web/frontend/app/features/home/components/AiDisclosureDialog.tsx`), which
the root route renders on every full page load, whichever route the visitor lands
on. It is part of the server-rendered HTML rather than mounted after hydration, so
the disclosure is on screen with the first paint. Acknowledging it hides the
dialog for the remainder of that page load; a new load shows it again.
Keep the seed job and the dialog together: any deployment that runs
`docker-compose.prod.seed.yaml` needs the disclosure in place to satisfy the
ethics documentation.
### 4. Database only (`docker-compose.db.yaml`) ### 4. Database only (`docker-compose.db.yaml`)
**Purpose**: Run just the database for local backend development outside Docker **Purpose**: Run just the database for local backend development outside Docker
@@ -215,6 +324,12 @@ graph TD
In development, `api.core` also depends on `seaweedfs` In development, `api.core` also depends on `seaweedfs`
(`condition: service_started`, not a health check) alongside `database.seed`. (`condition: service_started`, not a health check) alongside `database.seed`.
Production has a shorter chain, because the migration and seed jobs run outside
the stack: `api.core` waits for `seaweedfs` to pass its health check, and
`frontend` waits for `api.core` to report healthy. This ordering applies to
`docker compose up`; see [Restart tolerance](#restart-tolerance) for what happens
on a host reboot.
**Health Check Example** (SQL Server): **Health Check Example** (SQL Server):
```yaml ```yaml
@@ -255,8 +370,10 @@ api.core:
**Production**: **Production**:
- `sqlserverdata-prod` - Production database files - `biergartendata-prod` - Database files, external; survives `down -v`
- `nuget-cache-prod` - Production NuGet cache - `seaweedfsdata-prod` - SeaweedFS object storage, external; survives `down -v`
See [Production data volumes](#production-data-volumes).
### Mounted volumes ### Mounted volumes
@@ -269,6 +386,41 @@ volumes:
Test results are written to host filesystem for CI/CD integration. Test results are written to host filesystem for CI/CD integration.
### Production data volumes
`biergartendata-prod` and `seaweedfsdata-prod` are declared `external: true`.
Compose removes only the volumes it owns, so `docker compose down -v` tears the
stack down and leaves the database and the uploaded photos in place. Deleting
them takes an explicit `docker volume rm`.
The trade-off is that Compose creates neither one, and `up` fails with a clear
error until both exist, hence the `docker volume create` step in
[Deploy Production](#3-production-docker-composeprodyaml). External volumes also
carry their literal name rather than a `<project>_` prefix, so `docker volume ls`
shows `biergartendata-prod` and `seaweedfsdata-prod` unprefixed, unlike the
`web_`-prefixed volumes of the dev and test stacks.
Both live under `/var/lib/docker/volumes`. To put them on a specific disk, point
the daemon's `data-root` at it in `/etc/docker/daemon.json`, or mount the disk at
`/var/lib/docker`.
Back up the database through SQL Server rather than by copying its files, since a
file copy taken while the engine is running can be torn:
```bash
docker exec prod-env-sqlserver /opt/mssql-tools18/bin/sqlcmd \
-S localhost -U sa -P '<db-password>' -C \
-Q "BACKUP DATABASE [<db-name>] TO DISK = '/var/opt/mssql/data/backup.bak'"
docker cp prod-env-sqlserver:/var/opt/mssql/data/backup.bak .
```
Object storage can be archived directly, with the stack stopped:
```bash
docker run --rm -v seaweedfsdata-prod:/data -v "$PWD:/backup" \
alpine tar czf /backup/seaweedfs.tar.gz -C /data .
```
## Networks ## Networks
Each environment uses isolated bridge networks: Each environment uses isolated bridge networks:

View File

@@ -317,6 +317,7 @@ from the template in place; edit them manually if you go that route.
- `web/docker-compose.dev.yaml` → `web/.env.dev` - `web/docker-compose.dev.yaml` → `web/.env.dev`
- `web/docker-compose.test.yaml` → `web/.env.test` - `web/docker-compose.test.yaml` → `web/.env.test`
- `web/docker-compose.prod.yaml` → `web/.env.prod` - `web/docker-compose.prod.yaml` → `web/.env.prod`
- `web/docker-compose.prod.seed.yaml` → `web/.env.prod`
## Variable reference table ## Variable reference table

View File

@@ -13,9 +13,53 @@ Scenario: Public profile exposes only allowlisted fields
Then the response has HTTP status 200 Then the response has HTTP status 200
And the public profile response should match the registered account And the public profile response should match the registered account
And the response JSON should have "biography" equal "" And the response JSON should have "biography" equal ""
And the response JSON should have "avatarUrl" equal ""
And the response JSON should not contain "email" And the response JSON should not contain "email"
And the response JSON should not contain "dateOfBirth" And the response JSON should not contain "dateOfBirth"
Scenario: Public profile exposes the uploaded avatar
Given I have registered a new account
And I have a valid access token for my account
And I have uploaded an avatar
When I retrieve the public profile by ID
Then the response has HTTP status 200
And the public profile response should carry my current avatar
Scenario: Public profile exposes the current avatar after it is replaced
Given I have registered a new account
And I have a valid access token for my account
And I have uploaded an avatar
And I have uploaded a new avatar, replacing the previous one
When I retrieve the public profile by ID
Then the response has HTTP status 200
And the public profile response should carry my current avatar
And the public profile response should not carry my previous avatar
Scenario: Fetching the avatar without authentication succeeds
Given I have registered a new account
And I have a valid access token for my account
And I have uploaded an avatar
When I retrieve the public profile by ID without authentication
Then the response has HTTP status 200
And the public profile response should carry my current avatar
Scenario: A different user can read someone else's avatar
Given I have registered a new account
And I have a valid access token for my account
And I have uploaded an avatar
And I am logged in as a different user
When I retrieve the public profile by ID
Then the response has HTTP status 200
And the public profile response should carry my current avatar
Scenario: Listing user accounts exposes each account's avatar
Given I have registered a new account
And I have a valid access token for my account
And I have uploaded an avatar
When I list user accounts
Then the response has HTTP status 200
And my listed account should carry my current avatar
Scenario: Public profile for a non-existent account returns not found Scenario: Public profile for a non-existent account returns not found
Given I have registered a new account Given I have registered a new account
And I have a valid access token for my account And I have a valid access token for my account
@@ -26,6 +70,7 @@ Scenario: Fetching the public profile without authentication succeeds
Given I have registered a new account Given I have registered a new account
When I retrieve the public profile by ID without authentication When I retrieve the public profile by ID without authentication
Then the response has HTTP status 200 Then the response has HTTP status 200
And the response JSON should have "avatarUrl" equal ""
And the response JSON should not contain "email" And the response JSON should not contain "email"
And the response JSON should not contain "dateOfBirth" And the response JSON should not contain "dateOfBirth"
@@ -50,6 +95,7 @@ Scenario: Listing user accounts as an authenticated user excludes private fields
And I have a valid access token for my account And I have a valid access token for my account
When I list user accounts When I list user accounts
Then the response has HTTP status 200 Then the response has HTTP status 200
And the response JSON should contain "avatarUrl"
And the response JSON should not contain "email" And the response JSON should not contain "email"
And the response JSON should not contain "dateOfBirth" And the response JSON should not contain "dateOfBirth"

View File

@@ -0,0 +1,38 @@
using Features.ImageUploads.Services;
namespace API.Specs.Mocks;
/// <summary>
/// Test double for <see cref="IFileStorageProvider" /> that records uploads in memory, so specs can
/// exercise photo-backed features without object storage.
/// </summary>
public class MockFileStorageProvider : IFileStorageProvider
{
private readonly Dictionary<string, byte[]> _objects = new();
public IReadOnlyCollection<string> UploadedKeys => _objects.Keys.ToList();
public Task UploadAsync(
string key,
Stream content,
string contentType,
CancellationToken cancellationToken = default
)
{
using MemoryStream buffer = new();
content.CopyTo(buffer);
_objects[key] = buffer.ToArray();
return Task.CompletedTask;
}
public Task DeleteAsync(string key, CancellationToken cancellationToken = default)
{
_objects.Remove(key);
return Task.CompletedTask;
}
public string GetPresignedUrl(string key, TimeSpan expiresIn)
{
return $"https://storage.test/{key}";
}
}

View File

@@ -183,6 +183,25 @@ public class ApiGeneralSteps(ScenarioContext scenario)
AssertFieldAbsent(payloadElem, field); AssertFieldAbsent(payloadElem, field);
} }
[Then("the response JSON should contain {string}")]
public void ThenTheResponseJsonShouldContainString(string field)
{
scenario.TryGetValue<string>(ResponseBodyKey, out string? responseBody).Should().BeTrue();
using JsonDocument doc = JsonDocument.Parse(responseBody!);
JsonElement root = doc.RootElement;
if (root.ValueKind == JsonValueKind.Object &&
!root.TryGetProperty(field, out _) &&
root.TryGetProperty("payload", out JsonElement payloadElem))
{
AssertFieldPresent(payloadElem, field);
return;
}
AssertFieldPresent(root, field);
}
/// <summary> /// <summary>
/// Recurses into arrays so a listing endpoint's response can be asserted the same way as a /// Recurses into arrays so a listing endpoint's response can be asserted the same way as a
/// single-resource response. /// single-resource response.
@@ -203,4 +222,31 @@ public class ApiGeneralSteps(ScenarioContext scenario)
break; break;
} }
} }
/// <summary>
/// Recurses into arrays so every item of a listing endpoint's response must carry the field.
/// </summary>
private static void AssertFieldPresent(JsonElement element, string field)
{
switch (element.ValueKind)
{
case JsonValueKind.Object:
element
.TryGetProperty(field, out _)
.Should()
.BeTrue("Expected field '{0}' to be present in the response", field);
break;
case JsonValueKind.Array:
element
.EnumerateArray()
.Should()
.NotBeEmpty(
"Expected at least one item to assert field '{0}' against",
field
);
foreach (JsonElement item in element.EnumerateArray())
AssertFieldPresent(item, field);
break;
}
}
} }

View File

@@ -1,5 +1,9 @@
using System.Text.Json; using System.Text.Json;
using Features.Users.Commands.Profile.UploadAvatar;
using FluentAssertions; using FluentAssertions;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
using Reqnroll; using Reqnroll;
namespace API.Specs.Steps; namespace API.Specs.Steps;
@@ -10,6 +14,10 @@ public class UserSteps(ScenarioContext scenario) : ApiStepsBase(scenario)
private const string AccessTokenKey = "accessToken"; private const string AccessTokenKey = "accessToken";
private const string RegisteredUserIdKey = "registeredUserId"; private const string RegisteredUserIdKey = "registeredUserId";
private const string RegisteredUsernameKey = "registeredUsername"; private const string RegisteredUsernameKey = "registeredUsername";
private const string CurrentAvatarUrlKey = "currentAvatarUrl";
private const string PreviousAvatarUrlKey = "previousAvatarUrl";
private static readonly byte[] PngSignature = [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A];
private async Task SendAsync(HttpRequestMessage requestMessage) private async Task SendAsync(HttpRequestMessage requestMessage)
{ {
@@ -36,6 +44,99 @@ public class UserSteps(ScenarioContext scenario) : ApiStepsBase(scenario)
: throw new InvalidOperationException("registered user ID not found in scenario"); : throw new InvalidOperationException("registered user ID not found in scenario");
} }
/// <summary>
/// Builds the smallest upload the photo validator accepts: a PNG signature padded out to the
/// 1 KiB minimum.
/// </summary>
private static IFormFile CreateAvatarFile()
{
byte[] content = new byte[2048];
PngSignature.CopyTo(content, 0);
MemoryStream stream = new(content);
return new FormFile(stream, 0, content.Length, "file", "avatar.png")
{
Headers = new HeaderDictionary { ["Content-Type"] = "image/png" },
};
}
private async Task UploadAvatarAsync()
{
Guid userId = GetRegisteredUserId();
using IServiceScope scope = GetFactory().Services.CreateScope();
IMediator mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
Guid photoId = await mediator.Send(new UploadAvatarCommand(userId, CreateAvatarFile()));
if (Scenario.TryGetValue<string>(CurrentAvatarUrlKey, out string? existing))
Scenario[PreviousAvatarUrlKey] = existing;
Scenario[CurrentAvatarUrlKey] = $"avatars/{userId}/{photoId}";
}
private string GetCurrentAvatarUrl()
{
return Scenario.TryGetValue(CurrentAvatarUrlKey, out string? url) && url is not null
? url
: throw new InvalidOperationException("no avatar has been uploaded in this scenario");
}
private string GetPreviousAvatarUrl()
{
return Scenario.TryGetValue(PreviousAvatarUrlKey, out string? url) && url is not null
? url
: throw new InvalidOperationException("only one avatar has been uploaded in this scenario");
}
[Given("I have uploaded an avatar")]
public async Task GivenIHaveUploadedAnAvatar()
{
await UploadAvatarAsync();
}
[Given("I have uploaded a new avatar, replacing the previous one")]
public async Task GivenIHaveUploadedANewAvatarReplacingThePreviousOne()
{
await UploadAvatarAsync();
}
[Then("the public profile response should carry my current avatar")]
public void ThenThePublicProfileResponseShouldCarryMyCurrentAvatar()
{
Scenario.TryGetValue<string>(ResponseBodyKey, out string? responseBody).Should().BeTrue();
using JsonDocument doc = JsonDocument.Parse(responseBody!);
doc.RootElement.GetProperty("avatarUrl").GetString().Should().Be(GetCurrentAvatarUrl());
}
[Then("the public profile response should not carry my previous avatar")]
public void ThenThePublicProfileResponseShouldNotCarryMyPreviousAvatar()
{
Scenario.TryGetValue<string>(ResponseBodyKey, out string? responseBody).Should().BeTrue();
using JsonDocument doc = JsonDocument.Parse(responseBody!);
doc.RootElement.GetProperty("avatarUrl").GetString().Should().NotBe(GetPreviousAvatarUrl());
}
[Then("my listed account should carry my current avatar")]
public void ThenMyListedAccountShouldCarryMyCurrentAvatar()
{
Scenario.TryGetValue<string>(ResponseBodyKey, out string? responseBody).Should().BeTrue();
using JsonDocument doc = JsonDocument.Parse(responseBody!);
doc.RootElement.ValueKind.Should().Be(JsonValueKind.Array);
JsonElement listed = doc
.RootElement.EnumerateArray()
.Should()
.ContainSingle(item =>
item.GetProperty("userAccountId").GetGuid() == GetRegisteredUserId()
)
.Subject;
listed.GetProperty("avatarUrl").GetString().Should().Be(GetCurrentAvatarUrl());
}
[When("I retrieve the public profile by ID")] [When("I retrieve the public profile by ID")]
public async Task WhenIRetrieveThePublicProfileById() public async Task WhenIRetrieveThePublicProfileById()
{ {

View File

@@ -1,6 +1,7 @@
using API.Core; using API.Core;
using API.Specs.Mocks; using API.Specs.Mocks;
using Features.Emails.Services; using Features.Emails.Services;
using Features.ImageUploads.Services;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Testing; using Microsoft.AspNetCore.Mvc.Testing;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@@ -32,6 +33,15 @@ internal class TestApiFactory : WebApplicationFactory<Program>
services.Remove(emailDispatcherDescriptor); services.Remove(emailDispatcherDescriptor);
services.AddScoped<IEmailDispatcher, MockEmailDispatcher>(); services.AddScoped<IEmailDispatcher, MockEmailDispatcher>();
ServiceDescriptor? fileStorageDescriptor = services.SingleOrDefault(d =>
d.ServiceType == typeof(IFileStorageProvider)
);
if (fileStorageDescriptor != null)
services.Remove(fileStorageDescriptor);
services.AddSingleton<IFileStorageProvider, MockFileStorageProvider>();
}); });
} }
} }

View File

@@ -20,4 +20,5 @@ public sealed class UserAccount
// Navigation properties // Navigation properties
public UserCredential? UserCredential { get; set; } public UserCredential? UserCredential { get; set; }
public UserProfile? UserProfile { get; set; } public UserProfile? UserProfile { get; set; }
public UserAvatar? UserAvatar { get; set; }
} }

View File

@@ -47,4 +47,43 @@ public class GetAllUsersHandlerTests
result.Should().ContainSingle().Which.Should().BeEquivalentTo(user.ToPublicProfileDto()); result.Should().ContainSingle().Which.Should().BeEquivalentTo(user.ToPublicProfileDto());
} }
[Fact]
public async Task Handle_MapsEachUsersOwnAvatarUrl()
{
Mock<IUserListRepository> repoMock = new();
GetAllUsersHandler handler = new(repoMock.Object);
UserAccount withAvatar = new()
{
UserAccountId = Guid.NewGuid(),
Username = "has-avatar",
FirstName = "Has",
LastName = "Avatar",
CreatedAt = DateTime.UtcNow,
UserProfile = new UserProfile { Biography = "Drinks lagers." },
UserAvatar = new UserAvatar
{
Photo = new Photo { Hyperlink = "https://cdn.example.com/avatar.jpg" },
},
};
UserAccount withoutAvatar = new()
{
UserAccountId = Guid.NewGuid(),
Username = "no-avatar",
FirstName = "No",
LastName = "Avatar",
CreatedAt = DateTime.UtcNow,
};
repoMock.Setup(r => r.GetAllAsync(null, null)).ReturnsAsync([withAvatar, withoutAvatar]);
IEnumerable<PublicUserProfileDto> result = await handler.Handle(
new GetAllUsersQuery(null, null),
CancellationToken.None
);
result
.Select(dto => dto.AvatarUrl)
.Should()
.Equal("https://cdn.example.com/avatar.jpg", string.Empty);
}
} }

View File

@@ -31,6 +31,10 @@ public class GetPublicUserProfileByIdHandlerTests
DateOfBirth = new DateTime(1990, 1, 1), DateOfBirth = new DateTime(1990, 1, 1),
CreatedAt = new DateTime(2024, 1, 1), CreatedAt = new DateTime(2024, 1, 1),
UserProfile = new UserProfile { Biography = "Drinks lagers." }, UserProfile = new UserProfile { Biography = "Drinks lagers." },
UserAvatar = new UserAvatar
{
Photo = new Photo { Hyperlink = "https://cdn.example.com/avatar.jpg" },
},
}; };
_repoMock.Setup(r => r.GetByIdAsync(user.UserAccountId)).ReturnsAsync(user); _repoMock.Setup(r => r.GetByIdAsync(user.UserAccountId)).ReturnsAsync(user);
@@ -48,13 +52,14 @@ public class GetPublicUserProfileByIdHandlerTests
user.FirstName, user.FirstName,
user.LastName, user.LastName,
"Drinks lagers.", "Drinks lagers.",
"https://cdn.example.com/avatar.jpg",
user.CreatedAt user.CreatedAt
) )
); );
} }
[Fact] [Fact]
public async Task Handle_ReturnsEmptyBiography_WhenProfileMissing() public async Task Handle_ReturnsEmptyBiographyAndAvatarUrl_WhenProfileMissing()
{ {
UserAccount user = new() UserAccount user = new()
{ {
@@ -72,6 +77,53 @@ public class GetPublicUserProfileByIdHandlerTests
); );
result.Biography.Should().BeEmpty(); result.Biography.Should().BeEmpty();
result.AvatarUrl.Should().BeEmpty();
}
[Fact]
public async Task Handle_ReturnsEmptyAvatarUrl_WhenProfileHasNoAvatar()
{
UserAccount user = new()
{
UserAccountId = Guid.NewGuid(),
Username = "test",
FirstName = "Jane",
LastName = "Doe",
CreatedAt = new DateTime(2024, 1, 1),
UserProfile = new UserProfile { Biography = "Drinks lagers." },
};
_repoMock.Setup(r => r.GetByIdAsync(user.UserAccountId)).ReturnsAsync(user);
PublicUserProfileDto result = await _handler.Handle(
new GetPublicUserProfileByIdQuery(user.UserAccountId),
CancellationToken.None
);
result.Biography.Should().Be("Drinks lagers.");
result.AvatarUrl.Should().BeEmpty();
}
[Fact]
public async Task Handle_ReturnsEmptyAvatarUrl_WhenAvatarHasNoPhoto()
{
UserAccount user = new()
{
UserAccountId = Guid.NewGuid(),
Username = "test",
FirstName = "Jane",
LastName = "Doe",
CreatedAt = new DateTime(2024, 1, 1),
UserProfile = new UserProfile { Biography = "Drinks lagers." },
UserAvatar = new UserAvatar(),
};
_repoMock.Setup(r => r.GetByIdAsync(user.UserAccountId)).ReturnsAsync(user);
PublicUserProfileDto result = await _handler.Handle(
new GetPublicUserProfileByIdQuery(user.UserAccountId),
CancellationToken.None
);
result.AvatarUrl.Should().BeEmpty();
} }
[Fact] [Fact]

View File

@@ -14,6 +14,7 @@ public static class UserDtoMapper
FirstName : user.FirstName, FirstName : user.FirstName,
LastName : user.LastName, LastName : user.LastName,
Biography : user.UserProfile?.Biography ?? string.Empty, Biography : user.UserProfile?.Biography ?? string.Empty,
AvatarUrl : user.UserAvatar?.Photo?.Hyperlink ?? string.Empty,
CreatedAt : user.CreatedAt CreatedAt : user.CreatedAt
); );
} }

View File

@@ -7,5 +7,6 @@ public record PublicUserProfileDto(
string FirstName, string FirstName,
string LastName, string LastName,
string Biography, string Biography,
string AvatarUrl,
DateTime CreatedAt DateTime CreatedAt
); );

View File

@@ -13,61 +13,87 @@ public class UserListRepository(ISqlConnectionFactory connectionFactory)
IUserListRepository IUserListRepository
{ {
/// <inheritdoc /> /// <inheritdoc />
/// <remarks>
/// Left-joins <c>Social.UserProfile</c>, so <see cref="UserAccount.UserProfile" /> is
/// <c>null</c> for an account whose profile has yet to be created.
/// </remarks>
public async Task<UserAccount?> GetByIdAsync(Guid id) public async Task<UserAccount?> GetByIdAsync(Guid id)
{ {
await using DbConnection connection = await CreateConnection(); await using DbConnection connection = await CreateConnection();
IEnumerable<UserAccount> results = await connection.QueryAsync< IEnumerable<UserAccount> results = await connection.QueryAsync<
UserAccount, UserAccount,
UserProfile, UserProfile,
Photo,
UserAvatar,
UserAccount UserAccount
>( >(
""" """
SELECT SELECT
ua.UserAccountID, ua.UserAccountID, ua.Username, ua.FirstName, ua.LastName,
ua.Username, ua.Email, ua.CreatedAt, ua.UpdatedAt, ua.DateOfBirth,
ua.FirstName, ua.LastName, ua.Email, ua.CreatedAt, ua.UpdatedAt, ua.RowVersion, up.UserProfileID, up.UserAccountID,
ua.DateOfBirth, ua.RowVersion, up.Biography, up.RowVersion, p.PhotoID, p.UploadedByID,
up.UserProfileID, up.UserAccountID, up.Biography, up.RowVersion p.Hyperlink, p.UploadedAt, p.RowVersion, av.UserAvatarID,
av.UserProfileID, av.PhotoID, av.ValidFrom, av.ValidTo,
av.RowVersion
FROM Auth.UserAccount ua FROM Auth.UserAccount ua
LEFT JOIN Social.UserProfile up ON ua.UserAccountID = up.UserAccountID LEFT JOIN Social.UserProfile up
ON ua.UserAccountID = up.UserAccountID
LEFT JOIN Social.UserAvatar av
ON up.UserProfileID = av.UserProfileID
AND av.ValidTo IS NULL
LEFT JOIN Media.Photo p ON av.PhotoID = p.PhotoID
WHERE ua.UserAccountID = @UserAccountId WHERE ua.UserAccountID = @UserAccountId
""", """,
MapUserRow, MapUserRow,
new { UserAccountId = id }, new { UserAccountId = id },
splitOn: "UserProfileID" splitOn: AvatarSplitOn
); );
return results.SingleOrDefault(); return results.SingleOrDefault();
} }
private static UserAccount MapUserRow(UserAccount user, UserProfile? profile)
{
user.UserProfile = profile;
return user;
}
/// <inheritdoc /> /// <inheritdoc />
/// <remarks>
/// Always applies pagination via <c>OFFSET</c>/<c>FETCH</c>, ordered by creation date descending.
/// A <c>null</c> <paramref name="limit" />/<paramref name="offset" /> is treated as "no limit"/"no offset".
/// Does not select <c>Email</c> or <c>DateOfBirth</c>: this listing is consumed only as public
/// profiles, so those fields are left at their default rather than read from the database.
/// </remarks>
public async Task<IEnumerable<UserAccount>> GetAllAsync(int? limit, int? offset) public async Task<IEnumerable<UserAccount>> GetAllAsync(int? limit, int? offset)
{ {
await using DbConnection connection = await CreateConnection(); await using DbConnection connection = await CreateConnection();
return await connection.QueryAsync<UserAccount>( return await connection.QueryAsync<
UserAccount,
UserProfile,
Photo,
UserAvatar,
UserAccount
>(
""" """
SELECT UserAccountID, Username, FirstName, LastName, CreatedAt, UpdatedAt, RowVersion SELECT
FROM Auth.UserAccount ua.UserAccountID, ua.Username, ua.FirstName, ua.LastName,
ORDER BY CreatedAt DESC ua.CreatedAt, ua.UpdatedAt, ua.RowVersion,
up.UserProfileID, up.UserAccountID, up.Biography, up.RowVersion,
p.PhotoID, p.UploadedByID, p.Hyperlink, p.UploadedAt, p.RowVersion,
av.UserAvatarID, av.UserProfileID, av.PhotoID, av.ValidFrom, av.ValidTo,
av.RowVersion
FROM Auth.UserAccount ua
LEFT JOIN Social.UserProfile up ON ua.UserAccountID = up.UserAccountID
LEFT JOIN Social.UserAvatar av
ON up.UserProfileID = av.UserProfileID AND av.ValidTo IS NULL
LEFT JOIN Media.Photo p ON av.PhotoID = p.PhotoID
ORDER BY ua.CreatedAt DESC
OFFSET @Offset ROWS FETCH NEXT @Limit ROWS ONLY OFFSET @Offset ROWS FETCH NEXT @Limit ROWS ONLY
""", """,
new { Offset = offset ?? 0, Limit = limit ?? int.MaxValue } MapUserRow,
new { Offset = offset ?? 0, Limit = limit ?? int.MaxValue },
splitOn: AvatarSplitOn
); );
} }
private const string AvatarSplitOn = "UserProfileID,PhotoID,UserAvatarID";
private static UserAccount MapUserRow(
UserAccount user,
UserProfile? profile,
Photo? photo,
UserAvatar? avatar
)
{
user.UserProfile = profile;
avatar?.Photo = photo;
user.UserAvatar = avatar;
return user;
}
} }

View File

@@ -0,0 +1,32 @@
# docker compose --env-file web/.env.prod -f web/docker-compose.prod.seed.yaml run --rm --build database.seed
name: biergarten-prod-seed
services:
database.seed:
env_file: ".env.prod"
image: database.seed
container_name: prod-env-database-seed
build:
context: ./backend
dockerfile: Database/Database.Seed/Dockerfile
args:
BUILD_CONFIGURATION: Release
APP_UID: 1000
environment:
DOTNET_RUNNING_IN_CONTAINER: "true"
DB_SERVER: "${DB_SERVER}"
DB_NAME: "${DB_NAME}"
DB_USER: "${DB_USER}"
DB_PASSWORD: "${DB_PASSWORD}"
SEAWEEDFS_SERVICE_URL: "${SEAWEEDFS_SERVICE_URL}"
SEAWEEDFS_ACCESS_KEY_ID: "${SEAWEEDFS_ACCESS_KEY_ID}"
SEAWEEDFS_SECRET_ACCESS_KEY: "${SEAWEEDFS_SECRET_ACCESS_KEY}"
SEAWEEDFS_BUCKET: "${SEAWEEDFS_BUCKET}"
restart: "no"
networks:
- prodnet
networks:
prodnet:
name: biergarten-prodnet
external: true

View File

@@ -6,10 +6,10 @@ services:
container_name: prod-env-sqlserver container_name: prod-env-sqlserver
environment: environment:
ACCEPT_EULA: "Y" ACCEPT_EULA: "Y"
SA_PASSWORD: "${DB_PASSWORD}" MSSQL_SA_PASSWORD: "${DB_PASSWORD}"
MSSQL_PID: "Express" MSSQL_PID: "Express"
volumes: volumes:
- sqlserverdata-prod:/var/opt/mssql - biergartendata-prod:/var/opt/mssql
healthcheck: healthcheck:
test: test:
[ [
@@ -20,29 +20,8 @@ services:
timeout: 5s timeout: 5s
retries: 12 retries: 12
start_period: 30s start_period: 30s
networks: restart: unless-stopped
- prodnet stop_grace_period: 60s
database.migrations:
env_file: ".env.prod"
image: database.migrations
container_name: prod-env-database-migrations
depends_on:
sqlserver:
condition: service_healthy
build:
context: ./backend
dockerfile: Database/Database.Migrations/Dockerfile
args:
BUILD_CONFIGURATION: Release
APP_UID: 1000
environment:
DOTNET_RUNNING_IN_CONTAINER: "true"
DB_SERVER: "${DB_SERVER}"
DB_NAME: "${DB_NAME}"
DB_USER: "${DB_USER}"
DB_PASSWORD: "${DB_PASSWORD}"
restart: "no"
networks: networks:
- prodnet - prodnet
@@ -51,7 +30,7 @@ services:
image: api.core image: api.core
container_name: prod-env-api-core container_name: prod-env-api-core
depends_on: depends_on:
sqlserver: seaweedfs:
condition: service_healthy condition: service_healthy
build: build:
context: ./backend context: ./backend
@@ -59,8 +38,6 @@ services:
args: args:
BUILD_CONFIGURATION: Release BUILD_CONFIGURATION: Release
APP_UID: 1000 APP_UID: 1000
# No published ports: only the frontend service is reachable from outside
# the Docker network in production. api.core stays internal to prodnet.
environment: environment:
ASPNETCORE_ENVIRONMENT: "Production" ASPNETCORE_ENVIRONMENT: "Production"
ASPNETCORE_URLS: "http://0.0.0.0:8080" ASPNETCORE_URLS: "http://0.0.0.0:8080"
@@ -73,11 +50,45 @@ services:
REFRESH_TOKEN_SECRET: "${REFRESH_TOKEN_SECRET}" REFRESH_TOKEN_SECRET: "${REFRESH_TOKEN_SECRET}"
CONFIRMATION_TOKEN_SECRET: "${CONFIRMATION_TOKEN_SECRET}" CONFIRMATION_TOKEN_SECRET: "${CONFIRMATION_TOKEN_SECRET}"
WEBSITE_BASE_URL: "${WEBSITE_BASE_URL}" WEBSITE_BASE_URL: "${WEBSITE_BASE_URL}"
SEAWEEDFS_SERVICE_URL: "${SEAWEEDFS_SERVICE_URL}"
SEAWEEDFS_ACCESS_KEY_ID: "${SEAWEEDFS_ACCESS_KEY_ID}"
SEAWEEDFS_SECRET_ACCESS_KEY: "${SEAWEEDFS_SECRET_ACCESS_KEY}"
SEAWEEDFS_BUCKET: "${SEAWEEDFS_BUCKET}"
healthcheck:
test:
[
"CMD",
"bash",
"-c",
'exec 3<>/dev/tcp/127.0.0.1/8080; printf "GET /health HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n" >&3; head -1 <&3 | grep -q " 200 "',
]
interval: 15s
timeout: 5s
retries: 5
start_period: 30s
restart: unless-stopped restart: unless-stopped
networks: networks:
- prodnet - prodnet
seaweedfs:
env_file: ".env.prod"
image: chrislusf/seaweedfs
container_name: prod-env-seaweedfs
environment:
AWS_ACCESS_KEY_ID: "${SEAWEEDFS_ACCESS_KEY_ID}"
AWS_SECRET_ACCESS_KEY: "${SEAWEEDFS_SECRET_ACCESS_KEY}"
S3_BUCKET: "${SEAWEEDFS_BUCKET}"
volumes: volumes:
- nuget-cache-prod:/root/.nuget/packages - seaweedfsdata-prod:/data
healthcheck:
test: ["CMD", "curl", "-fsS", "-o", "/dev/null", "http://localhost:8333/status"]
interval: 15s
timeout: 5s
retries: 5
start_period: 20s
restart: unless-stopped
networks:
- prodnet
frontend: frontend:
env_file: ".env.prod" env_file: ".env.prod"
@@ -85,27 +96,34 @@ services:
container_name: prod-env-frontend container_name: prod-env-frontend
depends_on: depends_on:
api.core: api.core:
condition: service_started condition: service_healthy
build: build:
context: ./frontend context: ./frontend
dockerfile: Dockerfile dockerfile: Dockerfile
ports: ports:
- "3000:3000" - "127.0.0.1:5656:5656"
environment: environment:
NODE_ENV: "production" NODE_ENV: "production"
PORT: "3000" PORT: "5656"
API_BASE_URL: "http://api.core:8080" API_BASE_URL: "http://api.core:8080"
SESSION_SECRET: "${SESSION_SECRET}" SESSION_SECRET: "${SESSION_SECRET}"
healthcheck:
test: ["CMD", "wget", "--quiet", "--spider", "--tries=1", "http://127.0.0.1:5656/healthz"]
interval: 15s
timeout: 5s
retries: 5
start_period: 15s
restart: unless-stopped restart: unless-stopped
networks: networks:
- prodnet - prodnet
volumes: volumes:
sqlserverdata-prod: biergartendata-prod:
driver: local external: true
nuget-cache-prod: seaweedfsdata-prod:
driver: local external: true
networks: networks:
prodnet: prodnet:
name: biergarten-prodnet
driver: bridge driver: bridge

View File

@@ -34,38 +34,38 @@ h6,
--color-base-100: oklch(96% 0.012 82); /* warm parchment */ --color-base-100: oklch(96% 0.012 82); /* warm parchment */
--color-base-200: oklch(92% 0.018 80); /* brushed paper */ --color-base-200: oklch(92% 0.018 80); /* brushed paper */
--color-base-300: oklch(87% 0.025 78); /* tinted linen */ --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-base-content: oklch(28% 0.025 58); /* dark brown ink */
--color-primary: oklch(65% 0.085 62); /* mellow amber */ --color-primary: oklch(47.5% 0.085 62); /* mellow amber */
--color-primary-content: oklch(97% 0.02 62); /* warm near-white — 7.2:1 on primary */ --color-primary-content: oklch(97% 0.02 62); /* warm near-white */
--color-secondary: oklch(42% 0.05 42); /* softened mahogany */ --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-secondary-content: oklch(96% 0.01 76); /* off-white */
--color-accent: oklch(93% 0.015 90); /* frothy cream */ --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-accent-content: oklch(28% 0.025 58); /* dark brown */
--color-neutral: oklch(28% 0.02 46); /* warm roast dark */ --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-neutral-content: oklch(92% 0.012 80); /* pale parchment */
--color-info: oklch(46% 0.065 145); /* muted hop green */ --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-info-content: oklch(97% 0.008 145); /* near-white */
--color-success: oklch(70% 0.06 122); /* soft barley gold */ --color-success: oklch(46.5% 0.06 122); /* soft barley gold */
--color-success-content: oklch(97% 0.02 122); /* warm near-white — 5.7:1 on success */ --color-success-content: oklch(97% 0.02 122); /* warm near-white */
--color-warning: oklch(72% 0.09 56); /* toned amber */ --color-warning: oklch(47.5% 0.09 56); /* toned amber */
--color-warning-content: oklch(97% 0.02 56); /* warm near-white — 4.7:1 on warning */ --color-warning-content: oklch(97% 0.02 56); /* warm near-white */
--color-error: oklch(54% 0.09 22); /* restrained cherry */ --color-error: oklch(48% 0.09 22); /* restrained cherry */
--color-error-content: oklch(97% 0.006 15); /* near-white — 11.1:1 on error */ --color-error-content: oklch(97% 0.006 15); /* near-white */
--color-surface: oklch(88% 0.02 82); /* mid parchment, elevated cards */ --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-surface-content: oklch(28% 0.025 58); /* dark brown */
--color-muted: oklch(42% 0.055 62); /* amber-brown — 14.2:1 on base-100, 8.3:1 on surface */ --color-muted: oklch(42% 0.055 62); /* amber-brown */
--color-highlight: oklch(78% 0.055 65); /* warm amber, hover and active states */ --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 */ --color-highlight-content: oklch(22% 0.025 55); /* dark brown */
--radius-selector: 0.375rem; --radius-selector: 0.375rem;
--radius-field: 0.5rem; --radius-field: 0.5rem;
@@ -91,38 +91,38 @@ h6,
--color-base-100: oklch(14% 0.006 45); /* charred barrel black */ --color-base-100: oklch(14% 0.006 45); /* charred barrel black */
--color-base-200: oklch(18% 0.008 43); /* roasted malt dark */ --color-base-200: oklch(18% 0.008 43); /* roasted malt dark */
--color-base-300: oklch(23% 0.01 42); /* deep brown */ --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 */ --color-base-content: oklch(88% 0.008 75); /* warm off-white */
--color-primary: oklch(68% 0.055 60); /* golden amber */ --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 */ --color-primary-content: oklch(30.5% 0.012 50); /* warm off-white */
--color-secondary: oklch(48% 0.035 40); /* deep mahogany ale */ --color-secondary: oklch(62.5% 0.035 40); /* deep mahogany ale */
--color-secondary-content: oklch(97% 0.005 75); /* near-white — 13.9:1 on secondary */ --color-secondary-content: oklch(23.5% 0.005 75); /* near-white */
--color-accent: oklch(82% 0.01 88); /* frothy cream head */ --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 */ --color-accent-content: oklch(18% 0.012 55); /* near-black */
--color-neutral: oklch(20% 0.008 45); /* near-black with warmth */ --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 */ --color-neutral-content: oklch(88% 0.007 78); /* warm off-white */
--color-info: oklch(60% 0.04 145); /* cool hop green */ --color-info: oklch(61.5% 0.04 145); /* cool hop green */
--color-info-content: oklch(86% 0.006 145); /* pale green-white — 4.6:1 on info */ --color-info-content: oklch(23% 0.006 145); /* pale green-white */
--color-success: oklch(66% 0.038 120); /* fresh barley */ --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 */ --color-success-content: oklch(28.5% 0.012 120); /* pale barley-white */
--color-warning: oklch(70% 0.055 55); /* amber harvest */ --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 */ --color-warning-content: oklch(32.5% 0.012 55); /* warm near-white */
--color-error: oklch(50% 0.06 20); /* deep cherry kriek */ --color-error: oklch(62.5% 0.06 20); /* deep cherry kriek */
--color-error-content: oklch(97% 0.004 15); /* near-white — 13.1:1 on error */ --color-error-content: oklch(23% 0.004 15); /* near-white */
--color-surface: oklch(26% 0.012 45); /* elevated dark panel */ --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-surface-content: oklch(88% 0.008 75); /* warm off-white */
--color-muted: oklch(78% 0.018 72); /* warm grey — 4.7:1 on base-100, 4.6:1 on surface */ --color-muted: oklch(78% 0.018 72); /* warm grey */
--color-highlight: oklch(32% 0.025 48); /* warm dark brown, hover and active states */ --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 */ --color-highlight-content: oklch(88% 0.008 75); /* warm off-white */
--radius-selector: 0.375rem; --radius-selector: 0.375rem;
--radius-field: 0.5rem; --radius-field: 0.5rem;
@@ -148,40 +148,38 @@ h6,
--color-base-100: oklch(13% 0.01 295); /* blackberry-stained near-black */ --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-200: oklch(17% 0.013 292); /* deep purple-black */
--color-base-300: oklch(22% 0.016 290); /* dark grape */ --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 */ --color-base-content: oklch(90% 0.014 300); /* pale lavender-white */
--color-primary: oklch(72% 0.075 295); /* cassis berry purple */ --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 */ --color-primary-content: oklch(34% 0.01 295); /* pale lavender */
--color-secondary: oklch(68% 0.06 10); /* sour cherry rose */ --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 */ --color-secondary-content: oklch(30% 0.006 10); /* warm near-white */
--color-accent: oklch(75% 0.045 130); /* tart lime zest */ --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 */ --color-accent-content: oklch(37.5% 0.01 130); /* near-white */
--color-neutral: oklch(18% 0.016 290); /* deep blackened grape */ --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 */ --color-neutral-content: oklch(88% 0.01 295); /* pale lavender */
--color-info: oklch(62% 0.04 250); /* muted indigo */ --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 */ --color-info-content: oklch(23% 0.008 250); /* pale indigo-white */
--color-success: oklch(65% 0.04 145); /* elderberry green */ --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 */ --color-success-content: oklch(27.5% 0.008 145); /* pale green-white */
--color-warning: oklch(70% 0.05 65); /* sour apricot */ --color-warning: oklch(70% 0.05 65); /* sour apricot */
--color-warning-content: oklch(97% 0.03 65); /* near-white — 5.6:1 on warning */ --color-warning-content: oklch(32.5% 0.03 65); /* near-white */
--color-error: oklch(50% 0.055 22); /* kriek red */ --color-error: oklch(62% 0.055 22); /* kriek red */
--color-error-content: oklch(97% 0.006 22); /* near-white — 13.2:1 on error */ --color-error-content: oklch(22% 0.006 22); /* near-white */
--color-surface: oklch(27% 0.022 292); /* lifted purple-black panel */ --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-surface-content: oklch(90% 0.014 300); /* pale lavender-white */
--color-muted: oklch( --color-muted: oklch(77.6% 0.022 300); /* desaturated lavender */
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: 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 */ --color-highlight-content: oklch(90% 0.014 300); /* pale lavender-white */
--radius-selector: 0.5rem; --radius-selector: 0.5rem;
--radius-field: 0.5rem; --radius-field: 0.5rem;
@@ -207,38 +205,38 @@ h6,
--color-base-100: oklch(99% 0.007 112); /* near-white with faint barley-green tint */ --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-200: oklch(96% 0.012 114); /* pale barley wash */
--color-base-300: oklch(92% 0.019 116); /* light straw */ --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 */ --color-base-content: oklch(20% 0.022 122); /* deep green-black */
--color-primary: oklch(52% 0.085 118); /* fresh-cut barley green */ --color-primary: oklch(50% 0.085 118); /* fresh-cut barley green */
--color-primary-content: oklch(97% 0.005 118); /* near-white — 12.5:1 on primary */ --color-primary-content: oklch(97% 0.005 118); /* near-white */
--color-secondary: oklch(44% 0.055 128); /* muted sage stem */ --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 */ --color-secondary-content: oklch(97% 0.005 128); /* near-white */
--color-accent: oklch(93% 0.03 148); /* pale morning dew */ --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 */ --color-accent-content: oklch(22% 0.022 148); /* deep green */
--color-neutral: oklch(76% 0.028 118); /* dried straw, surface differentiation */ --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 */ --color-neutral-content: oklch(38.4% 0.005 118); /* near-white */
--color-info: oklch(38% 0.065 232); /* clear summer sky */ --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 */ --color-info-content: oklch(98% 0.005 232); /* near-white */
--color-success: oklch(38% 0.085 145); /* young shoot green */ --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 */ --color-success-content: oklch(98% 0.005 145); /* near-white */
--color-warning: oklch(68% 0.1 76); /* ripening grain amber */ --color-warning: oklch(51% 0.1 76); /* ripening grain amber */
--color-warning-content: oklch(92.5% 0.005 72); /* warm near-white — 4.5:1 on warning */ --color-warning-content: oklch(92.5% 0.005 72); /* warm near-white */
--color-error: oklch(52% 0.1 18); /* dusty rose red */ --color-error: oklch(51.5% 0.1 18); /* dusty rose red */
--color-error-content: oklch(98% 0.005 15); /* near-white — 12.5:1 on error */ --color-error-content: oklch(98% 0.005 15); /* near-white */
--color-surface: oklch(94% 0.012 112); /* soft barley-wash panel */ --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-surface-content: oklch(20% 0.022 122); /* deep green-black */
--color-muted: oklch(38% 0.055 120); /* sage green — 18.1:1 on base-100, 13.0:1 on surface */ --color-muted: oklch(38% 0.055 120); /* sage green */
--color-highlight: oklch(85% 0.04 118); /* green-tinted hover and active state */ --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 */ --color-highlight-content: oklch(20% 0.022 122); /* deep green-black */
--radius-selector: 2rem; --radius-selector: 2rem;
--radius-field: 2rem; --radius-field: 2rem;
@@ -249,3 +247,33 @@ h6,
--depth: 0; --depth: 0;
--noise: 0; --noise: 0;
} }
/* WCAG 1.4.11: form-field borders at >= 3:1 against every base layer */
:is(.input, .select, .textarea):not(
.input-neutral,
.input-primary,
.input-secondary,
.input-accent,
.input-info,
.input-success,
.input-warning,
.input-error,
.select-neutral,
.select-primary,
.select-secondary,
.select-accent,
.select-info,
.select-success,
.select-warning,
.select-error,
.textarea-neutral,
.textarea-primary,
.textarea-secondary,
.textarea-accent,
.textarea-info,
.textarea-success,
.textarea-warning,
.textarea-error
) {
--input-color: color-mix(in oklab, var(--color-base-content) 56%, #0000);
}

View File

@@ -49,8 +49,8 @@ const Navbar = ({ auth }: NavbarProps) => (
</svg> </svg>
</DisclosureButton> </DisclosureButton>
<Link to="/" className="text-xl font-bold"> <Link to="/" className="lg:text-xl text-lg font-bold">
🍺 The Biergarten App The Biergarten App
</Link> </Link>
</div> </div>

View File

@@ -11,7 +11,7 @@ const AuthFlowDemoCard = () => (
<li className="list-row"> <li className="list-row">
<div> <div>
<p className="font-semibold">Login</p> <p className="font-semibold">Login</p>
<p className="text-sm text-base-content/60"> <p className="text-sm text-base-content/70">
POST to <code className="kbd kbd-sm">/api/auth/login</code> with POST to <code className="kbd kbd-sm">/api/auth/login</code> with
username &amp; password username &amp; password
</p> </p>
@@ -20,7 +20,7 @@ const AuthFlowDemoCard = () => (
<li className="list-row"> <li className="list-row">
<div> <div>
<p className="font-semibold">Register</p> <p className="font-semibold">Register</p>
<p className="text-sm text-base-content/60"> <p className="text-sm text-base-content/70">
POST to <code className="kbd kbd-sm">/api/auth/register</code> with full POST to <code className="kbd kbd-sm">/api/auth/register</code> with full
user details user details
</p> </p>
@@ -29,7 +29,7 @@ const AuthFlowDemoCard = () => (
<li className="list-row"> <li className="list-row">
<div> <div>
<p className="font-semibold">Session</p> <p className="font-semibold">Session</p>
<p className="text-sm text-base-content/60"> <p className="text-sm text-base-content/70">
JWT access &amp; refresh tokens stored in an HTTP-only cookie JWT access &amp; refresh tokens stored in an HTTP-only cookie
</p> </p>
</div> </div>
@@ -37,7 +37,7 @@ const AuthFlowDemoCard = () => (
<li className="list-row"> <li className="list-row">
<div> <div>
<p className="font-semibold">Protected Routes</p> <p className="font-semibold">Protected Routes</p>
<p className="text-sm text-base-content/60"> <p className="text-sm text-base-content/70">
This dashboard requires authentication via{' '} This dashboard requires authentication via{' '}
<code className="kbd kbd-sm">requireAuth()</code> <code className="kbd kbd-sm">requireAuth()</code>
</p> </p>
@@ -46,7 +46,7 @@ const AuthFlowDemoCard = () => (
<li className="list-row"> <li className="list-row">
<div> <div>
<p className="font-semibold">Token Refresh</p> <p className="font-semibold">Token Refresh</p>
<p className="text-sm text-base-content/60"> <p className="text-sm text-base-content/70">
POST to <code className="kbd kbd-sm">/api/auth/refresh</code> with the POST to <code className="kbd kbd-sm">/api/auth/refresh</code> with the
refresh token in an <code className="kbd kbd-sm">X-Refresh-Token</code>{' '} refresh token in an <code className="kbd kbd-sm">X-Refresh-Token</code>{' '}
header header
@@ -56,7 +56,7 @@ const AuthFlowDemoCard = () => (
<li className="list-row"> <li className="list-row">
<div> <div>
<p className="font-semibold">Account Management</p> <p className="font-semibold">Account Management</p>
<p className="text-sm text-base-content/60"> <p className="text-sm text-base-content/70">
PATCH <code className="kbd kbd-sm">/api/auth/username</code>,{' '} PATCH <code className="kbd kbd-sm">/api/auth/username</code>,{' '}
<code className="kbd kbd-sm">/email</code>,{' '} <code className="kbd kbd-sm">/email</code>,{' '}
<code className="kbd kbd-sm">/password</code>,{' '} <code className="kbd kbd-sm">/password</code>,{' '}

View File

@@ -14,7 +14,7 @@ const SectionCard = ({ icon, title, description, open, onToggle, children }: Sec
<div className="card-body"> <div className="card-body">
<div className="flex w-full items-center justify-between gap-5"> <div className="flex w-full items-center justify-between gap-5">
<div className="flex items-start gap-3"> <div className="flex items-start gap-3">
<span className="text-base-content/60 mt-1">{icon}</span> <span className="text-base-content/70 mt-1">{icon}</span>
<div> <div>
<h2 className="card-title text-lg">{title}</h2> <h2 className="card-title text-lg">{title}</h2>
<p className="text-sm text-base-content/70">{description}</p> <p className="text-sm text-base-content/70">{description}</p>

View File

@@ -15,7 +15,7 @@ const SessionInfoCard = ({ username, userAccountId }: SessionInfoCardProps) => (
</p> </p>
<div className="bg-base-200 rounded-box p-4 mt-2"> <div className="bg-base-200 rounded-box p-4 mt-2">
<p className="text-xs font-semibold uppercase tracking-widest text-base-content/50 mb-3"> <p className="text-xs font-semibold uppercase tracking-widest text-base-content/70 mb-3">
Session Info Session Info
</p> </p>
<div className="stats stats-vertical w-full"> <div className="stats stats-vertical w-full">

View File

@@ -208,11 +208,13 @@ const AccountPage = ({ loaderData, actionData }: Route.ComponentProps) => {
return ( return (
<div className="min-h-screen bg-base-200"> <div className="min-h-screen bg-base-200">
<div className="mx-auto max-w-2xl px-6 py-10 space-y-6"> <div className="mx-auto max-w-7xl px-5 pt-10 pb-10 space-y-6">
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
<Settings className="size-7" aria-hidden="true" /> <Settings className="size-7" aria-hidden="true" />
<div> <div>
<h1 className="text-3xl font-bold">Account Settings</h1> <h1 className="font-serif text-5xl font-bold leading-tight">
Account Settings
</h1>
<p className="text-base-content/70"> <p className="text-base-content/70">
Manage the account details for{' '} Manage the account details for{' '}
<span className="font-mono">{username}</span> <span className="font-mono">{username}</span>
@@ -257,7 +259,7 @@ const AccountPage = ({ loaderData, actionData }: Route.ComponentProps) => {
<Link <Link
to="/dashboard" to="/dashboard"
className="link link-hover text-sm text-base-content/60 inline-block" className="link link-hover text-sm text-base-content/70 inline-block"
> >
← Back to dashboard ← Back to dashboard
</Link> </Link>

View File

@@ -20,7 +20,7 @@ const Dashboard = ({ loaderData }: Route.ComponentProps) => {
return ( return (
<div className="min-h-screen bg-base-200"> <div className="min-h-screen bg-base-200">
<div className="mx-auto max-w-4xl px-6 py-10 space-y-6"> <div className="mx-auto max-w-7xl px-5 pt-10 pb-10 space-y-6">
<SessionInfoCard username={username} userAccountId={userAccountId} /> <SessionInfoCard username={username} userAccountId={userAccountId} />
<AuthFlowDemoCard /> <AuthFlowDemoCard />
</div> </div>

View File

@@ -10,7 +10,7 @@ const ConfirmSuccess = ({ confirmedDate }: ConfirmSuccessProps) => (
<h1 className="card-title text-2xl">Email Confirmed!</h1> <h1 className="card-title text-2xl">Email Confirmed!</h1>
<p className="text-base-content/70">Your email address has been successfully verified.</p> <p className="text-base-content/70">Your email address has been successfully verified.</p>
<div className="bg-base-200 rounded-box w-full p-3 text-sm text-left"> <div className="bg-base-200 rounded-box w-full p-3 text-sm text-left">
<span className="text-base-content/50 text-xs uppercase tracking-widest font-semibold"> <span className="text-base-content/70 text-xs uppercase tracking-widest font-semibold">
Confirmed at Confirmed at
</span> </span>
<p className="font-mono mt-1">{new Date(confirmedDate).toLocaleString()}</p> <p className="font-mono mt-1">{new Date(confirmedDate).toLocaleString()}</p>

View File

@@ -8,7 +8,7 @@ const LoginCallout = () => (
<Link to="/login" className="btn btn-outline btn-sm w-full"> <Link to="/login" className="btn btn-outline btn-sm w-full">
Sign in Sign in
</Link> </Link>
<Link to="/" className="link link-hover text-sm text-base-content/60"> <Link to="/" className="link link-hover text-sm text-base-content/70">
Back to home Back to home
</Link> </Link>
</div> </div>

View File

@@ -11,7 +11,7 @@ const RegisterCallout = () => (
</Link> </Link>
<Link <Link
to="/" to="/"
className="link link-hover text-sm text-base-content/60 inline-flex items-center gap-1" className="link link-hover text-sm text-base-content/70 inline-flex items-center gap-1"
> >
<HomeSimpleDoor className="size-4" aria-hidden="true" /> <HomeSimpleDoor className="size-4" aria-hidden="true" />
Back to home Back to home

View File

@@ -23,12 +23,12 @@ const BeerListCard = ({ beers }: BeerListCardProps) => (
> >
<div className="flex flex-col gap-0.5 min-w-0"> <div className="flex flex-col gap-0.5 min-w-0">
<span className="font-bold text-sm">{beer.name}</span> <span className="font-bold text-sm">{beer.name}</span>
<span className="text-xs text-base-content/60">{beer.description}</span> <span className="text-xs text-base-content/70">{beer.description}</span>
</div> </div>
<span className="badge badge-ghost bg-base-300 text-xs font-semibold whitespace-nowrap"> <span className="badge badge-ghost bg-base-300 text-xs font-semibold whitespace-nowrap">
{beer.style} {beer.style}
</span> </span>
<span className="text-xs text-base-content/60 tabular-nums whitespace-nowrap"> <span className="text-xs text-base-content/70 tabular-nums whitespace-nowrap">
{beer.abv.toFixed(1)}% ABV {beer.abv.toFixed(1)}% ABV
</span> </span>
<StarRating value={beer.rating} size="xs" /> <StarRating value={beer.rating} size="xs" />

View File

@@ -17,7 +17,7 @@ const BeerStyleBreakdownCard = ({ beers }: BeerStyleBreakdownCardProps) => {
<div key={style} className="flex flex-col gap-1"> <div key={style} className="flex flex-col gap-1">
<div className="flex items-baseline justify-between gap-2"> <div className="flex items-baseline justify-between gap-2">
<span className="text-sm font-semibold">{style}</span> <span className="text-sm font-semibold">{style}</span>
<span className="text-xs text-base-content/60 tabular-nums">{count}</span> <span className="text-xs text-base-content/70 tabular-nums">{count}</span>
</div> </div>
<progress <progress
className="progress progress-primary h-1.5" className="progress progress-primary h-1.5"

View File

@@ -8,7 +8,7 @@ interface BreweryDetailsCardProps {
const DetailRow = ({ label, value }: { label: string; value: string | number }) => ( const DetailRow = ({ label, value }: { label: string; value: string | number }) => (
<div className="flex items-center justify-between gap-2 text-sm"> <div className="flex items-center justify-between gap-2 text-sm">
<span className="text-base-content/60">{label}</span> <span className="text-base-content/70">{label}</span>
<span className="font-semibold">{value}</span> <span className="font-semibold">{value}</span>
</div> </div>
); );

View File

@@ -26,16 +26,18 @@ const BreweryHeaderCard = ({
<div className="card-body gap-4 p-7"> <div className="card-body gap-4 p-7">
<div className="flex flex-col gap-1"> <div className="flex flex-col gap-1">
<div className="flex items-center gap-2 flex-wrap"> <div className="flex items-center gap-2 flex-wrap">
<span className="text-xs font-bold uppercase tracking-widest text-base-content/50"> <span className="text-xs font-bold uppercase tracking-widest text-base-content/70">
Brewery Brewery
</span> </span>
<span className="badge bg-[var(--color-highlight)] text-[var(--color-highlight-content)]"> <span className="badge bg-[var(--color-highlight)] text-[var(--color-highlight-content)]">
Est. {foundedYear} Est. {foundedYear}
</span> </span>
</div> </div>
<h1 className="text-4xl leading-tight m-0">{brewery.breweryName}</h1> <h1 className="font-serif text-5xl font-bold leading-tight m-0">
{brewery.breweryName}
</h1>
{brewery.location && ( {brewery.location && (
<p className="text-sm text-base-content/60 flex items-center gap-1 m-0"> <p className="text-sm text-base-content/70 flex items-center gap-1 m-0">
<MapPin className="size-4" aria-hidden="true" /> <MapPin className="size-4" aria-hidden="true" />
{formatBreweryAddress(brewery.location)} {formatBreweryAddress(brewery.location)}
</p> </p>
@@ -57,7 +59,7 @@ const BreweryHeaderCard = ({
<div className="flex items-baseline gap-1.5"> <div className="flex items-baseline gap-1.5">
<StarRating value={avgRating} size="sm" /> <StarRating value={avgRating} size="sm" />
<span className="font-bold">{avgRating.toFixed(1)}</span> <span className="font-bold">{avgRating.toFixed(1)}</span>
<span className="text-sm text-base-content/60">({ratingsCount} ratings)</span> <span className="text-sm text-base-content/70">({ratingsCount} ratings)</span>
</div> </div>
</div> </div>
<p className="text-base-content/70 leading-relaxed text-pretty m-0"> <p className="text-base-content/70 leading-relaxed text-pretty m-0">

View File

@@ -8,7 +8,7 @@ interface CommunityStatsCardProps {
const StatRow = ({ label, value }: { label: string; value: number }) => ( const StatRow = ({ label, value }: { label: string; value: number }) => (
<div className="flex items-center justify-between gap-2 text-sm"> <div className="flex items-center justify-between gap-2 text-sm">
<span className="text-base-content/60">{label}</span> <span className="text-base-content/70">{label}</span>
<span className="font-semibold tabular-nums">{value}</span> <span className="font-semibold tabular-nums">{value}</span>
</div> </div>
); );

View File

@@ -10,7 +10,7 @@ const YourRatingCard = ({ value, onChange }: YourRatingCardProps) => (
<div className="card-body flex-row flex-wrap items-center justify-between gap-4 p-6"> <div className="card-body flex-row flex-wrap items-center justify-between gap-4 p-6">
<div className="flex flex-col gap-0.5"> <div className="flex flex-col gap-0.5">
<h3 className="text-xl m-0">Your rating</h3> <h3 className="text-xl m-0">Your rating</h3>
<p className="text-sm text-base-content/60 m-0"> <p className="text-sm text-base-content/70 m-0">
{value {value
? `You rated this ${value} of 5. Tap the same star to clear.` ? `You rated this ${value} of 5. Tap the same star to clear.`
: 'Tap a star to rate this brewery.'} : 'Tap a star to rate this brewery.'}

View File

@@ -31,14 +31,14 @@ const CommentItem = ({ comment, onToggleLike }: CommentItemProps) => {
<span className="font-bold text-sm">{comment.user}</span> <span className="font-bold text-sm">{comment.user}</span>
)} )}
<StarRating value={comment.rating} size="xs" /> <StarRating value={comment.rating} size="xs" />
<span className="text-xs text-base-content/60">{comment.time}</span> <span className="text-xs text-base-content/70">{comment.time}</span>
</div> </div>
<p className="text-sm leading-relaxed m-0">{comment.text}</p> <p className="text-sm leading-relaxed m-0">{comment.text}</p>
<button <button
type="button" type="button"
onClick={() => onToggleLike(comment.id)} onClick={() => onToggleLike(comment.id)}
className={`self-start inline-flex items-center gap-1 text-xs font-semibold ${ className={`self-start inline-flex items-center gap-1 text-xs font-semibold ${
comment.liked ? 'text-primary' : 'text-base-content/60' comment.liked ? 'text-primary' : 'text-base-content/70'
}`} }`}
> >
{comment.liked ? ( {comment.liked ? (

View File

@@ -24,7 +24,7 @@ const BreweryCard = ({ brewery }: BreweryCardProps) => (
</p> </p>
)} )}
{brewery.location && ( {brewery.location && (
<p className="text-sm text-base-content/50 mt-2"> <p className="text-sm text-base-content/70 mt-2">
{formatBreweryAddress(brewery.location)} {formatBreweryAddress(brewery.location)}
</p> </p>
)} )}

View File

@@ -19,14 +19,14 @@ const FeaturedBreweryCard = ({ brewery, onShowOnMap }: FeaturedBreweryCardProps)
<div className="card-body gap-3.5 p-8 md:grid md:grid-cols-[1.35fr_1fr] md:gap-10 md:items-start"> <div className="card-body gap-3.5 p-8 md:grid md:grid-cols-[1.35fr_1fr] md:gap-10 md:items-start">
<div className="flex flex-col gap-3.5"> <div className="flex flex-col gap-3.5">
{brewery.location && ( {brewery.location && (
<div className="text-sm font-semibold text-base-content/60"> <div className="text-sm font-semibold text-base-content/70">
{brewery.location.cityName}, {brewery.location.stateProvinceCode} {brewery.location.cityName}, {brewery.location.stateProvinceCode}
</div> </div>
)} )}
<h3 className="font-serif text-4xl leading-tight m-0">{brewery.breweryName}</h3> <h3 className="font-serif text-4xl leading-tight m-0">{brewery.breweryName}</h3>
<p className="text-lg leading-snug text-pretty m-0">{brewery.description}</p> <p className="text-lg leading-snug text-pretty m-0">{brewery.description}</p>
{brewery.location && ( {brewery.location && (
<p className="text-sm text-base-content/60 m-0"> <p className="text-sm text-base-content/70 m-0">
{formatBreweryAddress(brewery.location)} {formatBreweryAddress(brewery.location)}
</p> </p>
)} )}

View File

@@ -17,7 +17,7 @@ const RecentBreweries = ({ breweries }: RecentBreweriesProps) => {
<div className="card-body gap-1.5"> <div className="card-body gap-1.5">
<h3 className="card-title font-serif text-xl">{brewery.breweryName}</h3> <h3 className="card-title font-serif text-xl">{brewery.breweryName}</h3>
{brewery.location && ( {brewery.location && (
<div className="text-sm text-base-content/60"> <div className="text-sm text-base-content/70">
{brewery.location.cityName},{' '} {brewery.location.cityName},{' '}
{brewery.location.stateProvinceCode} {brewery.location.stateProvinceCode}
</div> </div>

View File

@@ -20,7 +20,7 @@ const NearbyBreweriesHeader = ({
return ( return (
<div className="flex items-baseline justify-between gap-4 flex-wrap mb-3.5"> <div className="flex items-baseline justify-between gap-4 flex-wrap mb-3.5">
<h2 className="font-serif text-2xl m-0">Breweries near you</h2> <h2 className="font-serif text-2xl m-0">Breweries near you</h2>
<span className="text-sm text-base-content/60"> <span className="text-sm text-base-content/70">
{center {center
? `${withDistance.length} within ${formatDistance(radiusKm * 1000, unit)} of ${centerLabel}` ? `${withDistance.length} within ${formatDistance(radiusKm * 1000, unit)} of ${centerLabel}`
: 'Finding breweries near you…'} : 'Finding breweries near you…'}

View File

@@ -23,7 +23,7 @@ const NearbyBreweryList = ({
return ( return (
<> <>
{withDistance.length === 0 && center && ( {withDistance.length === 0 && center && (
<p className="text-sm text-base-content/60"> <p className="text-sm text-base-content/70">
No partner breweries within {formatDistance(radiusKm * 1000, unit)}. No partner breweries within {formatDistance(radiusKm * 1000, unit)}.
</p> </p>
)} )}

View File

@@ -37,7 +37,7 @@ const NearbyBreweryListItem = ({
</span> </span>
</div> </div>
{brewery.location && ( {brewery.location && (
<div className="text-sm text-base-content/60"> <div className="text-sm text-base-content/70">
{brewery.location.cityName}, {brewery.location.stateProvinceCode} {brewery.location.cityName}, {brewery.location.stateProvinceCode}
</div> </div>
)} )}

View File

@@ -8,7 +8,7 @@ interface SidebarCardProps {
const SidebarCard = ({ title, children }: SidebarCardProps) => ( const SidebarCard = ({ title, children }: SidebarCardProps) => (
<div className="card bg-base-100 shadow"> <div className="card bg-base-100 shadow">
<div className="card-body gap-3 p-6"> <div className="card-body gap-3 p-6">
<p className="text-xs font-bold uppercase tracking-widest text-base-content/50 m-0"> <p className="text-xs font-bold uppercase tracking-widest text-base-content/70 m-0">
{title} {title}
</p> </p>
{children} {children}

View File

@@ -44,8 +44,8 @@ const Breweries = ({ loaderData }: Route.ComponentProps) => {
return ( return (
<div className="min-h-screen bg-base-200 text-base-content pb-16"> <div className="min-h-screen bg-base-200 text-base-content pb-16">
<div className="max-w-7xl mx-auto px-5 pt-10"> <div className="max-w-7xl mx-auto px-5 pt-10">
<h1 className="font-serif text-5xl leading-tight mb-2">Breweries</h1> <h1 className="font-serif text-5xl font-bold leading-tight mb-2">Breweries</h1>
<p className="text-lg text-base-content/60 max-w-xl m-0"> <p className="text-lg text-base-content/70 max-w-xl m-0">
Discover our partner breweries — start with this week&apos;s feature, then see Discover our partner breweries — start with this week&apos;s feature, then see
what&apos;s pouring near you. what&apos;s pouring near you.
</p> </p>

View File

@@ -80,15 +80,15 @@ const BreweryDetail = ({ loaderData }: Route.ComponentProps) => {
return ( return (
<div className="min-h-screen bg-base-200"> <div className="min-h-screen bg-base-200">
<div className="max-w-4xl mx-auto px-6 pt-8 pb-16"> <div className="mx-auto max-w-7xl px-5 pt-10 pb-16">
<Link <Link
to="/breweries" to="/breweries"
className="link link-hover text-sm text-base-content/60 mb-4 inline-block" className="link link-hover text-sm text-base-content/70 mb-4 inline-block"
> >
&larr; Back to breweries &larr; Back to breweries
</Link> </Link>
<div className="grid grid-cols-1 lg:grid-cols-[1fr_19rem] gap-5 items-start"> <div className="grid grid-cols-1 lg:grid-cols-[1fr_23rem] gap-5 items-start">
<div className="flex flex-col gap-5"> <div className="flex flex-col gap-5">
<BreweryHeaderCard <BreweryHeaderCard
brewery={brewery} brewery={brewery}

View File

@@ -72,14 +72,16 @@ const Breweries = ({ loaderData }: Route.ComponentProps) => {
return ( return (
<div className="min-h-screen bg-base-200"> <div className="min-h-screen bg-base-200">
<div className="container mx-auto p-14"> <div className="mx-auto max-w-7xl px-5 pt-10">
<Link <Link
to="/breweries" to="/breweries"
className="link link-hover text-sm text-base-content/60 mb-4 inline-block" className="link link-hover text-sm text-base-content/70 mb-4 inline-block"
> >
&larr; Back to Breweries &larr; Back to Breweries
</Link> </Link>
<h1 className="text-4xl font-bold mb-4">Full brewery directory</h1> <h1 className="font-serif text-5xl font-bold leading-tight mb-4">
Full brewery directory
</h1>
<p className="text-base-content/70 mb-6"> <p className="text-base-content/70 mb-6">
All of our partner breweries, newest first. All of our partner breweries, newest first.
</p> </p>
@@ -93,7 +95,7 @@ const Breweries = ({ loaderData }: Route.ComponentProps) => {
</ClientOnly> </ClientOnly>
{allBreweries.length === 0 ? ( {allBreweries.length === 0 ? (
<p className="text-center text-base-content/60 mt-12"> <p className="text-center text-base-content/70 mt-12">
No breweries found yet. No breweries found yet.
</p> </p>
) : ( ) : (

View File

@@ -0,0 +1,77 @@
import { Clock, Lock, Tools } from 'iconoir-react';
import type { ComponentType } from 'react';
import { Link } from 'react-router';
type Reason = 'soon' | 'maintenance' | 'auth';
interface Action {
to: string;
label: string;
className: string;
}
interface Content {
Icon: ComponentType<{ className?: string }>;
title: string;
description: string;
actions: Action[];
}
const CONTENT: Record<Reason, Content> = {
soon: {
Icon: Clock,
title: 'This feature is not available yet',
description: 'This feature is still in development.',
actions: [
{ to: '/breweries', label: 'Browse breweries', className: 'btn-primary' },
{ to: '/', label: 'Back to home', className: 'btn-ghost' },
],
},
maintenance: {
Icon: Tools,
title: 'This feature is temporarily unavailable',
description: 'This feature is offline for maintenance. Try again in a few minutes.',
actions: [],
},
auth: {
Icon: Lock,
title: 'Sign in to use this feature',
description:
'This feature requires a valid session. Log in or create an account to continue.',
actions: [
{ to: '/login', label: 'Login', className: 'btn-primary' },
{ to: '/register', label: 'Register', className: 'btn-outline' },
],
},
};
interface FeatureNotAvailableProps {
reason?: Reason;
}
const FeatureNotAvailable = ({ reason = 'soon' }: FeatureNotAvailableProps) => {
const { Icon, title, description, actions } = CONTENT[reason];
return (
<section className="flex flex-col items-center gap-3 rounded-box border border-base-300 bg-base-100 px-6 py-12 text-center">
<div className="flex size-14 items-center justify-center rounded-full bg-base-200 text-base-content/70">
<Icon className="size-6" />
</div>
<div className="flex max-w-md flex-col gap-2">
<h2 className="font-serif text-2xl font-bold leading-tight">{title}</h2>
<p className="text-base-content/70 text-pretty">{description}</p>
</div>
{actions.length > 0 && (
<div className="flex flex-wrap justify-center gap-3 pt-2">
{actions.map(({ to, label, className }) => (
<Link key={to} to={to} className={`btn btn-sm ${className}`}>
{label}
</Link>
))}
</div>
)}
</section>
);
};
export default FeatureNotAvailable;

View File

@@ -1,3 +1,4 @@
import FeatureNotAvailable from '../components/FeatureNotAvailable';
import type { Route } from './+types/beer-styles'; import type { Route } from './+types/beer-styles';
export const meta = ({}: Route.MetaArgs) => { export const meta = ({}: Route.MetaArgs) => {
@@ -7,9 +8,12 @@ export const meta = ({}: Route.MetaArgs) => {
const BeerStyles = () => { const BeerStyles = () => {
return ( return (
<div className="min-h-screen bg-base-200"> <div className="min-h-screen bg-base-200">
<div className="container mx-auto p-4"> <div className="mx-auto max-w-7xl px-5 pt-10">
<h1 className="text-4xl font-bold mb-4">Beer Styles</h1> <h1 className="font-serif text-5xl font-bold leading-tight 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 className="mt-8">
<FeatureNotAvailable />
</div>
</div> </div>
</div> </div>
); );

View File

@@ -1,3 +1,4 @@
import FeatureNotAvailable from '../components/FeatureNotAvailable';
import type { Route } from './+types/beers'; import type { Route } from './+types/beers';
export const meta = ({}: Route.MetaArgs) => { export const meta = ({}: Route.MetaArgs) => {
@@ -7,9 +8,12 @@ export const meta = ({}: Route.MetaArgs) => {
const Beers = () => { const Beers = () => {
return ( return (
<div className="min-h-screen bg-base-200"> <div className="min-h-screen bg-base-200">
<div className="container mx-auto p-4"> <div className="mx-auto max-w-7xl px-5 pt-10">
<h1 className="text-4xl font-bold mb-4">Beers</h1> <h1 className="font-serif text-5xl font-bold leading-tight mb-4">Beers</h1>
<p className="text-base-content/70">Explore our collection of beers.</p> <p className="text-base-content/70">Explore our collection of beers.</p>
<div className="mt-8">
<FeatureNotAvailable />
</div>
</div> </div>
</div> </div>
); );

View File

@@ -0,0 +1,55 @@
# Landing page: data requirements
Covers `/` (`routes/home.tsx`), the public marketing landing page. The page is
built and live. This document lists what's real vs. filler, and what backend
work closes each gap.
## Status legend
- ✅ **Available**: real data, wired up.
- ⚠️ **Partial**: endpoint exists but is missing a field the design needs.
- ❌ **Missing**: no backend support; page shows filler or local-only state.
## Partner breweries preview
| Field | Status | Source | Gap |
| ------------------------------ | ------ | ---------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ |
| Name, description, city/region | ✅ | `GET /api/brewery?limit=3&offset=0` | |
| Newest-first ordering | ✅ | `GET /api/brewery` is already sorted | |
| "{n} beers" badge | ❌ | `FILLER_BEER_COUNTS` (`utils/filler-beer-counts.ts`) | Blocked on `Features.Beers`, which has a `.csproj` and nothing else — see `../breweries/BREWERY_HANDOFF.md`. |
## Hero, features, closing CTA
Static marketing copy and one bundled photo
(`assets/bar-background.jpg`, carried over from the archived Next.js
frontend). No data needs. Replace the photo when real photography exists.
## Theme try-out
✅ Fully real: renders `ThemeSegmentedControl`
(`../theme/components/ThemeSegmentedControl.tsx`), the same `join` + radio
control the theme guide uses. Selection sets `data-theme` on `<html>` and
persists through the `biergarten-theme` cookie that the root loader reads.
## Footer
✅ Fully real: swaps Login for Dashboard from the session that
`getOptionalAuth` resolves in the route loader.
## Loader resilience
`getBreweries` throws a 503 `data()` response when the API is unreachable. The
landing page catches it and renders the "No breweries have been posted yet."
empty state, so a brewery service outage leaves the marketing content intact.
`/breweries` keeps the opposite behaviour — a brewery page with no breweries is
an error, so it surfaces its `ErrorBoundary`.
## Summary of backend work
1. Stand up `Features.Beers` so the per-brewery beer count is real. This is the
same blocker already listed in `../breweries/BREWERY_HANDOFF.md`; closing it
there closes it here.
Once that lands, swap `FILLER_BEER_COUNTS` for a count carried on `BreweryDto`
(or a dedicated beers-by-brewery query) and delete
`utils/filler-beer-counts.ts`.

Binary file not shown.

After

Width:  |  Height:  |  Size: 203 KiB

View File

@@ -0,0 +1,61 @@
import type { Meta, StoryObj } from '@storybook/react-vite';
import { expect, userEvent, waitFor, within } from 'storybook/test';
import AiDisclosureDialog from './AiDisclosureDialog';
const aiDisclosureDescription = `Tells visitors that the catalogue is AI-generated fixture data before they engage with it, as the pipeline ethics documentation requires. It opens on every full page load and closes for the rest of that load once acknowledged.`;
const meta = {
title: 'Disclosure/AiDisclosureDialog',
component: AiDisclosureDialog,
tags: ['autodocs'],
args: {
defaultOpen: true,
},
parameters: {
layout: 'fullscreen',
docs: {
description: {
component: aiDisclosureDescription,
},
},
},
} satisfies Meta<typeof AiDisclosureDialog>;
export default meta;
type Story = StoryObj<typeof meta>;
export const Open: Story = {
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
await waitFor(async () => {
await expect(
canvas.getByRole('heading', { name: /this content is ai-generated/i }),
).toBeVisible();
});
await expect(
canvas.getByRole('link', { name: /how this data was generated/i }),
).toBeVisible();
},
};
export const Acknowledged: Story = {
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
await userEvent.click(canvas.getByRole('button', { name: /i understand/i }));
await expect(
canvas.queryByRole('heading', { name: /this content is ai-generated/i }),
).toBeNull();
},
};
export const InitiallyDismissed: Story = {
args: {
defaultOpen: false,
},
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
await expect(
canvas.queryByRole('heading', { name: /this content is ai-generated/i }),
).toBeNull();
},
};

View File

@@ -0,0 +1,79 @@
import { Sparks } from 'iconoir-react';
import { useEffect, useState } from 'react';
const ethicsDocUrl =
'https://github.com/aaronpo97/the-biergarten-app/blob/main/docs/pipeline/ETHICS-AND-KNOWN-ISSUES.md';
const AiDisclosureDialog = ({ defaultOpen = true }: { defaultOpen?: boolean }) => {
const [open, setOpen] = useState(defaultOpen);
useEffect(() => {
if (!open) {
return;
}
const onKeyDown = (event: KeyboardEvent) => {
if (event.key === 'Escape') {
setOpen(false);
}
};
document.addEventListener('keydown', onKeyDown);
return () => document.removeEventListener('keydown', onKeyDown);
}, [open]);
if (!open) {
return null;
}
return (
<div
className="modal modal-open"
role="dialog"
aria-modal="true"
aria-labelledby="ai-disclosure-title"
>
<div className="modal-box max-w-md">
<div className="flex flex-col items-center gap-3 text-center">
<span className="text-primary">
<Sparks className="size-10" aria-hidden="true" />
</span>
<h2 id="ai-disclosure-title" className="text-lg font-bold">
This content is AI-generated
</h2>
<p className="text-sm text-base-content/70">
The Biergarten App is a proof of concept. Every brewery, beer, and user in
this catalogue is fixture data produced by a language model — none of it
describes a real business, person, or beer.
</p>
<div role="alert" className="alert alert-warning alert-soft text-left">
<span className="text-sm">
Brewing details, local-language text, and coordinates are known to
contain fabrications. Treat nothing here as factual.
</span>
</div>
<a
href={ethicsDocUrl}
target="_blank"
rel="noreferrer"
className="link link-primary text-sm"
>
How this data was generated
</a>
</div>
<div className="modal-action">
<button
type="button"
className="btn btn-primary w-full"
autoFocus
onClick={() => setOpen(false)}
>
I understand
</button>
</div>
</div>
</div>
);
};
export default AiDisclosureDialog;

View File

@@ -0,0 +1,40 @@
import type { Meta, StoryObj } from '@storybook/react-vite';
import { expect, within } from 'storybook/test';
import ClosingCta from './ClosingCta';
const closingCtaDescription = `Landing page closing call to action: centred headline with the sign-up and sign-in pair.`;
const meta = {
title: 'Home/ClosingCta',
component: ClosingCta,
tags: ['autodocs'],
parameters: {
layout: 'fullscreen',
docs: {
description: {
component: closingCtaDescription,
},
},
},
} satisfies Meta<typeof ClosingCta>;
export default meta;
type Story = StoryObj<typeof meta>;
export const Default: Story = {
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
await expect(
canvas.getByRole('heading', { name: /your next favourite brewery is on the list/i }),
).toBeInTheDocument();
await expect(canvas.getByRole('link', { name: 'Create an account' })).toHaveAttribute(
'href',
'/register',
);
await expect(canvas.getByRole('link', { name: 'Sign in' })).toHaveAttribute(
'href',
'/login',
);
},
};

View File

@@ -0,0 +1,24 @@
import { Link } from 'react-router';
const ClosingCta = () => (
<section className="mx-auto flex max-w-3xl flex-col items-center gap-5 px-5 py-20 text-center">
<h2 className="m-0 font-serif text-[clamp(2rem,4vw,2.75rem)] leading-tight text-balance">
Your next favourite brewery is on the list.
</h2>
<p className="m-0 text-lg leading-[1.55] text-[var(--color-muted)]">
Create an account to save breweries and log the beers you try.
</p>
<div className="flex flex-wrap justify-center gap-3">
<Link to="/register" className="btn btn-primary">
Create an account
</Link>
<Link to="/login" className="btn btn-ghost">
Sign in
</Link>
</div>
</section>
);
export default ClosingCta;

View File

@@ -0,0 +1,36 @@
import type { Meta, StoryObj } from '@storybook/react-vite';
import { expect, within } from 'storybook/test';
import FeatureHighlights from './FeatureHighlights';
const featureHighlightsDescription = `Landing page feature band: three icon-led product capabilities on a base-100 strip.`;
const meta = {
title: 'Home/FeatureHighlights',
component: FeatureHighlights,
tags: ['autodocs'],
parameters: {
layout: 'fullscreen',
docs: {
description: {
component: featureHighlightsDescription,
},
},
},
} satisfies Meta<typeof FeatureHighlights>;
export default meta;
type Story = StoryObj<typeof meta>;
export const Default: Story = {
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
await expect(
canvas.getByRole('heading', { name: 'Everything you need to plan the next round' }),
).toBeInTheDocument();
for (const title of ['Browse breweries', 'Explore the beers', 'Keep a record']) {
await expect(canvas.getByRole('heading', { name: title })).toBeInTheDocument();
}
},
};

View File

@@ -0,0 +1,43 @@
import { Bookmark, GlassHalf, MapPin } from 'iconoir-react';
const features = [
{
icon: MapPin,
title: 'Browse breweries',
body: 'Search the directory by name or city. Every listing shows location, hours and what is on tap.',
},
{
icon: GlassHalf,
title: 'Explore the beers',
body: 'See each brewery’s full lineup with style, ABV and tasting notes from other members.',
},
{
icon: Bookmark,
title: 'Keep a record',
body: 'Save the places you want to visit and check off the beers you have tried from your dashboard.',
},
];
const FeatureHighlights = () => (
<section className="border-y border-base-300 bg-base-100">
<div className="mx-auto flex max-w-7xl flex-col gap-10 px-5 py-16">
<h2 className="m-0 max-w-[36rem] font-serif text-3xl leading-tight">
Everything you need to plan the next round
</h2>
<div className="grid gap-8 grid-cols-[repeat(auto-fit,minmax(min(100%,16rem),1fr))]">
{features.map(({ icon: Icon, title, body }) => (
<div key={title} className="flex flex-col gap-3">
<div className="flex size-11 items-center justify-center rounded-field bg-[var(--color-highlight)] text-[var(--color-highlight-content)]">
<Icon width={20} height={20} aria-hidden />
</div>
<h3 className="m-0 font-serif text-xl">{title}</h3>
<p className="m-0 leading-[1.55] text-[var(--color-muted)]">{body}</p>
</div>
))}
</div>
</div>
</section>
);
export default FeatureHighlights;

View File

@@ -0,0 +1,41 @@
import type { Meta, StoryObj } from '@storybook/react-vite';
import { expect, within } from 'storybook/test';
import HeroSection from './HeroSection';
const heroSectionDescription = `Landing page hero: eyebrow, headline, supporting copy, the primary sign-up pair and the bar photo.`;
const meta = {
title: 'Home/HeroSection',
component: HeroSection,
tags: ['autodocs'],
parameters: {
layout: 'fullscreen',
docs: {
description: {
component: heroSectionDescription,
},
},
},
} satisfies Meta<typeof HeroSection>;
export default meta;
type Story = StoryObj<typeof meta>;
export const Default: Story = {
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
await expect(
canvas.getByRole('heading', { name: 'Find the breweries worth the trip.' }),
).toBeInTheDocument();
await expect(canvas.getByRole('link', { name: 'Create an account' })).toHaveAttribute(
'href',
'/register',
);
await expect(canvas.getByRole('link', { name: 'Browse breweries' })).toHaveAttribute(
'href',
'/breweries',
);
},
};

View File

@@ -0,0 +1,44 @@
import { Link } from 'react-router';
import barBackground from '../assets/bar-background.jpg';
const HeroSection = () => (
<section className="mx-auto max-w-7xl px-5 pt-18 pb-16">
<div className="grid items-center gap-12 grid-cols-[repeat(auto-fit,minmax(min(100%,24rem),1fr))]">
<div className="flex flex-col gap-6">
<p className="m-0 text-sm font-semibold uppercase tracking-widest text-[var(--color-muted)]">
Brewery discovery
</p>
<h1 className="m-0 font-serif text-[clamp(2.5rem,5vw,4rem)] leading-[1.08] text-balance">
Find the breweries worth the trip.
</h1>
<p className="m-0 max-w-[34rem] text-lg leading-[1.55] text-[var(--color-muted)]">
Browse our partner breweries, see what they pour, and keep track of the beers
you have tried — all in one account.
</p>
<div className="flex flex-wrap gap-3">
<Link to="/register" className="btn btn-primary">
Create an account
</Link>
<Link to="/breweries" className="btn btn-outline">
Browse breweries
</Link>
</div>
<p className="m-0 text-sm text-[var(--color-muted)]">
Free to join. Must be 19 years or older.
</p>
</div>
<img
src={barBackground}
alt="A glass of lager on a bar counter"
className="w-full max-h-[34rem] aspect-[4/5] rounded-box bg-base-300 object-cover shadow-xl"
/>
</div>
</section>
);
export default HeroSection;

View File

@@ -0,0 +1,46 @@
import type { Meta, StoryObj } from '@storybook/react-vite';
import { expect, within } from 'storybook/test';
import LandingFooter from './LandingFooter';
const landingFooterDescription = `Landing page footer. The last link follows the session: Login when signed out, Dashboard when signed in.`;
const meta = {
title: 'Home/LandingFooter',
component: LandingFooter,
tags: ['autodocs'],
parameters: {
layout: 'fullscreen',
docs: {
description: {
component: landingFooterDescription,
},
},
},
} satisfies Meta<typeof LandingFooter>;
export default meta;
type Story = StoryObj<typeof meta>;
export const SignedOut: Story = {
args: { isAuthenticated: false },
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
await expect(canvas.getByRole('link', { name: 'Login' })).toHaveAttribute('href', '/login');
await expect(canvas.queryByRole('link', { name: 'Dashboard' })).not.toBeInTheDocument();
await expect(canvas.getByText('Please drink responsibly.')).toBeInTheDocument();
},
};
export const SignedIn: Story = {
args: { isAuthenticated: true },
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
await expect(canvas.getByRole('link', { name: 'Dashboard' })).toHaveAttribute(
'href',
'/dashboard',
);
await expect(canvas.queryByRole('link', { name: 'Login' })).not.toBeInTheDocument();
},
};

View File

@@ -0,0 +1,42 @@
import { Link } from 'react-router';
const footerLinks = [
{ to: '/breweries', label: 'Breweries' },
{ to: '/beers', label: 'Beers' },
{ to: '/theme', label: 'Theme guide' },
];
interface LandingFooterProps {
isAuthenticated: boolean;
}
const LandingFooter = ({ isAuthenticated }: LandingFooterProps) => (
<div className="border-t border-base-300 bg-base-100">
<footer className="footer footer-vertical sm:footer-horizontal mx-auto max-w-7xl items-center justify-between gap-4 px-5 py-6 text-sm text-[var(--color-muted)]">
<aside>
<span className="font-bold text-base-content">🍺 The Biergarten App</span>
</aside>
<nav className="flex flex-row flex-wrap gap-5">
{footerLinks.map((link) => (
<Link key={link.to} to={link.to} className="link link-hover hover:text-primary">
{link.label}
</Link>
))}
{isAuthenticated ? (
<Link to="/dashboard" className="link link-hover hover:text-primary">
Dashboard
</Link>
) : (
<Link to="/login" className="link link-hover hover:text-primary">
Login
</Link>
)}
</nav>
<p className="m-0">Please drink responsibly.</p>
</footer>
</div>
);
export default LandingFooter;

View File

@@ -0,0 +1,106 @@
import type { Meta, StoryObj } from '@storybook/react-vite';
import { expect, within } from 'storybook/test';
import type { Brewery, BreweryLocation } from '../../breweries/breweries.server';
import PartnerBreweries from './PartnerBreweries';
const partnerBreweriesDescription = `Landing page preview of the three most recently added breweries. Falls back to the empty-state line when the directory is empty or the brewery service is unreachable.`;
const halifaxLocation: BreweryLocation = {
breweryPostLocationId: 'loc-1',
breweryPostId: 'brewery-1',
cityId: 'city-1',
cityName: 'Halifax',
stateProvinceName: 'Nova Scotia',
stateProvinceCode: 'NS',
countryName: 'Canada',
countryCode: 'CA',
addressLine1: '12 Lower Water Street',
addressLine2: null,
postalCode: 'B3J 1S3',
coordinates: { latitude: 44.6488, longitude: -63.5752 },
};
const harbourline: Brewery = {
breweryPostId: 'brewery-1',
postedById: 'user-1',
breweryName: 'Harbourline Brewing',
description: 'Crisp lagers and a rotating sour program, a short walk from the waterfront.',
createdAt: '2024-05-01T12:00:00.000Z',
updatedAt: null,
location: halifaxLocation,
};
const oldMill: Brewery = {
breweryPostId: 'brewery-2',
postedById: 'user-2',
breweryName: 'Old Mill Ale Works',
description: 'Cask ales and English bitters brewed in a restored 1880s grain mill.',
createdAt: '2024-04-18T09:30:00.000Z',
updatedAt: null,
location: {
...halifaxLocation,
breweryPostId: 'brewery-2',
cityName: 'Guelph',
stateProvinceName: 'Ontario',
stateProvinceCode: 'ON',
},
};
const cedarAndHop: Brewery = {
breweryPostId: 'brewery-3',
postedById: 'user-3',
breweryName: 'Cedar & Hop',
description: 'A pop-up taproom that has not added a storefront location yet.',
createdAt: '2024-04-02T18:00:00.000Z',
updatedAt: null,
location: null,
};
const meta = {
title: 'Home/PartnerBreweries',
component: PartnerBreweries,
tags: ['autodocs'],
parameters: {
layout: 'fullscreen',
docs: {
description: {
component: partnerBreweriesDescription,
},
},
},
} satisfies Meta<typeof PartnerBreweries>;
export default meta;
type Story = StoryObj<typeof meta>;
export const WithBreweries: Story = {
args: { breweries: [harbourline, oldMill, cedarAndHop] },
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
await expect(
canvas.getByRole('heading', { name: 'Discover our partner breweries' }),
).toBeInTheDocument();
await expect(canvas.getByRole('link', { name: /view all breweries/i })).toHaveAttribute(
'href',
'/breweries',
);
const links = canvas.getAllByRole('link', { name: 'View brewery' });
await expect(links).toHaveLength(3);
await expect(links[0]).toHaveAttribute('href', '/breweries/brewery-1');
// see HOME_HANDOFF.md — the counts are filler until the beers API exists.
await expect(canvas.getByText('14 beers')).toBeInTheDocument();
},
};
export const Empty: Story = {
args: { breweries: [] },
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
await expect(canvas.getByText('No breweries have been posted yet.')).toBeInTheDocument();
await expect(canvas.queryByRole('link', { name: 'View brewery' })).not.toBeInTheDocument();
},
};

View File

@@ -0,0 +1,70 @@
import { Link } from 'react-router';
import type { Brewery } from '../../breweries/breweries.server';
import { FILLER_BEER_COUNTS } from '../utils/filler-beer-counts';
interface PartnerBreweriesProps {
breweries: Brewery[];
}
const PartnerBreweries = ({ breweries }: PartnerBreweriesProps) => (
<section className="mx-auto flex max-w-7xl flex-col gap-8 px-5 py-16">
<div className="flex flex-wrap items-end justify-between gap-4">
<div className="flex flex-col gap-1">
<h2 className="m-0 font-serif text-3xl leading-tight">
Discover our partner breweries
</h2>
<p className="m-0 text-[var(--color-muted)]">
A few recent additions to the directory.
</p>
</div>
<Link
to="/breweries"
className="font-semibold text-primary hover:text-secondary hover:underline"
>
View all breweries &rarr;
</Link>
</div>
{breweries.length === 0 ? (
<p className="m-0 text-[var(--color-muted)]">No breweries have been posted yet.</p>
) : (
<div className="grid gap-6 grid-cols-[repeat(auto-fit,minmax(min(100%,18rem),1fr))]">
{breweries.map((brewery, index) => (
<div key={brewery.breweryPostId} className="card bg-base-100 shadow-md">
<div className="card-body gap-3">
<div className="flex items-start justify-between gap-3">
<h3 className="card-title m-0 font-serif text-xl">
{brewery.breweryName}
</h3>
<span className="badge badge-accent badge-sm whitespace-nowrap font-semibold">
{FILLER_BEER_COUNTS[index % FILLER_BEER_COUNTS.length]} beers
</span>
</div>
{brewery.location && (
<p className="m-0 text-sm text-[var(--color-muted)]">
{brewery.location.cityName},{' '}
{brewery.location.stateProvinceCode}
</p>
)}
<p className="m-0 leading-[1.55]">{brewery.description}</p>
<div className="card-actions">
<Link
to={`/breweries/${brewery.breweryPostId}`}
className="btn btn-ghost btn-sm"
>
View brewery
</Link>
</div>
</div>
</div>
))}
</div>
)}
</section>
);
export default PartnerBreweries;

View File

@@ -0,0 +1,62 @@
import type { Meta, StoryObj } from '@storybook/react-vite';
import { useState } from 'react';
import { createMemoryRouter, RouterProvider } from 'react-router';
import { expect, within } from 'storybook/test';
import { biergartenThemes, defaultThemeName } from '../../theme/themes';
import ThemeTryOut from './ThemeTryOut';
const themeTryOutDescription = `Landing page theme band. Frames the shared \`ThemeSegmentedControl\` in an elevated card with a "Set the mood" eyebrow and a pour count, and renders it with short labels so the four options fit the marketing page's narrower column. Each option carries its \`shortVibe\` mood line, and picking one switches the whole document theme. The control seeds its selection from the root route's loader data, so this story runs behind a memory data router whose \`root\` route supplies a theme. \`Themes/ThemeSegmentedControl\` covers the control itself.`;
const ThemeTryOutHarness = () => {
const [router] = useState(() =>
createMemoryRouter([
{
id: 'root',
path: '/',
loader: () => ({ theme: defaultThemeName }),
element: <ThemeTryOut />,
},
]),
);
return <RouterProvider router={router} />;
};
const meta = {
title: 'Home/ThemeTryOut',
component: ThemeTryOutHarness,
tags: ['autodocs'],
parameters: {
layout: 'fullscreen',
usesDataRouter: true,
docs: {
description: {
component: themeTryOutDescription,
},
},
},
} satisfies Meta<typeof ThemeTryOutHarness>;
export default meta;
type Story = StoryObj<typeof meta>;
export const Default: Story = {
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
await expect(
canvas.getByRole('heading', { name: 'Pick a pour that suits you' }),
).toBeInTheDocument();
await expect(canvas.getByText('Set the mood')).toBeVisible();
await expect(canvas.getByText(`${biergartenThemes.length} pours`)).toBeVisible();
const group = canvas.getByRole('radiogroup', { name: 'Theme selector' });
await expect(within(group).getAllByRole('radio')).toHaveLength(biergartenThemes.length);
for (const theme of biergartenThemes) {
await expect(within(group).getByText(theme.shortLabel)).toBeVisible();
await expect(within(group).getByText(theme.shortVibe)).toBeVisible();
}
},
};

View File

@@ -0,0 +1,32 @@
import ThemeSegmentedControl from '../../theme/components/ThemeSegmentedControl';
const ThemeTryOut = () => (
<section className="bg-neutral text-neutral-content">
<div className="mx-auto grid max-w-7xl items-center gap-8 px-5 py-16 grid-cols-[repeat(auto-fit,minmax(min(100%,22rem),1fr))]">
<div className="flex flex-col gap-4">
<h2 className="m-0 font-serif text-3xl leading-tight">
Pick a pour that suits you
</h2>
<p className="m-0 max-w-[32rem] leading-[1.55] opacity-80">
Four themes ship with the app — a light lager, a dark roast stout, a berry
cassis and a bright weizen. Try one; this page switches with it.
</p>
</div>
<div className="rounded-box border border-neutral-content/15 bg-base-100 p-4 text-base-content shadow-xl sm:p-5">
<div className="mb-4 flex items-center justify-between gap-4">
<div>
<p className="m-0 text-xs font-bold uppercase tracking-[0.18em] opacity-60">
Set the mood
</p>
<p className="m-0 mt-1 text-sm opacity-75">Your theme follows your pour.</p>
</div>
<span className="badge badge-outline shrink-0">4 pours</span>
</div>
<ThemeSegmentedControl labels="short" />
</div>
</div>
</section>
);
export default ThemeTryOut;

View File

@@ -1,55 +1,51 @@
import { Link } from 'react-router'; import { getBreweries, type Brewery } from '../../breweries/breweries.server';
import { getOptionalAuth } from '../../auth/auth.server'; import { getOptionalAuth } from '../../auth/auth.server';
import ClosingCta from '../components/ClosingCta';
import FeatureHighlights from '../components/FeatureHighlights';
import HeroSection from '../components/HeroSection';
import LandingFooter from '../components/LandingFooter';
import PartnerBreweries from '../components/PartnerBreweries';
import ThemeTryOut from '../components/ThemeTryOut';
import type { Route } from './+types/home'; import type { Route } from './+types/home';
const PARTNER_BREWERY_COUNT = 3;
export const meta = ({}: Route.MetaArgs) => [ export const meta = ({}: Route.MetaArgs) => [
{ title: 'The Biergarten App' }, { title: 'The Biergarten App' },
{ name: 'description', content: 'Welcome to The Biergarten App' }, {
name: 'description',
content:
'Browse our partner breweries, see what they pour, and keep track of the beers you have tried.',
},
]; ];
export const loader = async ({ request }: Route.LoaderArgs) => { export const loader = async ({ request }: Route.LoaderArgs) => {
const auth = await getOptionalAuth(request); const auth = await getOptionalAuth(request);
return { username: auth?.username ?? null };
// The rest of the landing page stands on its own, so a brewery service
// outage degrades to the empty state instead of an error page.
let recentBreweries: Brewery[] = [];
try {
recentBreweries = await getBreweries(PARTNER_BREWERY_COUNT, 0);
} catch {
recentBreweries = [];
}
return { isAuthenticated: auth !== null, recentBreweries };
}; };
const Home = ({ loaderData }: Route.ComponentProps) => { const Home = ({ loaderData }: Route.ComponentProps) => {
const { username } = loaderData; const { isAuthenticated, recentBreweries } = loaderData;
return ( return (
<div className="hero min-h-screen bg-base-200"> <main className="bg-base-200 text-base-content">
<div className="hero-content text-center"> <HeroSection />
<div className="max-w-md space-y-6"> <FeatureHighlights />
<h1 className="text-5xl font-bold">🍺 The Biergarten App</h1> <PartnerBreweries breweries={recentBreweries} />
<p className="text-lg text-base-content/70">Authentication Demo</p> <ThemeTryOut />
<ClosingCta />
{username ? ( <LandingFooter isAuthenticated={isAuthenticated} />
<> </main>
<p className="text-base-content/80">
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">
Dashboard
</Link>
<Link to="/logout" className="btn btn-ghost">
Logout
</Link>
</div>
</>
) : (
<div className="flex gap-3 justify-center">
<Link to="/login" className="btn btn-primary">
Login
</Link>
<Link to="/register" className="btn btn-outline">
Register
</Link>
</div>
)}
</div>
</div>
</div>
); );
}; };

View File

@@ -0,0 +1,3 @@
// see HOME_HANDOFF.md — the beers API does not exist yet, so the "{n} beers"
// badge on the partner brewery cards reads from this list by card position.
export const FILLER_BEER_COUNTS = [14, 9, 11];

View File

@@ -31,7 +31,7 @@ const TextTokenSample = ({
}) => { }) => {
return ( return (
<div className="rounded-box p-3" style={{ backgroundColor: `var(${background})` }}> <div className="rounded-box p-3" style={{ backgroundColor: `var(${background})` }}>
<p className="text-xs font-semibold uppercase tracking-wide text-base-content/50"> <p className="text-xs font-semibold uppercase tracking-wide text-base-content/70">
{label} {label}
</p> </p>
<p className="mt-1 text-sm font-medium" style={{ color: `var(${text})` }}> <p className="mt-1 text-sm font-medium" style={{ color: `var(${text})` }}>
@@ -54,7 +54,7 @@ const ThemePanel = ({ label, value, vibe }: { label: string; value: string; vibe
</div> </div>
<div> <div>
<p className="mb-1.5 text-xs font-semibold uppercase tracking-wide text-base-content/50"> <p className="mb-1.5 text-xs font-semibold uppercase tracking-wide text-base-content/70">
Core Core
</p> </p>
<div className="grid gap-2 sm:grid-cols-2"> <div className="grid gap-2 sm:grid-cols-2">
@@ -69,7 +69,7 @@ const ThemePanel = ({ label, value, vibe }: { label: string; value: string; vibe
</div> </div>
<div> <div>
<p className="mb-1.5 text-xs font-semibold uppercase tracking-wide text-base-content/50"> <p className="mb-1.5 text-xs font-semibold uppercase tracking-wide text-base-content/70">
Status Status
</p> </p>
<div className="grid gap-2 grid-cols-2 sm:grid-cols-4"> <div className="grid gap-2 grid-cols-2 sm:grid-cols-4">
@@ -81,7 +81,7 @@ const ThemePanel = ({ label, value, vibe }: { label: string; value: string; vibe
</div> </div>
<div> <div>
<p className="mb-1.5 text-xs font-semibold uppercase tracking-wide text-base-content/50"> <p className="mb-1.5 text-xs font-semibold uppercase tracking-wide text-base-content/70">
Content Content
</p> </p>
<div className="grid gap-2 sm:grid-cols-3"> <div className="grid gap-2 sm:grid-cols-3">

View File

@@ -0,0 +1,167 @@
import type { Meta, StoryObj } from '@storybook/react-vite';
import { useMemo } from 'react';
import { createMemoryRouter, RouterProvider } from 'react-router';
import { expect, fn, userEvent, within } from 'storybook/test';
import { biergartenThemes, defaultThemeName, themeCookieName, type ThemeName } from '../themes';
import ThemeSegmentedControl from './ThemeSegmentedControl';
const themeSegmentedControlDescription = `The shared theme picker, used by the theme guide and by the landing page's try-out band. Each option pairs a gradient swatch of the theme's palette with its name and \`shortVibe\` mood line, and selection is carried by both color and elevation. Picking an option sets \`data-theme\` on \`<html>\` and writes the \`${themeCookieName}\` cookie, so the choice survives the next request and the server renders the same theme. The initial selection comes from the root route's loader, so these stories run behind a memory data router whose \`root\` route supplies the theme the cookie would have provided.`;
interface HarnessProps {
labels?: 'full' | 'short';
className?: string;
onChange?: (theme: ThemeName) => void;
/** Theme the root loader hands the control, standing in for the theme cookie. */
seedTheme?: ThemeName;
}
const ThemeSegmentedControlHarness = ({
labels,
className,
onChange,
seedTheme = defaultThemeName,
}: HarnessProps) => {
// Rebuilt per arg change so the docs controls remount the control rather
// than leaving it seeded from the previous render.
const router = useMemo(
() =>
createMemoryRouter([
{
id: 'root',
path: '/',
loader: () => ({ theme: seedTheme }),
element: (
<div className="max-w-md rounded-box bg-base-100 p-4 text-base-content">
<ThemeSegmentedControl
labels={labels}
className={className}
onChange={onChange}
/>
</div>
),
},
]),
[labels, className, onChange, seedTheme],
);
return <RouterProvider router={router} />;
};
const meta = {
title: 'Themes/ThemeSegmentedControl',
component: ThemeSegmentedControlHarness,
tags: ['autodocs'],
args: {
labels: 'full',
seedTheme: defaultThemeName,
onChange: fn(),
},
argTypes: {
labels: { control: 'inline-radio', options: ['full', 'short'] },
seedTheme: {
control: 'select',
options: biergartenThemes.map((theme) => theme.value),
},
},
parameters: {
usesDataRouter: true,
docs: {
description: {
component: themeSegmentedControlDescription,
},
},
},
} satisfies Meta<typeof ThemeSegmentedControlHarness>;
export default meta;
type Story = StoryObj<typeof meta>;
const getOptions = (canvasElement: HTMLElement) => {
const group = within(canvasElement).getByRole('radiogroup', { name: 'Theme selector' });
return { group, radios: within(group).getAllByRole('radio') as HTMLInputElement[] };
};
/** Full labels, as the theme guide renders it. */
export const Default: Story = {
play: async ({ canvasElement }) => {
const { group, radios } = getOptions(canvasElement);
await expect(radios).toHaveLength(biergartenThemes.length);
for (const theme of biergartenThemes) {
await expect(within(group).getByText(theme.label)).toBeVisible();
await expect(within(group).getByText(theme.shortVibe)).toBeVisible();
}
const [lager] = radios;
await expect(lager.value).toBe(defaultThemeName);
await expect(lager.checked).toBe(true);
},
};
/** Short labels, as the landing page renders it in the narrower try-out card. */
export const ShortLabels: Story = {
args: {
labels: 'short',
},
play: async ({ canvasElement }) => {
const { group } = getOptions(canvasElement);
for (const theme of biergartenThemes) {
await expect(within(group).getByText(theme.shortLabel)).toBeVisible();
await expect(within(group).getByText(theme.shortVibe)).toBeVisible();
}
await expect(within(group).queryByText(biergartenThemes[0].label)).toBeNull();
},
};
/** A returning visitor whose cookie already names a theme other than the default. */
export const SeededFromCookie: Story = {
args: {
seedTheme: 'biergarten-cassis',
},
play: async ({ canvasElement }) => {
const { radios } = getOptions(canvasElement);
for (const radio of radios) {
await expect(radio.checked).toBe(radio.value === 'biergarten-cassis');
}
},
};
export const SelectingATheme: Story = {
play: async ({ canvasElement, args }) => {
const previousTheme = document.documentElement.getAttribute('data-theme');
const { group, radios } = getOptions(canvasElement);
await userEvent.click(within(group).getByText('Biergarten Stout'));
for (const radio of radios) {
await expect(radio.checked).toBe(radio.value === 'biergarten-stout');
}
await expect(args.onChange).toHaveBeenCalledWith('biergarten-stout');
await expect(document.documentElement.getAttribute('data-theme')).toBe('biergarten-stout');
await expect(document.cookie).toContain(`${themeCookieName}=biergarten-stout`);
// The control themes the whole document, so hand <html> back to the
// toolbar's theme before the next story mounts.
if (previousTheme === null) {
document.documentElement.removeAttribute('data-theme');
} else {
document.documentElement.setAttribute('data-theme', previousTheme);
}
},
};
/** Single column, for a sidebar or any container too narrow for the paired grid. */
export const SingleColumn: Story = {
args: {
className: 'grid grid-cols-1 gap-2',
},
play: async ({ canvasElement }) => {
const { radios } = getOptions(canvasElement);
await expect(radios).toHaveLength(biergartenThemes.length);
},
};

View File

@@ -0,0 +1,89 @@
import { useState } from 'react';
import { useRouteLoaderData } from 'react-router';
import type { loader as rootLoader } from '../../../root';
import { biergartenThemes, defaultThemeName, themeCookieName, type ThemeName } from '../themes';
// The semantic aliases resolve at :root, so the attribute has to land on <html>
// rather than a nested element for the whole document to switch.
const applyTheme = (theme: ThemeName) => {
document.documentElement.setAttribute('data-theme', theme);
document.cookie = `${themeCookieName}=${theme}; path=/; max-age=${60 * 60 * 24 * 365}; SameSite=Lax`;
};
interface ThemeSegmentedControlProps {
/** `short` renders "Lager"; `full` renders "Biergarten Lager". */
labels?: 'full' | 'short';
className?: string;
onChange?: (theme: ThemeName) => void;
}
const ThemeSegmentedControl = ({
labels = 'full',
className = 'grid grid-cols-2 gap-2',
onChange,
}: ThemeSegmentedControlProps) => {
const rootTheme = useRouteLoaderData<typeof rootLoader>('root')?.theme ?? defaultThemeName;
const [selectedTheme, setSelectedTheme] = useState<ThemeName>(rootTheme);
return (
<div className={className} role="radiogroup" aria-label="Theme selector">
{biergartenThemes.map((theme) => {
const checked = selectedTheme === theme.value;
return (
<label
key={theme.value}
className={`group flex min-h-20 cursor-pointer items-center gap-3 rounded-box border p-3 text-left transition-all duration-200 ${
checked
? 'border-primary bg-primary text-primary-content shadow-md'
: 'border-base-content/15 bg-base-200/45 hover:-translate-y-0.5 hover:border-primary/50 hover:bg-base-200'
}`}
>
<input
type="radio"
name="theme"
value={theme.value}
className="sr-only"
checked={checked}
onChange={() => {
setSelectedTheme(theme.value);
applyTheme(theme.value);
onChange?.(theme.value);
}}
/>
<span
aria-hidden="true"
className={`size-9 shrink-0 rounded-full border-4 shadow-inner transition-transform duration-200 group-hover:scale-105 ${
checked ? 'border-primary-content/70' : 'border-base-100'
}`}
style={{
background:
theme.value === 'biergarten-lager'
? 'linear-gradient(135deg, #f5c451 0%, #a96728 100%)'
: theme.value === 'biergarten-stout'
? 'linear-gradient(135deg, #d69b45 0%, #382116 100%)'
: theme.value === 'biergarten-cassis'
? 'linear-gradient(135deg, #c777b9 0%, #4c214e 100%)'
: 'linear-gradient(135deg, #f7e6a5 0%, #82a85d 100%)',
}}
/>
<span className="min-w-0">
<span className="block truncate text-sm font-bold">
{labels === 'short' ? theme.shortLabel : theme.label}
</span>
<span
className={`mt-0.5 block truncate text-xs ${
checked ? 'text-primary-content/75' : 'text-base-content/60'
}`}
>
{theme.shortVibe}
</span>
</span>
</label>
);
})}
</div>
);
};
export default ThemeSegmentedControl;

View File

@@ -1,12 +1,8 @@
import { useState } from 'react'; import { useState } from 'react';
import { useRouteLoaderData } from 'react-router'; import { useRouteLoaderData } from 'react-router';
import type { loader as rootLoader } from '../../../root'; import type { loader as rootLoader } from '../../../root';
import { biergartenThemes, defaultThemeName, themeCookieName, type ThemeName } from '../themes'; import { biergartenThemes, defaultThemeName, type ThemeName } from '../themes';
import ThemeSegmentedControl from './ThemeSegmentedControl';
const applyTheme = (theme: ThemeName) => {
document.documentElement.setAttribute('data-theme', theme);
document.cookie = `${themeCookieName}=${theme}; path=/; max-age=${60 * 60 * 24 * 365}; SameSite=Lax`;
};
const ThemeSwitcher = () => { const ThemeSwitcher = () => {
const rootTheme = useRouteLoaderData<typeof rootLoader>('root')?.theme ?? defaultThemeName; const rootTheme = useRouteLoaderData<typeof rootLoader>('root')?.theme ?? defaultThemeName;
@@ -39,35 +35,7 @@ const ThemeSwitcher = () => {
<h2 className="card-title text-2xl">Theme switcher</h2> <h2 className="card-title text-2xl">Theme switcher</h2>
<p className="text-base-content/70">Pick a theme and preview it immediately.</p> <p className="text-base-content/70">Pick a theme and preview it immediately.</p>
<div <ThemeSegmentedControl onChange={setSelectedTheme} />
className="join join-vertical sm:join-horizontal"
role="radiogroup"
aria-label="Theme selector"
>
{biergartenThemes.map((theme) => {
const checked = selectedTheme === theme.value;
return (
<label
key={theme.value}
className={`btn join-item ${checked ? 'btn-primary' : 'btn-outline'}`}
>
<input
type="radio"
name="theme"
value={theme.value}
className="sr-only"
checked={checked}
onChange={() => {
setSelectedTheme(theme.value);
applyTheme(theme.value);
}}
/>
{theme.label}
</label>
);
})}
</div>
</div> </div>
</section> </section>
</> </>

View File

@@ -4,6 +4,10 @@ export type ThemeName =
export interface ThemeOption { export interface ThemeOption {
value: ThemeName; value: ThemeName;
label: string; label: string;
/** Used where the segmented control is narrow, such as the landing page. */
shortLabel: string;
/** A compact mood descriptor for theme pickers. */
shortVibe: string;
vibe: string; vibe: string;
} }
@@ -14,21 +18,29 @@ export const biergartenThemes: ThemeOption[] = [
{ {
value: 'biergarten-lager', value: 'biergarten-lager',
label: 'Biergarten Lager', label: 'Biergarten Lager',
shortLabel: 'Lager',
shortVibe: 'Muted parchment',
vibe: 'Muted parchment, mellow amber, daytime beer garden', vibe: 'Muted parchment, mellow amber, daytime beer garden',
}, },
{ {
value: 'biergarten-stout', value: 'biergarten-stout',
label: 'Biergarten Stout', label: 'Biergarten Stout',
shortLabel: 'Stout',
shortVibe: 'Charred barrel',
vibe: 'Charred barrel, deep roast, cozy evening cellar', vibe: 'Charred barrel, deep roast, cozy evening cellar',
}, },
{ {
value: 'biergarten-cassis', value: 'biergarten-cassis',
label: 'Biergarten Cassis', label: 'Biergarten Cassis',
shortLabel: 'Cassis',
shortVibe: 'Blackberry barrel',
vibe: 'Blackberry barrel, sour berry dark, vivid night market', vibe: 'Blackberry barrel, sour berry dark, vivid night market',
}, },
{ {
value: 'biergarten-weizen', value: 'biergarten-weizen',
label: 'Biergarten Weizen', label: 'Biergarten Weizen',
shortLabel: 'Weizen',
shortVibe: 'Bright spring',
vibe: 'Ultra-light young barley, green undertone, bright spring afternoon', vibe: 'Ultra-light young barley, green undertone, bright spring afternoon',
}, },
]; ];

View File

@@ -1,7 +1,7 @@
const EmptyState = ({ message }: { message: string }) => ( const EmptyState = ({ message }: { message: string }) => (
<div className="card bg-base-100 shadow"> <div className="card bg-base-100 shadow">
<div className="card-body items-center py-12"> <div className="card-body items-center py-12">
<p className="text-sm text-base-content/60 text-center m-0">{message}</p> <p className="text-sm text-base-content/70 text-center m-0">{message}</p>
</div> </div>
</div> </div>
); );

View File

@@ -33,7 +33,7 @@ const ProfileSidebarCard = ({
<div className="card-body gap-4 p-6"> <div className="card-body gap-4 p-6">
<div> <div>
<h1 className="text-2xl font-bold m-0 leading-tight">{displayName}</h1> <h1 className="text-2xl font-bold m-0 leading-tight">{displayName}</h1>
<p className="text-sm text-base-content/60 m-0 mt-0.5">@{username}</p> <p className="text-sm text-base-content/70 m-0 mt-0.5">@{username}</p>
</div> </div>
{isOwnProfile ? ( {isOwnProfile ? (
@@ -52,7 +52,7 @@ const ProfileSidebarCard = ({
<p className="text-sm leading-normal m-0">{bio}</p> <p className="text-sm leading-normal m-0">{bio}</p>
<div className="flex flex-col gap-1.5 text-sm text-base-content/60"> <div className="flex flex-col gap-1.5 text-sm text-base-content/70">
<div className="flex items-center gap-1.5"> <div className="flex items-center gap-1.5">
<MapPin className="size-4 shrink-0" aria-hidden="true" /> <MapPin className="size-4 shrink-0" aria-hidden="true" />
{location} {location}
@@ -68,7 +68,7 @@ const ProfileSidebarCard = ({
<div className="flex flex-col gap-2"> <div className="flex flex-col gap-2">
{stats.map((stat) => ( {stats.map((stat) => (
<div key={stat.label} className="flex items-center justify-between gap-2"> <div key={stat.label} className="flex items-center justify-between gap-2">
<span className="text-sm text-base-content/60">{stat.label}</span> <span className="text-sm text-base-content/70">{stat.label}</span>
<span className="font-serif text-lg font-bold tabular-nums"> <span className="font-serif text-lg font-bold tabular-nums">
{stat.value} {stat.value}
</span> </span>

View File

@@ -24,7 +24,7 @@ const ProfileTabs = ({ activeTab, onChange, panels }: ProfileTabsProps) => {
{TABS.map((tab) => ( {TABS.map((tab) => (
<Tab <Tab
key={tab.id} key={tab.id}
className="-mb-px border-b-2 border-transparent py-3 text-sm font-semibold text-base-content/60 transition-colors hover:text-base-content focus:outline-none data-[focus]:outline-2 data-[focus]:outline-offset-2 data-[focus]:outline-primary data-[selected]:border-primary data-[selected]:text-primary" className="-mb-px border-b-2 border-transparent py-3 text-sm font-semibold text-base-content/70 transition-colors hover:text-base-content focus:outline-none data-[focus]:outline-2 data-[focus]:outline-offset-2 data-[focus]:outline-primary data-[selected]:border-primary data-[selected]:text-primary"
> >
{tab.label} {tab.label}
</Tab> </Tab>

View File

@@ -36,11 +36,11 @@ const ActivityTab = ({ activity }: ActivityTabProps) => {
</div> </div>
)} )}
{item.comment && ( {item.comment && (
<p className="text-sm text-base-content/60 italic mt-1.5 mb-0"> <p className="text-sm text-base-content/70 italic mt-1.5 mb-0">
&ldquo;{item.comment}&rdquo; &ldquo;{item.comment}&rdquo;
</p> </p>
)} )}
<p className="text-xs text-base-content/60 mt-1.5 mb-0"> <p className="text-xs text-base-content/70 mt-1.5 mb-0">
{item.time} {item.time}
</p> </p>
</div> </div>

View File

@@ -42,7 +42,7 @@ const FollowingTab = ({ following, onToggleFollow }: FollowingTabProps) => {
) : ( ) : (
<p className="font-semibold text-sm m-0 truncate">{f.name}</p> <p className="font-semibold text-sm m-0 truncate">{f.name}</p>
)} )}
<p className="text-xs text-base-content/60 m-0 truncate">{f.meta}</p> <p className="text-xs text-base-content/70 m-0 truncate">{f.meta}</p>
</div> </div>
<button <button
type="button" type="button"

View File

@@ -18,7 +18,7 @@ const LikedTab = ({ liked }: LikedTabProps) => {
<div className="h-[120px] bg-base-300" /> <div className="h-[120px] bg-base-300" />
<div className="card-body p-4 gap-1"> <div className="card-body p-4 gap-1">
<p className="font-serif font-bold m-0">{item.name}</p> <p className="font-serif font-bold m-0">{item.name}</p>
<p className="text-sm text-base-content/60 m-0">{item.meta}</p> <p className="text-sm text-base-content/70 m-0">{item.meta}</p>
<div className="mt-1"> <div className="mt-1">
<StarRating value={item.rating} size="xs" /> <StarRating value={item.rating} size="xs" />
</div> </div>

View File

@@ -75,7 +75,7 @@ const ProfileContent = ({ profile, isOwnProfile }: ProfileContentProps) => {
return ( return (
<div className="min-h-screen bg-base-200 pb-16"> <div className="min-h-screen bg-base-200 pb-16">
<div className="max-w-[1080px] mx-auto px-6 pt-8"> <div className="mx-auto max-w-7xl px-5 pt-10">
<div className="rounded-box h-[190px] bg-base-300" /> <div className="rounded-box h-[190px] bg-base-300" />
<div className="grid grid-cols-1 lg:grid-cols-[300px_1fr] gap-8 items-start -mt-12"> <div className="grid grid-cols-1 lg:grid-cols-[300px_1fr] gap-8 items-start -mt-12">

View File

@@ -13,9 +13,15 @@ import './app.css';
import Navbar from './components/ui/navbar/Navbar'; import Navbar from './components/ui/navbar/Navbar';
import ToastProvider from './components/ui/toast/ToastProvider'; import ToastProvider from './components/ui/toast/ToastProvider';
import { getOptionalAuth } from './features/auth/auth.server'; import { getOptionalAuth } from './features/auth/auth.server';
import AiDisclosureDialog from './features/home/components/AiDisclosureDialog';
import { defaultThemeName, parseThemeCookie } from './features/theme/themes'; import { defaultThemeName, parseThemeCookie } from './features/theme/themes';
export const links: Route.LinksFunction = () => [ export const links: Route.LinksFunction = () => [
{ rel: 'icon', href: '/favicon.ico', sizes: 'any' },
{ rel: 'icon', type: 'image/png', sizes: '32x32', href: '/favicon-32x32.png' },
{ rel: 'icon', type: 'image/png', sizes: '16x16', href: '/favicon-16x16.png' },
{ rel: 'apple-touch-icon', sizes: '180x180', href: '/apple-touch-icon.png' },
{ rel: 'manifest', href: '/site.webmanifest' },
{ rel: 'preconnect', href: 'https://fonts.googleapis.com' }, { rel: 'preconnect', href: 'https://fonts.googleapis.com' },
{ {
rel: 'preconnect', rel: 'preconnect',
@@ -60,6 +66,7 @@ const App = ({ loaderData }: Route.ComponentProps) => {
<> <>
<Navbar auth={auth} /> <Navbar auth={auth} />
<ToastProvider /> <ToastProvider />
<AiDisclosureDialog />
<Outlet /> <Outlet />
</> </>
); );
@@ -84,7 +91,7 @@ export const ErrorBoundary = ({ error }: Route.ErrorBoundaryProps) => {
} }
return ( return (
<main className="pt-16 p-4 container mx-auto"> <main className="mx-auto max-w-7xl px-5 pt-10">
<h1>{message}</h1> <h1>{message}</h1>
<p>{details}</p> <p>{details}</p>
{stack && ( {stack && (

View File

@@ -3948,9 +3948,9 @@
} }
}, },
"node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
"version": "5.0.9", "version": "5.0.12",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
"integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==", "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@@ -5103,9 +5103,9 @@
} }
}, },
"node_modules/brace-expansion": { "node_modules/brace-expansion": {
"version": "1.1.18", "version": "1.1.21",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz",
"integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==", "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@@ -6775,9 +6775,9 @@
} }
}, },
"node_modules/glob/node_modules/brace-expansion": { "node_modules/glob/node_modules/brace-expansion": {
"version": "5.0.9", "version": "5.0.12",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.9.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
"integrity": "sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==", "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@@ -7655,9 +7655,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/js-yaml": { "node_modules/js-yaml": {
"version": "4.3.1", "version": "4.3.2",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.1.tgz", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz",
"integrity": "sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==", "integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@@ -8972,9 +8972,9 @@
} }
}, },
"node_modules/qs": { "node_modules/qs": {
"version": "6.15.3", "version": "6.16.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz", "resolved": "https://registry.npmjs.org/qs/-/qs-6.16.0.tgz",
"integrity": "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==", "integrity": "sha512-h6fhOIaRrID2CbEY2fqs+7t+UXZo+MLAnU5gRIq85uFtdiUPCdsApMlHhXogKVM4HM2DVbIjGNTTYH2OcmP1vA==",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"dependencies": { "dependencies": {
"es-define-property": "^1.0.1", "es-define-property": "^1.0.1",

View File

@@ -6,6 +6,12 @@ const app = express();
app.use('/assets', express.static('build/client/assets', { immutable: true, maxAge: '1y' })); app.use('/assets', express.static('build/client/assets', { immutable: true, maxAge: '1y' }));
app.use(express.static('build/client', { maxAge: '1h' })); app.use(express.static('build/client', { maxAge: '1h' }));
// Answers from Express alone so the container health check reports on this
// process only, independent of whether the API is reachable yet.
app.get('/healthz', (_req, res) => {
res.status(200).type('text/plain').send('ok');
});
const requestHandler = createRequestHandler({ const requestHandler = createRequestHandler({
build: () => import('./build/server/index.js'), build: () => import('./build/server/index.js'),
}); });