- {inner}
-
- );
- }
-
- return (
-
- {inner}
-
- );
-};
-
-export default Logo;
diff --git a/frontend/src/components/ProductGallery.tsx b/frontend/src/components/ProductGallery.tsx
deleted file mode 100644
index 95016ad..0000000
--- a/frontend/src/components/ProductGallery.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-import { useRef, useState } from 'react';
-
-interface ProductGalleryProps {
- images: string[];
- alt: string;
-}
-
-const Chevron = ({ direction }: { direction: 'left' | 'right' }) => (
-
-);
-
-/**
- * The square photo on a product card, with arrows and dots when there's more than one shot.
- *
- * Replaces react-awesome-slider, which hasn't been published since 2020 and pins peer deps to
- * React 16 — the same job in a fraction of the code, and one less unmaintained dependency in a
- * build we gate on CVEs. Behaviour is what the old cards did: one image at a time, square crop,
- * arrows only when they'd do something.
- */
-/** Past this many pixels a horizontal drag counts as a swipe rather than a tap or a page scroll. */
-const SWIPE_THRESHOLD = 40;
-
-const ProductGallery: React.FC {
- if (e.key === 'ArrowLeft') { e.preventDefault(); step(-1); }
- if (e.key === 'ArrowRight') { e.preventDefault(); step(1); }
- } : undefined}
- tabIndex={many ? 0 : undefined}
- role={many ? 'group' : undefined}
- aria-roledescription={many ? 'carousel' : undefined}
- aria-label={many ? `${alt} — ${images.length} photos` : undefined}
- >
- {images.map((src, i) => (
- 
- ))}
-
- {many && (
- <>
-
-
-
- {/* Dots: how many photos there are, and which one you're on. */}
-
- );
-};
-
-export default ProductGallery;
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 8994160..40693f5 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -1,85 +1,13 @@
+/*
+ * The admin screen's stylesheet.
+ *
+ * The brand itself lives in ./tokens.css, shared with the server-rendered
+ * site's stylesheet — one palette, one set of fonts, and no drift between the shop front and the
+ * screen that edits it. Everything else the admin needs comes from utility classes in the React
+ * source, which Tailwind finds by scanning it.
+ *
+ * The fonts are served by Spring from /fonts rather than bundled here, so both stylesheets can name
+ * the same URL.
+ */
@import "tailwindcss";
-
-/* Brand fonts ship with the app rather than coming from Google — same look, no third-party request
- on every page load. Raleway is the variable latin subset. */
-@font-face {
- font-family: 'Raleway';
- src: url('./fonts/raleway-latin.woff2') format('woff2');
- font-weight: 100 900;
- font-style: normal;
- font-display: swap;
-}
-@font-face {
- font-family: 'AdBhashitha';
- src: url('./fonts/AdBhashitha.woff') format('woff');
- font-display: swap;
-}
-@font-face {
- font-family: 'LeJour Script';
- src: url('./fonts/LeJour-Script.woff') format('woff');
- font-display: swap;
-}
-
-@theme {
- /* Sage & Cream. 500 is the signature sage; 600+ are the darker tones that white text can actually
- sit on (500 on white is only 3.6:1 — too low). */
- --color-bakery-50: #faf7f0;
- --color-bakery-100: #f0efe3;
- --color-bakery-200: #dde0cc;
- --color-bakery-300: #c3cbae;
- --color-bakery-400: #a2ae8b;
- --color-bakery-500: #7c8b6b;
- --color-bakery-600: #5f6f52;
- --color-bakery-700: #4a5740;
- --color-bakery-800: #37412f;
- --color-bakery-900: #232b1e;
-
- --font-sans: 'Raleway', ui-sans-serif, system-ui, sans-serif;
- --font-adbhashitha: 'AdBhashitha', ui-serif, Georgia, serif;
- --font-lejour: 'LeJour Script', ui-serif, Georgia, cursive;
-}
-
-html {
- scroll-behavior: smooth;
- /* Nothing on this site is meant to scroll sideways. */
- overflow-x: hidden;
-}
-
-body {
- background-color: var(--color-bakery-50);
- color: var(--color-bakery-900);
- font-family: var(--font-sans);
- overflow-x: hidden;
- opacity: 0;
- animation: fadeIn 0.5s ease-in forwards;
-}
-
-@media (prefers-reduced-motion: reduce) {
- html { scroll-behavior: auto; }
- body { animation: none; opacity: 1; }
-}
-
-@keyframes fadeIn {
- from {
- opacity: 0;
- transform: translateY(10px);
- }
- to {
- opacity: 1;
- transform: translateY(0);
- }
-}
-
-/* In @layer components, matching the old site. That ordering matters: a utility like `px-4` — which
- the markup applies alongside `container` on nearly every section — has to win over this, or every
- gutter on the site silently widens. */
-@layer components {
- .container {
- @apply max-w-7xl mx-auto px-4 sm:px-6 lg:px-8;
- }
-}
-
-::selection {
- background-color: var(--color-bakery-300);
- color: var(--color-bakery-900);
-}
+@import "./tokens.css";
diff --git a/frontend/src/lib/assets.ts b/frontend/src/lib/assets.ts
deleted file mode 100644
index 6e6ba6f..0000000
--- a/frontend/src/lib/assets.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Photos live in the public MinIO bucket, not in the app image — 50 MB of JPEGs has no business
- * inside a container we redeploy on every commit, and the bucket serves them with a year-long
- * cache. Small brand assets (logo marks, favicons) stay local so first paint needs nothing external.
- */
-const BASE = (import.meta.env.VITE_ASSET_BASE ?? 'https://s3.thebennett.net/itsthevine').replace(/\/$/, '');
-
-/**
- * `photo('products/scones.webp')` -> absolute bucket URL.
- *
- * Segments are encoded individually: some gallery files have spaces in their names ("Cinnamon
- * Rolls.webp") and a raw space in a URL doesn't fetch.
- */
-export function photo(key: string): string {
- const path = key.replace(/^\//, '').split('/').map(encodeURIComponent).join('/');
- return `${BASE}/images/${path}`;
-}
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
index e2d123a..a74ce78 100644
--- a/frontend/src/main.tsx
+++ b/frontend/src/main.tsx
@@ -1,13 +1,11 @@
import { StrictMode } from 'react';
import { createRoot } from 'react-dom/client';
-import { BrowserRouter } from 'react-router-dom';
import App from './App';
import './index.css';
+// No BrowserRouter: this shell is served at /admin and nowhere else, so there is nothing to route.
createRoot(document.getElementById('root')!).render(
- {images.map((src, i) => (
-
-
- )}
-
- {/* Page header */}
-
-
-
- {/* Contact Form Section */}
-
- );
-};
-
-export default ContactPage;
diff --git a/frontend/src/pages/History.tsx b/frontend/src/pages/History.tsx
deleted file mode 100644
index 48ee0ab..0000000
--- a/frontend/src/pages/History.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-
-const HistoryPage = () => {
- return (
- - Contact us -
-
-
-
-
- Get in touch
-- Or call us: (309) 701-0660 -
- -
- {/* Page header */}
-
-
-
- {/* Story */}
-
- );
-};
-
-export default HistoryPage;
diff --git a/frontend/src/pages/Home.tsx b/frontend/src/pages/Home.tsx
deleted file mode 100644
index 00c59db..0000000
--- a/frontend/src/pages/Home.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import { Link } from 'react-router-dom';
-import Logo from '@/components/Logo';
-import { photo } from '@/lib/assets';
-
-const HomePage = () => {
- return (
- - Our story -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- How it started
-- Morissa Bennett opened The Vine in 2024, at 215 E Main Street, in the middle of downtown - Princeville. The plan was not complicated. Bake it ourselves, sell it ourselves, and keep - enough tables that nobody feels rushed out the door. -
-What we make
-- We opened with coffee and pastries. The menu kept growing. Now there are cinnamon rolls - and caramel rolls, scones, cookie bars, macarons, brownies, and pies, plus sandwiches and - paninis once the lunch crowd shows up. -
-The cakes are the fun part
-- Cakes and decorated cookies are made to order, which means we mostly bake whatever - Princeville is celebrating that week. We have done a tractor, a cow, a 76th birthday, a - retirement, a wedding, and a cake for the class of 1964. We have iced sugar cookies for - the cross country team and for a bridal party. If you can describe it, we will have a go - at it. -
-Around town
-- We turn out for Christmas in the Village every year and for other civic events, and the - Princeville Civic Association counts us among the town's small businesses. Enjoy - Illinois and Discover Peoria have both pointed travelers our way. If you are one of them, - we open at 7:00am, Tuesday through Saturday. -
-
- {/* Hero — centred lockup on a sage wash. */}
-
- {/* Softened on purpose: the storefront's own painted sign sits right behind
- the logo, so a sharp photo makes you read the name twice. scale-110 hides
- the blur's feathered edges. */}
- })
- {/* Sage wash rather than a neutral black scrim — the tint is the identity. */}
-
-
-
- {/* w-full/min-w-0 keep this flex item from sizing to its max-content
- width and blowing out the page on narrow screens. */}
-
-
- {/* Our Specialties */}
-
-
-
- {/* About Us */}
-
-
-
- {/* Hours & Contact */}
-
-
-
- );
-};
-
-export default HomePage;
diff --git a/frontend/src/pages/NotFound.tsx b/frontend/src/pages/NotFound.tsx
deleted file mode 100644
index 607aa2d..0000000
--- a/frontend/src/pages/NotFound.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Link } from 'react-router-dom';
-
-const NotFoundPage = () => (
-
- {/* Sage wash rather than a neutral black scrim — the tint is the identity. */}
-
-
-
- {/* w-full/min-w-0 keep this flex item from sizing to its max-content
- width and blowing out the page on narrow screens. */}
-
-
-
-
- - A coffeehouse and bakery in downtown Princeville, Illinois. -
-
-
- See the menu
-
-
- Visit us
-
-
-
-
- What people come in for
-
- {['Cinnamon Rolls', 'Sugar Cookies', 'Cakes'].map((item) => (
-
-
-
- ))}
-
- })
-
-
- {item}
-
-
-
-
- Our story
-- Morissa Bennett opened The Vine in 2024. We bake in our own kitchen on Main Street: - cinnamon rolls, cookies, custom cakes, sandwiches, paninis, and coffee. -
- - Read our story - -
-
- Visit us
-
-
-
-
-
- Our hours
--
-
- - Tuesday – Friday - 7:00am – 2:00pm - -
- - Saturday - 7:00am – 12:00pm - -
- - Sunday – Monday - Closed - -
-
-);
-
-export default NotFoundPage;
diff --git a/frontend/src/pages/Products.tsx b/frontend/src/pages/Products.tsx
deleted file mode 100644
index e3346f5..0000000
--- a/frontend/src/pages/Products.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { useEffect, useState } from 'react';
-import { fetchCategories, fetchProducts, type Product } from '@/lib/api';
-import ProductGallery from '@/components/ProductGallery';
-
-const ProductsPage = () => {
- const [categories, setCategories] = useState
-
- - We could not find that page -
-- It may have moved. The menu, our story, and how to reach us are all still here. -
-
-
- Back home
-
-
- See the menu
-
-
-
- {/* Page header */}
-
-
-
- {/* Products Section */}
-
- );
-};
-
-export default ProductsPage;
diff --git a/frontend/src/tokens.css b/frontend/src/tokens.css
new file mode 100644
index 0000000..2940a4b
--- /dev/null
+++ b/frontend/src/tokens.css
@@ -0,0 +1,140 @@
+/*
+ * The brand: the sage-and-cream palette, the three fonts, and the base element rules.
+ *
+ * Shared deliberately. Two stylesheets are compiled from this — the server-rendered site
+ * (src/main/tailwind/site.css, scanning the Thymeleaf templates) and the admin SPA
+ * (frontend/src/index.css, scanning the React source) — and if the tokens were copied into both, the
+ * two halves of the same site would drift a shade apart the first time one of them was edited.
+ *
+ * Fonts are served by Spring from /fonts, not bundled by Vite, so both stylesheets can name the same
+ * URL and the browser caches one copy.
+ */
+
+@font-face {
+ font-family: 'Raleway';
+ src: url('/fonts/raleway-latin.woff2') format('woff2');
+ font-weight: 100 900;
+ font-style: normal;
+ font-display: swap;
+}
+@font-face {
+ font-family: 'AdBhashitha';
+ src: url('/fonts/AdBhashitha.woff') format('woff');
+ font-display: swap;
+}
+@font-face {
+ font-family: 'LeJour Script';
+ src: url('/fonts/LeJour-Script.woff') format('woff');
+ font-display: swap;
+}
+
+@theme {
+ /* Sage & Cream. 500 is the signature sage; 600+ are the darker tones that white text can actually
+ sit on (500 on white is only 3.6:1 — too low). */
+ --color-bakery-50: #faf7f0;
+ --color-bakery-100: #f0efe3;
+ --color-bakery-200: #dde0cc;
+ --color-bakery-300: #c3cbae;
+ --color-bakery-400: #a2ae8b;
+ --color-bakery-500: #7c8b6b;
+ --color-bakery-600: #5f6f52;
+ --color-bakery-700: #4a5740;
+ --color-bakery-800: #37412f;
+ --color-bakery-900: #232b1e;
+
+ --font-sans: 'Raleway', ui-sans-serif, system-ui, sans-serif;
+ --font-adbhashitha: 'AdBhashitha', ui-serif, Georgia, serif;
+ --font-lejour: 'LeJour Script', ui-serif, Georgia, cursive;
+}
+
+html {
+ scroll-behavior: smooth;
+ /* Nothing on this site is meant to scroll sideways. */
+ overflow-x: hidden;
+}
+
+body {
+ background-color: var(--color-bakery-50);
+ color: var(--color-bakery-900);
+ font-family: var(--font-sans);
+ overflow-x: hidden;
+ opacity: 0;
+ animation: fadeIn 0.5s ease-in forwards;
+}
+
+@media (prefers-reduced-motion: reduce) {
+ html { scroll-behavior: auto; }
+ body { animation: none; opacity: 1; }
+}
+
+@keyframes fadeIn {
+ from {
+ opacity: 0;
+ transform: translateY(10px);
+ }
+ to {
+ opacity: 1;
+ transform: translateY(0);
+ }
+}
+
+/* In @layer components, matching the old site. That ordering matters: a utility like `px-4` — which
+ the markup applies alongside `container` on nearly every section — has to win over this, or every
+ gutter on the site silently widens. */
+@layer components {
+ .container {
+ @apply max-w-7xl mx-auto px-4 sm:px-6 lg:px-8;
+ }
+
+ /*
+ * The two branch marks of the wordmark, as masks rather than inline SVG.
+ *
+ * They have to take their colour from the surrounding text — sage in the header, cream on the hero
+ * and in the footer — which an - Our products -
-
- {/* Categories */}
-
-
- {categories.map((category) => (
-
- ))}
-
-
- {failed && (
- - We could not load the menu just now. Please refresh, or call us on{' '} - (309) 701-0660. -
- )} - - {/* Products Grid — deliberately unanimated. Filtering used to run a `layout` reflow plus - an enter/exit fade on every card, which on a 40-card grid reads as the page lurching - rather than responding. Swapping the list outright is instant, and the only motion - left is the shadow on hover. */} -
- {products.map((product) => (
-
-
- {/* Image Container */}
-
- ))}
-
-
-
- {/* Content */}
-
-
- - {product.name} -
- - {product.category} - -; its default disclosure triangle would sit next to the hamburger. */
+summary {
+ list-style: none;
+}
+summary::-webkit-details-marker {
+ display: none;
+}
+
+::selection {
+ background-color: var(--color-bakery-300);
+ color: var(--color-bakery-900);
+}
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index c52f554..43ed851 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -5,7 +5,7 @@
"module": "ESNext",
"moduleResolution": "bundler",
"jsx": "react-jsx",
- "types": ["vite/client", "vite-plugin-svgr/client", "node"],
+ "types": ["vite/client", "node"],
"strict": true,
"skipLibCheck": true,
"noEmit": true,
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index d081fd7..0d7c301 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -1,26 +1,31 @@
import { defineConfig } from 'vite';
import react from '@vitejs/plugin-react';
import tailwindcss from '@tailwindcss/vite';
-import svgr from 'vite-plugin-svgr';
import path from 'node:path';
+/**
+ * Builds the admin screen, and only that. The public site is server-rendered by Spring and never comes
+ * through here — its stylesheet is compiled from the Thymeleaf templates by the Tailwind CLI
+ * (`npm run build:css`).
+ *
+ * vite-plugin-svgr went with the public pages: the logo marks were inlined through it so they could
+ * take their colour from the surrounding text, and the server-rendered header does that with a CSS
+ * mask instead.
+ */
export default defineConfig({
- // svgr keeps the `import Logo from './x.svg?react'` style the old @svgr/webpack setup used, so the
- // logo marks stay inline SVG and inherit currentColor.
- plugins: [react(), tailwindcss(), svgr()],
+ plugins: [react(), tailwindcss()],
resolve: {
alias: { '@': path.resolve(__dirname, './src') },
},
server: {
port: 2024,
- // Backend on :8080 during development; the built SPA is served by Spring, same origin.
+ // Backend on :8080 during development; the built admin is served by Spring, same origin.
proxy: {
'/api': 'http://localhost:8080',
},
},
build: {
outDir: 'dist',
- // The photos live in MinIO, so what's left is small — a warning here would mean a real regression.
chunkSizeWarningLimit: 600,
},
});
diff --git a/pom.xml b/pom.xml
index 3b2f49b..14e7ccd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,13 @@
net.thebennett.platform
platform-starter-data
+
+
+ org.springframework.boot
+ spring-boot-starter-thymeleaf
+
net.thebennett.platform
platform-starter-contact
@@ -117,10 +124,28 @@
org.springframework.boot
spring-boot-maven-plugin
-
+
com.github.eirslett
frontend-maven-plugin
+
+
+
+ npm-build-css
+ process-classes
+ npm run build:css
+
org.apache.maven.plugins
diff --git a/src/main/java/com/itsthevine/web/ContactController.java b/src/main/java/com/itsthevine/web/ContactController.java
index b13095e..c679c77 100644
--- a/src/main/java/com/itsthevine/web/ContactController.java
+++ b/src/main/java/com/itsthevine/web/ContactController.java
@@ -4,31 +4,28 @@ import java.util.Map;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.itsthevine.web.domain.ContactEnquiry;
-import com.itsthevine.web.domain.ContactEnquiryRepository;
-
import net.thebennett.platform.contact.ContactException;
-import net.thebennett.platform.contact.ContactService;
-import net.thebennett.platform.contact.Enquiry;
/**
- * The contact form. Keeps the response shape the old Next route used ({@code {ok:true}} /
+ * The contact form as JSON. Keeps the response shape the old Next route used ({@code {ok:true}} /
* {@code {error:"..."}}), because the error text is shown to the visitor as-is.
+ *
+ *
The page's own form posts to {@code /contact} and renders a page rather than reading this. Both
+ * go through {@link Enquiries}, so there is one order of operations for taking an enquiry.
*/
@RestController
@RequestMapping("/api/contact")
public class ContactController {
- private final ContactService contact;
- private final ContactEnquiryRepository enquiries;
+ private final Enquiries enquiries;
- public ContactController(ContactService contact, ContactEnquiryRepository enquiries) {
- this.contact = contact;
+ public ContactController(Enquiries enquiries) {
this.enquiries = enquiries;
}
@@ -36,18 +33,7 @@ public class ContactController {
@PostMapping
public ResponseEntity The order matters and is the reason this is a service rather than three lines in a controller.
+ * Validation first, so junk never reaches the table; the enquiry is recorded BEFORE delivery is
+ * attempted, so a relay outage costs a notification rather than somebody's order; and
+ * {@code delivered} is only set once the relay has actually taken it, which is what makes the
+ * undelivered ones findable later.
+ *
+ * Two things submit enquiries — the page's own form and {@code /api/contact} — and they must not
+ * drift into two different orderings of those steps.
+ */
+@Service
+public class Enquiries {
+
+ private final ContactService contact;
+ private final ContactEnquiryRepository enquiries;
+
+ public Enquiries(ContactService contact, ContactEnquiryRepository enquiries) {
+ this.contact = contact;
+ this.enquiries = enquiries;
+ }
+
+ /**
+ * @throws net.thebennett.platform.contact.ContactException if it's not a usable enquiry, or the
+ * relay refused it — the message is written for the visitor to read
+ */
+ public void receive(String name, String email, String message) {
+ Enquiry enquiry = Enquiry.of(name, email, message);
+
+ contact.validate(enquiry);
+ ContactEnquiry recorded = enquiries.save(
+ new ContactEnquiry(enquiry.name(), enquiry.email(), enquiry.message()));
+
+ contact.submit(enquiry);
+
+ recorded.markDelivered();
+ enquiries.save(recorded);
+ }
+}
diff --git a/src/main/java/com/itsthevine/web/PageMetaController.java b/src/main/java/com/itsthevine/web/PageMetaController.java
deleted file mode 100644
index e67ff95..0000000
--- a/src/main/java/com/itsthevine/web/PageMetaController.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.itsthevine.web;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import jakarta.servlet.http.HttpServletRequest;
-
-/**
- * Serves {@code index.html} with per-page title/description/OG tags filled in.
- *
- * The site used to be server-rendered by Next, so every page came with its own metadata. A plain
- * SPA would hand crawlers and link-preview scrapers one generic shell for all four pages — a real
- * loss for a shop that people find by searching. Rendering just the {@code Only the four real routes are listed. Anything else falls through to the platform's SPA
- * fallback, which is what we want for 404s — no invented metadata for URLs that don't exist.
- */
-@Controller
-public class PageMetaController {
-
- private static final Logger log = LoggerFactory.getLogger(PageMetaController.class);
-
- private static final String NAME = "The Vine Coffeehouse + Bakery";
- private static final String HOME_DESCRIPTION =
- "A locally owned coffeehouse and bakery in downtown Princeville, Illinois. We bake pastries, "
- + "custom cakes, cookies, and cinnamon rolls, and serve sandwiches, paninis, and coffee.";
-
- private record PageMeta(String title, String description) {}
-
- private static final Map This replaced a React SPA and, with it, {@code PageMetaController} — a class whose whole job was
+ * to splice per-page {@code
+ Morissa Bennett opened The Vine in 2024, at 215 E Main Street, in the middle of downtown
+ Princeville. The plan was not complicated. Bake it ourselves, sell it ourselves, and keep
+ enough tables that nobody feels rushed out the door.
+
+ We opened with coffee and pastries. The menu kept growing. Now there are cinnamon rolls
+ and caramel rolls, scones, cookie bars, macarons, brownies, and pies, plus sandwiches and
+ paninis once the lunch crowd shows up.
+
+ Cakes and decorated cookies are made to order, which means we mostly bake whatever
+ Princeville is celebrating that week. We have done a tractor, a cow, a 76th birthday, a
+ retirement, a wedding, and a cake for the class of 1964. We have iced sugar cookies for
+ the cross country team and for a bridal party. If you can describe it, we will have a go
+ at it.
+
+ We turn out for Christmas in the Village every year and for other civic events, and the
+ Princeville Civic Association counts us among the town's small businesses. Enjoy
+ Illinois and Discover Peoria have both pointed travelers our way. If you are one of them,
+ we open at 7:00am, Tuesday through Saturday.
+
+ A coffeehouse and bakery in downtown Princeville, Illinois.
+
+ Morissa Bennett opened The Vine in 2024. We bake in our own kitchen on Main Street:
+ cinnamon rolls, cookies, custom cakes, sandwiches, paninis, and coffee.
+
+ Nothing in that category just now.
+ See everything.
+ It used to extend {@code PlatformWebContract} from platform-starter-test and inherit these five
+ * assertions verbatim. It can't any more, and the reason is worth stating: the shared contract asserts
+ * that an unknown extension-less path forwards to {@code /index.html}, because it was written when every
+ * app on the platform was a React SPA. This one is server-rendered now — {@code /index.html} holds
+ * nothing but the admin shell — so forwarding a mistyped URL there would answer with a blank page and a
+ * 200 instead of the site's own 404. The contract's own test methods are package-private, so the
+ * assertion cannot be overridden from here.
+ *
+ * The other four are restated below unchanged, so this app still fails the build on the regression
+ * the contract exists for (an {@code /api} typo answering with a page and a 200).
+ *
+ * Platform follow-up: {@code PlatformWebContract} should decide which of the two routing
+ * behaviours to assert by reading {@code platform.web.spa.enabled} — then one contract would cover both
+ * kinds of app and this file could go back to inheriting it.
+ */
@SpringBootTest(properties = {
// The storage starter activates on its default endpoint, so an S3 client is built even in
// tests and fails on blank keys.
@@ -19,10 +46,59 @@ import net.thebennett.platform.test.PlatformWebContract;
"platform.contact.from=noreply@example.com"
})
@Testcontainers
-class PlatformContractTest extends PlatformWebContract {
+class PlatformContractTest {
@Container
@ServiceConnection
static PostgreSQLContainer postgres =
new PostgreSQLContainer<>(DockerImageName.parse("postgres:18-alpine"));
+
+ @Autowired
+ WebApplicationContext context;
+
+ MockMvc mvc;
+
+ @BeforeEach
+ void setUp() {
+ mvc = MockMvcBuilders.webAppContextSetup(context).build();
+ }
+
+ @Test
+ @DisplayName("an /api path that matches no controller returns 404, not a page")
+ void unknownApiPathIsNotFound() throws Exception {
+ mvc.perform(get("/api/a-path-no-controller-serves")).andExpect(status().isNotFound());
+ }
+
+ @Test
+ @DisplayName("a nested unknown /api path returns 404 too")
+ void unknownNestedApiPathIsNotFound() throws Exception {
+ mvc.perform(get("/api/deeper/still/not/real")).andExpect(status().isNotFound());
+ }
+
+ @Test
+ @DisplayName("health reports UP")
+ void healthIsUp() throws Exception {
+ mvc.perform(get("/actuator/health"))
+ .andExpect(status().isOk())
+ .andExpect(jsonPath("$.status").value("UP"));
+ }
+
+ @Test
+ @DisplayName("liveness and readiness probes are exposed")
+ void probesAreExposed() throws Exception {
+ // Docker's HEALTHCHECK and any future orchestrator depend on these existing.
+ mvc.perform(get("/actuator/health/liveness")).andExpect(status().isOk());
+ mvc.perform(get("/actuator/health/readiness")).andExpect(status().isOk());
+ }
+
+ @Test
+ @DisplayName("an unknown route is a 404, and only /admin serves the SPA shell")
+ void routingIsServerSideExceptForTheAdmin() throws Exception {
+ mvc.perform(get("/some/client/side/route")).andExpect(status().isNotFound());
+ // Assert the forward TARGET, not the body: MockMvc records a forward rather than executing it,
+ // so the body is empty here by design — which also means this passes before the admin is built.
+ mvc.perform(get("/admin"))
+ .andExpect(status().isOk())
+ .andExpect(forwardedUrl("/index.html"));
+ }
}
diff --git a/src/test/java/com/itsthevine/web/SiteControllerTest.java b/src/test/java/com/itsthevine/web/SiteControllerTest.java
new file mode 100644
index 0000000..78d33b2
--- /dev/null
+++ b/src/test/java/com/itsthevine/web/SiteControllerTest.java
@@ -0,0 +1,142 @@
+package com.itsthevine.web;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.not;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * The pages, rendered.
+ *
+ * These assert what a visitor and a crawler are actually served — the catalogue in the HTML rather
+ * than in a JSON call the page makes later, and a real per-page {@code
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/templates/fragments/page.html b/src/main/resources/templates/fragments/page.html
new file mode 100644
index 0000000..f6351ba
--- /dev/null
+++ b/src/main/resources/templates/fragments/page.html
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/templates/history.html b/src/main/resources/templates/history.html
new file mode 100644
index 0000000..56c4220
--- /dev/null
+++ b/src/main/resources/templates/history.html
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html
new file mode 100644
index 0000000..e6f057f
--- /dev/null
+++ b/src/main/resources/templates/home.html
@@ -0,0 +1,112 @@
+
+
+
+Our story
+
+
+
+
+ How it started
+ What we make
+ The cakes are the fun part
+ Around town
+
+
+
+
+
+
diff --git a/src/main/resources/templates/products.html b/src/main/resources/templates/products.html
new file mode 100644
index 0000000..90ce582
--- /dev/null
+++ b/src/main/resources/templates/products.html
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ See the menu
+
+
+ Visit us
+
+
+
+
+ What people come in for
+
+
+
+
+
+
+
+
+
Cinnamon Rolls
+
+
+
+
+ Our story
+
+
+ Visit us
+
+
+
+
+
+ Our hours
+
+
+
+
+
+
+
+Our products
+
+
+
+
+ All
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Name
+ Category
+
+
+
+
diff --git a/src/test/java/com/itsthevine/web/PageMetaControllerTest.java b/src/test/java/com/itsthevine/web/PageMetaControllerTest.java
deleted file mode 100644
index 89e1be1..0000000
--- a/src/test/java/com/itsthevine/web/PageMetaControllerTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.itsthevine.web;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.File;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.core.io.Resource;
-import org.springframework.mock.web.MockHttpServletRequest;
-
-/**
- * Runs against the REAL frontend/index.html rather than a fixture: the controller finds its tags by
- * pattern, so reformatting that file is exactly how this would silently break. Here it fails the build
- * instead.
- */
-class PageMetaControllerTest {
-
- private static final File INDEX = new File("frontend/index.html");
-
- private static PageMetaController controller() {
- DefaultResourceLoader loader = new DefaultResourceLoader() {
- @Override
- public Resource getResource(String location) {
- return new FileSystemResource(INDEX);
- }
- };
- return new PageMetaController(loader, "https://itsthevine.com");
- }
-
- private static String get(String path) {
- MockHttpServletRequest request = new MockHttpServletRequest("GET", path);
- request.setRequestURI(path);
- return controller().page(request);
- }
-
- @Test
- void theIndexTemplateIsWhereTheControllerExpects() {
- assertThat(INDEX).exists();
- }
-
- @Test
- void productsPageGetsItsOwnTitleAndDescription() {
- String html = get("/products");
-
- assertThat(html).contains("
+
+
+