From 26b64b8ab46682b016c53892decb795a7b8a42cd Mon Sep 17 00:00:00 2001
From: Seil0 <seil0@mosad.xyz>
Date: Mon, 16 Mar 2020 13:49:51 +0100
Subject: [PATCH] move /user to separate RequestController

---
 .gitignore                                    |  2 +-
 .../hso/ecommerce/app/RequestController.java  | 26 --------------
 .../ecommerce/app/UserRequestController.java  | 35 +++++++++++++++++++
 3 files changed, 36 insertions(+), 27 deletions(-)
 create mode 100644 prototype/src/main/java/org/hso/ecommerce/app/UserRequestController.java

diff --git a/.gitignore b/.gitignore
index 178b075..3b718f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,4 +88,4 @@ local.properties
 *.launch
 
 # SQLite
-prototype/src/main/resources/*.db
+prototype/*.db
diff --git a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java
index f16f5d2..b340005 100644
--- a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java
@@ -95,32 +95,6 @@ public class RequestController {
         }
      }
 
-    @GetMapping("/user/")
-    public String user() {
-        return "redirect:/user/settings";
-    }
-
-    @GetMapping("/user/settings")
-    public String userSettings() {
-        return "user/settings";
-    }
-
-
-    @GetMapping("/user/orders/")
-    public String userOrdeers() {
-        return "user/orders/index";
-    }
-
-    @GetMapping("/user/bonuspoints")
-    public String userBonuspoints() {
-        return "user/bonuspoints";
-    }
-
-    @GetMapping("/user/notifications/")
-    public String userNotifications() {
-        return "user/notifications/index";
-    }
-
     @GetMapping("/about")
     public String about() {
         return "about";
diff --git a/prototype/src/main/java/org/hso/ecommerce/app/UserRequestController.java b/prototype/src/main/java/org/hso/ecommerce/app/UserRequestController.java
new file mode 100644
index 0000000..1482d13
--- /dev/null
+++ b/prototype/src/main/java/org/hso/ecommerce/app/UserRequestController.java
@@ -0,0 +1,35 @@
+package org.hso.ecommerce.app;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("user")
+public class UserRequestController {
+
+    @GetMapping("/")
+    public String user() {
+        return "redirect:/user/settings";
+    }
+
+    @GetMapping("/settings")
+    public String userSettings() {
+        return "user/settings";
+    }
+
+
+    @GetMapping("/orders/")
+    public String userOrdeers() { return "user/orders/index"; }
+
+    @GetMapping("/bonuspoints")
+    public String userBonuspoints() {
+        return "user/bonuspoints";
+    }
+
+    @GetMapping("/notifications/")
+    public String userNotifications() {
+        return "user/notifications/index";
+    }
+
+}