From 5832720a6f46514eb6459295b201f635fc07d5e9 Mon Sep 17 00:00:00 2001 From: Haoyu Sun <SunH26@cardiff.ac.uk> Date: Mon, 28 Oct 2024 15:32:52 +0000 Subject: [PATCH] index.html, header.html fragments --- .../demo/takeaway/index/IndexController.java | 14 ++++++++++++++ src/main/resources/static/index.html | 10 ---------- .../resources/templates/fragments/header.html | 3 +++ src/main/resources/templates/index/index.html | 17 +++++++++++++++++ 4 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 src/main/java/uk/ac/cf/spring/demo/takeaway/index/IndexController.java delete mode 100644 src/main/resources/static/index.html create mode 100644 src/main/resources/templates/fragments/header.html create mode 100644 src/main/resources/templates/index/index.html diff --git a/src/main/java/uk/ac/cf/spring/demo/takeaway/index/IndexController.java b/src/main/java/uk/ac/cf/spring/demo/takeaway/index/IndexController.java new file mode 100644 index 0000000..ef7f634 --- /dev/null +++ b/src/main/java/uk/ac/cf/spring/demo/takeaway/index/IndexController.java @@ -0,0 +1,14 @@ +package uk.ac.cf.spring.demo.takeaway.index; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.servlet.ModelAndView; + +@Controller +public class IndexController { + @GetMapping("/index") + public ModelAndView getIndex() { + ModelAndView modelAndView = new ModelAndView("/index/index"); + return modelAndView; + } +} diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html deleted file mode 100644 index 566549b..0000000 --- a/src/main/resources/static/index.html +++ /dev/null @@ -1,10 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="UTF-8"> - <title>Title</title> -</head> -<body> - -</body> -</html> \ No newline at end of file diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html new file mode 100644 index 0000000..057244a --- /dev/null +++ b/src/main/resources/templates/fragments/header.html @@ -0,0 +1,3 @@ +<header> + <div> i am header</div> +</header> \ No newline at end of file diff --git a/src/main/resources/templates/index/index.html b/src/main/resources/templates/index/index.html new file mode 100644 index 0000000..d644897 --- /dev/null +++ b/src/main/resources/templates/index/index.html @@ -0,0 +1,17 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="UTF-8"> + <title>Title</title> + <script src="../../static/lib/jquery.js"></script> + + <script> + $(".header").load("templates/fragments/header.html", function (data, status, xhr) {}); + </script> +</head> +<body> + <div class="header"></div> + <div>11111</div> + <div>2222</div> +</body> +</html> \ No newline at end of file -- GitLab