From 879da3813a067884c508fa00169ee05f240cdaf4 Mon Sep 17 00:00:00 2001 From: Geoffrey Meier Date: Fri, 17 Feb 2023 16:30:22 -0600 Subject: [PATCH 1/2] Studio update --- .../spaday/controllers/SpaDayController.java | 4 ++ src/main/resources/templates/fragments.html | 4 ++ src/main/resources/templates/menu.html | 38 +++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/src/main/java/org/launchcode/spaday/controllers/SpaDayController.java b/src/main/java/org/launchcode/spaday/controllers/SpaDayController.java index a30c8add8..f78b98c77 100644 --- a/src/main/java/org/launchcode/spaday/controllers/SpaDayController.java +++ b/src/main/java/org/launchcode/spaday/controllers/SpaDayController.java @@ -62,6 +62,10 @@ public String spaMenu(@RequestParam String name, @RequestParam String skintype, appropriateFacials.add(facials.get(i)); } } + model.addAttribute("name", name); + model.addAttribute("skintype", skintype); + model.addAttribute("manipedi",manipedi); + model.addAttribute("appropriateFacials",appropriateFacials); return "menu"; } diff --git a/src/main/resources/templates/fragments.html b/src/main/resources/templates/fragments.html index 4885213df..d83fb5c6c 100644 --- a/src/main/resources/templates/fragments.html +++ b/src/main/resources/templates/fragments.html @@ -6,7 +6,11 @@ Fragments + +

Our manicure is a great way to spend 30 minutes of your day! We use shea butter hand cream and the finest gel polish.

+

Relax for 45 minutes in pure luxury! Our massage chairs and experienced nail techs are here to get your feet in shape for sandal season!

+ \ No newline at end of file diff --git a/src/main/resources/templates/menu.html b/src/main/resources/templates/menu.html index b94b513f1..b9f369d38 100644 --- a/src/main/resources/templates/menu.html +++ b/src/main/resources/templates/menu.html @@ -8,8 +8,46 @@

My Super Fancy Spa

+

My profile

+ +

+ +

+ +

+
+ +

Menu of Available Services

+ +
+

Facial Treatments

+

The facial treatments below are recommended by our estheticians for your given skin type.

+
+ + + + + + + +
+ + + +
+

Pedicure

+

+
+ + +
+

Manicure

+

+
+ +
\ No newline at end of file From b3a1c944fa8fe74475385ebd3164c8de91760dec Mon Sep 17 00:00:00 2001 From: Geoffrey Meier Date: Mon, 20 Feb 2023 16:54:49 -0600 Subject: [PATCH 2/2] Studio update --- src/main/resources/templates/menu.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/resources/templates/menu.html b/src/main/resources/templates/menu.html index b9f369d38..e7a41f5ff 100644 --- a/src/main/resources/templates/menu.html +++ b/src/main/resources/templates/menu.html @@ -24,15 +24,19 @@

Menu of Available Services

Facial Treatments

The facial treatments below are recommended by our estheticians for your given skin type.

-
+ + + -
+ + - + +
+ -