Add basic skeleton for the views

Adriandmen · May 22, 2021 · 3f89193 · 3f89193
1 parent 67310e8
commit 3f89193
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 7 deletions.
diff --git a/src/main/java/nl/adrianmensing/krokodil/controller/api/PlayerController.java b/src/main/java/nl/adrianmensing/krokodil/controller/api/PlayerController.java
@@ -43,7 +43,7 @@ public ResponseEntity<?> requestInfo(@RequestParam(value = "user_id") String use
         return new JSONResponse<>(player).build();
     }
 
-    @PutMapping("/username")
+    @PostMapping("/username")
     public ResponseEntity<?> username(@CookieValue(value = "session_id") String playerID,
                                       @RequestParam(value = "username") String username) {
         Player player = PlayerDataManager.getPlayerByID(playerID);

diff --git a/src/main/java/nl/adrianmensing/krokodil/controller/web/MainController.java b/src/main/java/nl/adrianmensing/krokodil/controller/web/MainController.java
@@ -3,11 +3,13 @@
 import nl.adrianmensing.krokodil.controller.ControllerUtils;
 import nl.adrianmensing.krokodil.database.manager.PlayerDataManager;
 import nl.adrianmensing.krokodil.logic.Player;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.GetMapping;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 @Controller
 public class MainController {
@@ -21,4 +23,15 @@ public String hello(@CookieValue(value = "session_id", defaultValue = "") String
 
         return "index";
     }
+
+    @GetMapping("/welcome")
+    public String welcome(@CookieValue(value = "session_id", required = false) String sessionID,
+                          HttpServletResponse response) {
+        if (sessionID == null || PlayerDataManager.getPlayerByID(sessionID) == null) {
+            response.setHeader("Location", "/");
+            response.setStatus(HttpStatus.FOUND.value());
+        }
+
+        return "welcome";
+    }
 }
diff --git a/src/main/resources/static/main.js b/src/main/resources/static/main.js
@@ -0,0 +1,19 @@
+function submitUsername() {
+    let username = document.getElementById("username").value;
+
+    if (/^[0-9A-Za-z][0-9A-Za-z ]*/.test(username) && username.length > 1) {
+        let formData = new FormData();
+        formData.append("username", username);
+        fetch("/api/player/username", {
+            method: "POST",
+            body: formData
+        }).then(res => {
+            if (res.ok) {
+                window.localStorage.setItem("username", username);
+                window.location.replace("/welcome");
+            }
+        })
+    } else {
+        alert("Invalid username");
+    }
+}
diff --git a/src/main/resources/static/welcome.js b/src/main/resources/static/welcome.js
@@ -0,0 +1,3 @@
+function setUsername() {
+    document.getElementById("player-username").innerHTML = localStorage.getItem("username");
+}
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -11,7 +11,9 @@
 </head>
 <body>
     <div>
-        Hello, World!
+        <label for="username">Username: </label>
+        <input type="text" id="username" value="">
+        <input type="submit" onclick="submitUsername()">
     </div>
 </body>
 </html>
diff --git a/src/main/resources/templates/welcome.html b/src/main/resources/templates/welcome.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Le Crocodile</title>
+    <link rel="stylesheet" href="style.css"/>
+    <script src="welcome.js"></script>
+</head>
+<body>
+    <p>Welcome <span id="player-username"></span></p>
+
+    <script>
+        setUsername();
+    </script>
+</body>
+</html>
diff --git a/src/test/java/it/IntegrationTest.java b/src/test/java/it/IntegrationTest.java
@@ -6,8 +6,7 @@
 
 import javax.servlet.http.Cookie;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 
 @AutoConfigureMockMvc
 public abstract class IntegrationTest {
@@ -24,7 +23,7 @@ Cookie generateNewPlayerCookie() throws Exception {
 
     Cookie generateNewPlayerCookie(String username) throws Exception {
         Cookie session_id = generateNewPlayerCookie();
-        mvc.perform(put("/api/player/username").cookie(session_id).param("username", username));
+        mvc.perform(post("/api/player/username").cookie(session_id).param("username", username));
         return session_id;
     }
 }
diff --git a/src/test/java/it/PlayerControllerTest.java b/src/test/java/it/PlayerControllerTest.java
@@ -56,7 +56,7 @@ public void GetPlayerInfoTest() throws Exception {
     @Test
     public void SetUsernameForPlayer() throws Exception {
         Cookie session_id = generateNewPlayerCookie();
-        mvc.perform(put("/api/player/username").cookie(session_id).param("username", "Adnan"))
+        mvc.perform(post("/api/player/username").cookie(session_id).param("username", "Adnan"))
                 .andExpect(status().isOk())
                 .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON));
 
@@ -81,7 +81,7 @@ public void CreateNewGameTest() throws Exception {
                 .andExpect(status().isBadRequest())
                 .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON));
 
-        mvc.perform(put("/api/player/username").cookie(session_id).param("username", "Adnan"))
+        mvc.perform(post("/api/player/username").cookie(session_id).param("username", "Adnan"))
                 .andExpect(status().isOk())
                 .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON));