Merge pull request #2 from davidsholoye/navigation

Navigation
davidsholoye · Nov 14, 2023 · 6fd6da6 · 6fd6da6
2 parents a924737 + b4418a9
commit 6fd6da6
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 4 deletions.
diff --git a/src/main/java/com/makersacademy/acebook/SecurityConfiguration.java b/src/main/java/com/makersacademy/acebook/SecurityConfiguration.java
@@ -28,7 +28,7 @@ protected void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
                 .antMatchers("/posts").hasRole("USER")
                 .antMatchers("/users").permitAll()
-                .and().formLogin();
+                .and().formLogin().loginPage("/login");
     }
 
     @Bean

diff --git a/src/main/java/com/makersacademy/acebook/controller/HomeController.java b/src/main/java/com/makersacademy/acebook/controller/HomeController.java
@@ -10,4 +10,10 @@ public class HomeController {
 	public RedirectView index() {
 		return new RedirectView("/posts");
 	}
+
+	@RequestMapping("/login")
+	public String login() {
+		return "login";
+	}
 }
+
diff --git a/src/main/java/com/makersacademy/acebook/model/Comment.java b/src/main/java/com/makersacademy/acebook/model/Comment.java
@@ -0,0 +1,4 @@
+package com.makersacademy.acebook.model;
+
+public class Comment {
+}
diff --git a/src/main/java/com/makersacademy/acebook/model/Post.java b/src/main/java/com/makersacademy/acebook/model/Post.java
@@ -8,6 +8,8 @@
 
 import lombok.Data;
 
+import java.sql.Timestamp;
+
 @Data
 @Entity
 @Table(name = "POSTS")
@@ -18,12 +20,24 @@ public class Post {
     private Long id;
     private String content;
 
+    private Timestamp timestamp;
+
+    private Long userId;
+
     public Post() {}
 
-    public Post(String content) {
+    public Post(String content, Timestamp timestamp, Long userId) {
         this.content = content;
+        this.timestamp = timestamp;
+        this.userId = userId;
     }
-    public String getContent() { return this.content; }
+    public String getContent() {return this.content;}
     public void setContent(String content) { this.content = content; }
 
+    public Timestamp getTimestamp() {return this.timestamp;}
+    public void setTimestamp(Timestamp timestamp) { this.timestamp = timestamp; }
+
+    public Long getUserId() {return this.userId;}
+    public void setUserId(Long userId) { this.userId = userId; }
+
 }
diff --git a/src/main/resources/db/migration/V10__update_userid_to_bigint.sql b/src/main/resources/db/migration/V10__update_userid_to_bigint.sql
@@ -0,0 +1,3 @@
+ALTER TABLE posts
+ALTER COLUMN user_id
+TYPE bigint;
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
@@ -0,0 +1,32 @@
+<html xmlns:th="http://www.thymeleaf.org" xmlns:tiles="http://www.thymeleaf.org">
+<head>
+    <title tiles:fragment="title">Messages : Create</title>
+</head>
+<body>
+<div tiles:fragment="content">
+    <form name="f" th:action="@{/login}" method="post">
+        <fieldset>
+            <legend>Please Login</legend>
+            <div th:if="${param.error}" class="alert alert-error">
+                Invalid username and password.
+            </div>
+            <div th:if="${param.logout}" class="alert alert-success">
+                You have been logged out.
+            </div>
+            <label for="username">Username</label>
+            <input type="text" id="username" name="username"/>
+            <label for="password">Password</label>
+            <input type="password" id="password" name="password"/>
+            <div class="form-actions">
+                <button type="submit" class="btn">Log in</button>
+            </div>
+        </fieldset>
+    </form>
+    <form name="f" th:action="@{/users/new}" method="get">
+        <div>
+            <button type="submit" class="btn">Sign up</button>
+        </div>
+    </form>
+</div>
+</body>
+</html>
diff --git a/src/test/java/com/makersacademy/acebook/model/PostTest.java b/src/test/java/com/makersacademy/acebook/model/PostTest.java
@@ -5,13 +5,22 @@
 
 import org.junit.Test;
 
+import java.sql.Timestamp;
+
 public class PostTest {
 
-	private Post post = new Post("hello");
+	Timestamp timestamp = Timestamp.valueOf("2007-09-23 10:10:10.0");;
+
+	private Post post = new Post("hello", timestamp, 1L);
 
 	@Test
 	public void postHasContent() {
 		assertThat(post.getContent(), containsString("hello"));
 	}
 
+//	@Test
+//	public void postHasContent() {
+//		assertThat(post.getContent(), containsString("hello"));
+//	}
+//
 }