Merge branch 'dev' of https://git.cardiff.ac.uk/c24020257/second-hand-disposal into dev

2148b755 · Yibo Zhu · 61e25320 · 5832720a · 2148b755 · 2148b755
Commit 2148b755 authored 6 months ago by Yibo Zhu
--- 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
+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;
+    }
+}
--- a/src/main/resources/templates/fragments/header.html
+++ b/src/main/resources/templates/fragments/header.html
+<header>
+    <div> i am header</div>
+</header>
\ No newline at end of file
--- a/src/main/resources/static/index.html
+++ b/src/main/resources/static/index.html
@@ -3,8 +3,15 @@
 <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