diff --git a/schleicherhof_pms/src/main/java/de/thd/pms/controller/HomeController.java b/schleicherhof_pms/src/main/java/de/thd/pms/controller/HomeController.java
index 1f94527202922275a2994a97609f80bd2f353264..6d34e945866700d476d9f47697ba8fa219b854c9 100644
--- a/schleicherhof_pms/src/main/java/de/thd/pms/controller/HomeController.java
+++ b/schleicherhof_pms/src/main/java/de/thd/pms/controller/HomeController.java
@@ -1,32 +1,22 @@
package de.thd.pms.controller;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+//import org.apache.logging.log4j.LogManager;
+//import org.apache.logging.log4j.Logger;
//import org.apache.logging.log4j.LogManager;
//import org.apache.logging.log4j.Logger;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.ModelAndView;
+
@Controller
-public class HomeController {private static Logger log = LogManager.getLogger(HomeController.class);
+public class HomeController {
@RequestMapping("/welcome")
- public ModelAndView welcome() {
-
-
- // log.debug("Test");
- log.info("Controller für die Methode welcome");
-// log.warn("Warnung");
-// log.error(message);
-// log.fatal(message);
- ModelAndView mv = new ModelAndView();
- mv.addObject("title", "Herzlich Willkommen!");
- mv.addObject("message", "Sie können hier Boote bzw. Personen anlegen und Fahrten absolvieren.");
- mv.setViewName("home");
- return mv;
+ public String welcome() {
+
+ return "hallo";
}
}
diff --git a/schleicherhof_pms/src/main/resources/application.properties b/schleicherhof_pms/src/main/resources/application.properties
index 4c48b8833547c0e25faed741c245ac0b792c12a4..1c352ffd1a1651c74d23956bc6a206dcff951a83 100644
--- a/schleicherhof_pms/src/main/resources/application.properties
+++ b/schleicherhof_pms/src/main/resources/application.properties
@@ -3,5 +3,5 @@ spring.datasource.url=jdbc:mysql://localhost:3306/schleicherhof_pms
spring.datasource.username=
spring.datasource.password=
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-server.port=7777
+server.port=4321
diff --git a/schleicherhof_pms/src/main/resources/templates/menu.html b/schleicherhof_pms/src/main/resources/templates/menu.html
new file mode 100644
index 0000000000000000000000000000000000000000..372925c1482b5ac0fbd078eba8e90732a80e51ec
--- /dev/null
+++ b/schleicherhof_pms/src/main/resources/templates/menu.html
@@ -0,0 +1,42 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:th="http://www.thymeleaf.org">
+<nav th:fragment="menu" class="navbar navbar-default">
+ <div class="container-fluid">
+ <!-- Brand and toggle get grouped for better mobile display -->
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+ <span class="sr-only">Menü umschalten</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" th:href="@{~/welcome}">Fahrtenbuch</a>
+ </div>
+
+ <!-- Collect the nav links, forms, and other content for toggling -->
+ <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+ <ul class="nav navbar-nav">
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Fahrten <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a th:href="@{~/boot/freieBoote}">Fahrt eintragen</a></li>
+ <li><a th:href="@{~/fahrt/aktuelle}">Fahrt austragen</a></li>
+ <li><a th:href="@{~/fahrt/findAll}">Alle Fahrten</a></li>
+ </ul>
+ </li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Registrierung <span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a th:href="@{~/boot/edit}">Neues Boot eintragen</a></li>
+ <li><a th:href="@{~/boot/findAll}">Alle Boote</a></li>
+ <li role="separator" class="divider"></li>
+ <li><a th:href="@{~/person/edit}">Neue Person eintragen</a></li>
+ <li><a th:href="@{~/person/findAll}">Alle Personen</a></li>
+ </ul>
+ </li>
+ <li><a th:href="@{~/fahrt/findAdmin}">Fahrten (admin)</a></li>
+ </ul>
+ </div><!-- /.navbar-collapse -->
+ </div><!-- /.container-fluid -->
+</nav>
+</html>
\ No newline at end of file