diff --git a/.gitignore b/.gitignore index 512f9ab..0f7dad5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ target/ # The Tailwind CLI's dependencies. The compiled stylesheet needs no rule of its own: it is written # straight into target/classes/static/css, which is already ignored above. -styles/node_modules/ +src/main/styles/node_modules/ .idea/ *.iml .vscode/ diff --git a/README.md b/README.md index 03db6ce..9a67bf2 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ there is no JavaScript framework in this repo. The look has not changed through |---|---| | Backend | Spring Boot 4 / Java 25, `com.itsthevine.web` | | Pages | Thymeleaf, `src/main/resources/templates` — **no JavaScript** except one 100-line file for the product-card arrows | -| Styling | Tailwind v4, compiled from the templates by the Tailwind CLI into `static/css/site.css`. `styles/` is the whole asset pipeline | +| Styling | Tailwind v4, compiled from the templates by the Tailwind CLI into `static/css/site.css`. `src/main/styles` is the whole asset pipeline | | Admin | Thymeleaf forms at `/admin`, behind Authentik | | Database | Postgres (`itsthevine` on the shared `app-db` cluster), Flyway | | Photos | public MinIO bucket `itsthevine` — **not** in the repo or the image | @@ -120,7 +120,7 @@ history. EXIF (including GPS from phone photos) is stripped by the re-encode. mvn spring-boot:run # http://localhost:8080 # the stylesheet, while editing templates — watches and recompiles -cd styles && npm install && npm run watch +cd src/main/styles && npm install && npm run watch ``` `/admin` only exists when `SECURITY_MODE=OIDC`, so a plain local run has the site and no admin. To work diff --git a/pom.xml b/pom.xml index 0eda68a..841f4c5 100644 --- a/pom.xml +++ b/pom.xml @@ -127,14 +127,16 @@ com.github.eirslett frontend-maven-plugin - - styles + + src/main/styles
-
+
+

Get in touch

Or call us: (309) 701-0660 @@ -59,6 +68,30 @@

Thanks. Your message is on its way, and we will get back to you.

+
+ +
diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html index 35254ce..d37666f 100644 --- a/src/main/resources/templates/fragments/footer.html +++ b/src/main/resources/templates/fragments/footer.html @@ -20,13 +20,11 @@

Visit

-
-

215 E Main Street
Princeville, IL 61559

-

(309) 701-0660

-

- contact@itsthevine.com -

-
+
+ +
diff --git a/src/main/resources/templates/fragments/visit.html b/src/main/resources/templates/fragments/visit.html new file mode 100644 index 0000000..6b7c4de --- /dev/null +++ b/src/main/resources/templates/fragments/visit.html @@ -0,0 +1,41 @@ + + + + + + + +
+

215 E Main Street
Princeville, IL 61559

+

+ (309) 701-0660 +

+

+ contact@itsthevine.com +

+
+ + diff --git a/src/main/resources/templates/history.html b/src/main/resources/templates/history.html index 56c4220..2afedc1 100644 --- a/src/main/resources/templates/history.html +++ b/src/main/resources/templates/history.html @@ -3,9 +3,24 @@
-
-

Our story

-
+ +
+ +
+
+
+
+

Since 2024

+

Our story

+

+ 215 E Main Street, in the middle of downtown Princeville. +

+
+
+
+ +
@@ -49,6 +64,29 @@
+ + +
+
+
+

Come and see us

+

+ We open at 7:00am, Tuesday through Saturday. If you are after something for a date in the + diary, it is worth asking early. +

+ +
+
+
diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html index e6f057f..dd767ea 100644 --- a/src/main/resources/templates/home.html +++ b/src/main/resources/templates/home.html @@ -69,6 +69,32 @@ + +
+
+
+ Iced sugar cookies from The Vine +
+

Ordering for a crowd?

+

+ Goodie boxes for the office, packages for a party, and cakes and desserts for a wedding — + with prices, sizes and what each one includes, so you can see where to start. +

+ + Goodie boxes & catering + +
+
+
+
+
@@ -76,32 +102,12 @@

Our hours

-
    -
  • - Tuesday – Friday - 7:00am – 2:00pm -
  • -
  • - Saturday - 7:00am – 12:00pm -
  • -
  • - Sunday – Monday - Closed -
  • -
+

Find us

-
-

215 E Main Street
Princeville, IL 61559

-

- (309) 701-0660 -

-

- contact@itsthevine.com -

-
+
diff --git a/src/main/resources/templates/products.html b/src/main/resources/templates/products.html index 90ce582..0fb0685 100644 --- a/src/main/resources/templates/products.html +++ b/src/main/resources/templates/products.html @@ -5,6 +5,10 @@

Our products

+

+ What comes out of the kitchen on Main Street. Cakes and decorated cookies are made to order, so + most of what follows started as somebody describing what they wanted. +

@@ -46,6 +50,29 @@ See everything.

+ + +
+
+
+

Want one of these, or something else?

+

+ Cakes and decorated cookies are made to order. Tell us the date and roughly what you have in + mind — a tractor, a retirement, the class of 1964 — and we will work from there. +

+ +
+
+