From 92314ea508a61ba1034b161814e0caaf543550ce Mon Sep 17 00:00:00 2001 From: Korsun Lisa Date: Thu, 30 Nov 2023 00:36:42 +0200 Subject: [PATCH 1/2] hawaiian page --- src/main/java/ToPizza/com/HomeController.java | 11 ++++ src/main/resources/templates/hawaiian.html | 60 +++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 src/main/resources/templates/hawaiian.html diff --git a/src/main/java/ToPizza/com/HomeController.java b/src/main/java/ToPizza/com/HomeController.java index d13030f..e137571 100644 --- a/src/main/java/ToPizza/com/HomeController.java +++ b/src/main/java/ToPizza/com/HomeController.java @@ -20,8 +20,19 @@ public String otherPage(Model model) { return "other"; } + @GetMapping("/hawaiian") + public String hawaiianPage(Model model) { + model.addAttribute("message", "This is the Hawaiian Page!"); + return "hawaiian"; + } + @PostMapping("/submit") public String submit() { return "redirect:/other"; } + + @PostMapping("/back") + public String back() { + return "redirect:/home"; + } } diff --git a/src/main/resources/templates/hawaiian.html b/src/main/resources/templates/hawaiian.html new file mode 100644 index 0000000..1fcc051 --- /dev/null +++ b/src/main/resources/templates/hawaiian.html @@ -0,0 +1,60 @@ + + + + + + + Гавайська піца + + + +
+

Гавайська

+

129 UAH

+

Балик, куряче філе, ананас, кукурудза, моцарела

+

Вага: 580г

+

+ Go back to Home Page +
+
+ +
+
+ + Гавайська піца + + + \ No newline at end of file From bb7463c6b736068bfe2d4649c3b77dd15fc92f01 Mon Sep 17 00:00:00 2001 From: Korsun Lisa Date: Fri, 1 Dec 2023 00:36:06 +0200 Subject: [PATCH 2/2] american --- ...161814e0caaf543550ce\357\200\272korsun-ye" | 17 +++++ src/main/java/ToPizza/com/HomeController.java | 6 ++ src/main/resources/templates/american.html | 62 +++++++++++++++++++ src/main/resources/templates/hawaiian.html | 16 ++--- 4 files changed, 94 insertions(+), 7 deletions(-) create mode 100644 "h origin 92314ea508a61ba1034b161814e0caaf543550ce\357\200\272korsun-ye" create mode 100644 src/main/resources/templates/american.html diff --git "a/h origin 92314ea508a61ba1034b161814e0caaf543550ce\357\200\272korsun-ye" "b/h origin 92314ea508a61ba1034b161814e0caaf543550ce\357\200\272korsun-ye" new file mode 100644 index 0000000..4b611e0 --- /dev/null +++ "b/h origin 92314ea508a61ba1034b161814e0caaf543550ce\357\200\272korsun-ye" @@ -0,0 +1,17 @@ +commit 92314ea508a61ba1034b161814e0caaf543550ce (HEAD -> master) +Author: Korsun Lisa +Date: Thu Nov 30 00:36:42 2023 +0200 + + hawaiian page + +commit f82050a94acc92b32c860721589f512934b6d633 (origin/master, origin/HEAD) +Author: Viktor Matsiuk +Date: Wed Nov 29 12:24:53 2023 +0200 + + site swich + +commit f5e6b00ae7e516e2af2985fd2dd9b81928fe0026 +Author: Viktor Matsiuk +Date: Wed Nov 29 11:25:36 2023 +0200 + + Start commit diff --git a/src/main/java/ToPizza/com/HomeController.java b/src/main/java/ToPizza/com/HomeController.java index e137571..0627f8f 100644 --- a/src/main/java/ToPizza/com/HomeController.java +++ b/src/main/java/ToPizza/com/HomeController.java @@ -26,6 +26,12 @@ public String hawaiianPage(Model model) { return "hawaiian"; } + @GetMapping("/american") + public String americanPage(Model model) { + model.addAttribute("message", "This is the American Page!"); + return "american"; + } + @PostMapping("/submit") public String submit() { return "redirect:/other"; diff --git a/src/main/resources/templates/american.html b/src/main/resources/templates/american.html new file mode 100644 index 0000000..330a981 --- /dev/null +++ b/src/main/resources/templates/american.html @@ -0,0 +1,62 @@ + + + + + + + Американа + + + +
+

Американа

+

139 UAH

+

Салямі, куряче філе, балик, гриби, помідор, чеддер, моцарела

+

610g

+

+ Go back to Home Page +
+
+ +
+
+ + Американа + + + \ No newline at end of file diff --git a/src/main/resources/templates/hawaiian.html b/src/main/resources/templates/hawaiian.html index 1fcc051..2282b03 100644 --- a/src/main/resources/templates/hawaiian.html +++ b/src/main/resources/templates/hawaiian.html @@ -6,8 +6,8 @@ Гавайська піца