diff --git a/src/main/java/org/launchcode/controllers/SpaDayController.java b/src/main/java/org/launchcode/controllers/SpaDayController.java index 207770d6..201f5e72 100644 --- a/src/main/java/org/launchcode/controllers/SpaDayController.java +++ b/src/main/java/org/launchcode/controllers/SpaDayController.java @@ -62,7 +62,11 @@ public String spaMenu(@RequestParam String name, @RequestParam String skintype, appropriateFacials.add(facials.get(i)); } } - + model.addAttribute("name" , name); + model.addAttribute("skintype", skintype); + model.addAttribute("facials", facials); + model.addAttribute("appropriateFacials", appropriateFacials); + model.addAttribute("manipedi", manipedi); return "menu"; } } diff --git a/src/main/resources/static/styles.css b/src/main/resources/static/styles.css index e37cc062..0b15276a 100644 --- a/src/main/resources/static/styles.css +++ b/src/main/resources/static/styles.css @@ -2,7 +2,7 @@ body { background-color: pink; } -div { +div:not(.grid):not(.cell) { margin: auto; width: 50%; padding: 10px; @@ -23,4 +23,46 @@ table { width: 50%; padding: 10px; text-align: center; -} \ No newline at end of file +} + +.container { +display: grid; + place-items: center; +} + +.grid { + display: grid; + grid-template-columns: repeat(6, 80px); + grid-template-rows: repeat(1, 80px); + position:absolute; + bottom:0; +} + +.cell { + justify-content: center; + align-items: center; + display: flex; +} + +div#\31 { + background: #D9BCF2; +} +div#\32 { + background: #AED8F2; +} +div#\33 { + background: #F2DEA2; +} +div#\34 { + background: #F2CDC4; +} +div#\35 { + background: #A9B5D9; +} +div#\36 { + background: #F2A477; +} + + + + diff --git a/src/main/resources/templates/menu.html b/src/main/resources/templates/menu.html index b94b513f..5b4cd4a5 100644 --- a/src/main/resources/templates/menu.html +++ b/src/main/resources/templates/menu.html @@ -3,13 +3,48 @@
The facial treatments below are recommended by our aestheticians for your given skin type.
+| ... | +