#274 - added basic page

f86861ad · Robert Goldmann · b03bbb3e · f86861ad · f86861ad · f86861ad
Commit f86861ad authored Apr 16, 2019 by Robert Goldmann
--- a/src/main/java/de/deadlocker8/budgetmaster/search/SearchController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/search/SearchController.java
@@ -4,6 +4,7 @@ import de.deadlocker8.budgetmaster.controller.BaseController;
 import de.deadlocker8.budgetmaster.services.HelpersService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -16,9 +17,9 @@ public class SearchController extends BaseController
 	private HelpersService helpers;

 	@RequestMapping(value = "/search", method = RequestMethod.POST)
-	public String post(@ModelAttribute("NewSearch") Search search)
+	public String post(Model model, @ModelAttribute("NewSearch") Search search)
 	{
-		System.out.println(search);
-		return "redirect:/";
+		model.addAttribute("searchText", search.getSearchText());
+		return "search/search";
 	}
 }
\ No newline at end of file
--- a/src/main/resources/languages/_de.properties
+++ b/src/main/resources/languages/_de.properties
@@ -133,6 +133,7 @@ menu.about=
 menu.logout=Logout
 menu.accounts=Konten
 menu.update=Update verfgbar
+menu.search.results=Suchergebnisse

 category.new.label.name=Name


--- a/src/main/resources/languages/_en.properties
+++ b/src/main/resources/languages/_en.properties
@@ -134,6 +134,7 @@ menu.about=About
 menu.logout=Logout
 menu.accounts=Accounts
 menu.update=Update available
+menu.search.results=Search results

 category.new.label.name=Name


--- a/src/main/resources/templates/search/search.ftl
+++ b/src/main/resources/templates/search/search.ftl
+<html>
+    <head>
+        <#import "../helpers/header.ftl" as header>
+        <@header.header "BudgetMaster"/>
+        <#import "/spring.ftl" as s>
+    </head>
+    <body class="budgetmaster-blue-light">
+        <#import "../helpers/navbar.ftl" as navbar>
+        <@navbar.navbar "home" settings/>
+
+        <main>
+            <div class="card main-card background-color">
+                <div class="container">
+                    <div class="section center-align">
+                        <div class="headline">${locale.getString("menu.search.results")}</div>
+                    </div>
+                </div>
+                <div class="container">
+                    <div class="row">
+                        <div class="col s12">
+                            ${searchText}
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </main>
+
+        <!--  Scripts-->
+        <#import "../helpers/scripts.ftl" as scripts>
+        <@scripts.scripts/>
+    </body>
+</html>
\ No newline at end of file