[박현석]

- 글쓴이 이름 보이게 하기 미완료

#7

#8

#9

#10

src/main/java/com/hsp/hoicegram/common/FileManagerService.java

@@ -10,8 +10,8 @@
 
 public class FileManagerService {
 
-	public static final String FILE_UPLOAD_PATH = "D:\\web_hsp\\spring_project\\upload\\hoicegram\\image"; 
-	// 
+	public static final String FILE_UPLOAD_PATH = "/Users/hsp9781/web_hsp/spring_project/upload/hoicegram/image"; 
+	// "D:\\web_hsp\\spring_project\\upload\\hoicegram\\image"
 	// "/Users/hsp9781/web_hsp/spring_project/upload/memo/image"
 
 	//파일 저장 -> 경로 생성

src/main/java/com/hsp/hoicegram/post/PostController.java

@@ -1,15 +1,39 @@
 package com.hsp.hoicegram.post;
 
+import java.util.List;
+
+import javax.servlet.http.HttpSession;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import com.hsp.hoicegram.post.bo.PostBO;
+import com.hsp.hoicegram.post.model.Post;
+import com.hsp.hoicegram.user.bo.UserBO;
+import com.hsp.hoicegram.user.model.User;
+
 @Controller
 @RequestMapping("/post")
 public class PostController {
+
+	@Autowired
+	private PostBO postBO; 
+
+	@Autowired
+	private UserBO userBO;
 
 	@GetMapping("/timeline/view")
-	public String list() {
+	public String list(Model model) {
+
+		List<Post> postList = postBO.getPostList();
+		List<User> userList = userBO.getNicknameList();
+
+		model.addAttribute("postList", postList);
+		model.addAttribute("userList", userList);
+
 		return "post/list";
 	}
 

src/main/java/com/hsp/hoicegram/post/bo/PostBO.java

@@ -1,11 +1,14 @@
 package com.hsp.hoicegram.post.bo;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.hsp.hoicegram.common.FileManagerService;
 import com.hsp.hoicegram.post.dao.PostDAO;
+import com.hsp.hoicegram.post.model.Post;
 
 @Service
 public class PostBO {
@@ -17,5 +20,9 @@ public int addPost(int userId, String content, MultipartFile file) {
 		String imagePath = FileManagerService.saveFile(userId, file);
 		return postDAO.insertPost(userId, content, imagePath);
 	}
+
+	public List<Post> getPostList() {
+		return postDAO.selectPostList();
+	}
 
 }

src/main/java/com/hsp/hoicegram/post/dao/PostDAO.java

@@ -1,14 +1,22 @@
 package com.hsp.hoicegram.post.dao;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import com.hsp.hoicegram.post.model.Post;
+
 @Repository
 public interface PostDAO {
 
 	public int insertPost(
 			@Param("userId") int userId
 			, @Param("content") String content
 			, @Param("imagePath") String imagePath);
+
+	public List<Post> selectPostList();
+
+	public String selectNickname(int userId);
 
 }

src/main/java/com/hsp/hoicegram/post/model/Post.java

@@ -0,0 +1,52 @@
+package com.hsp.hoicegram.post.model;
+
+import java.util.Date;
+
+public class Post {
+	private int	id;
+	private int userId;
+	private String content;
+	private String imagePath;
+	private Date createdAt;
+	private Date updatedAt;
+
+
+	public int getId() {
+		return id;
+	}
+	public void setId(int id) {
+		this.id = id;
+	}
+	public int getUserId() {
+		return userId;
+	}
+	public void setUserId(int userId) {
+		this.userId = userId;
+	}
+	public String getContent() {
+		return content;
+	}
+	public void setContent(String content) {
+		this.content = content;
+	}
+	public String getImagePath() {
+		return imagePath;
+	}
+	public void setImagePath(String imagePath) {
+		this.imagePath = imagePath;
+	}
+	public Date getCreatedAt() {
+		return createdAt;
+	}
+	public void setCreatedAt(Date createdAt) {
+		this.createdAt = createdAt;
+	}
+	public Date getUpdatedAt() {
+		return updatedAt;
+	}
+	public void setUpdatedAt(Date updatedAt) {
+		this.updatedAt = updatedAt;
+	}
+
+
+}

src/main/java/com/hsp/hoicegram/user/bo/UserBO.java

@@ -1,5 +1,7 @@
 package com.hsp.hoicegram.user.bo;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -65,6 +67,11 @@ public User getUser(String email, String password) {
 		String encryptPassword = EncryptService.md5(password);
 		return userDAO.selectUser(email, encryptPassword);
 	}
+
+
+	public List<User> getNicknameList() {
+		return userDAO.selectNicknameList();
+	}
 
 
 }

src/main/java/com/hsp/hoicegram/user/dao/UserDAO.java

@@ -1,5 +1,7 @@
 package com.hsp.hoicegram.user.dao;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -30,5 +32,7 @@ public User selectUser(
 			@Param("email") String email
 			, @Param("password") String password);
 
+	public List<User> selectNicknameList();
+
 
 }

src/main/resources/application.yml

@@ -9,6 +9,6 @@ spring:
       suffix: .jsp
   datasource: 
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/hoicegram_0316
+    url: jdbc:mysql://localhost:3306/hoicegram
     username: root
     password: root

src/main/resources/mappers/postMapper.xml

@@ -25,5 +25,20 @@
   			, now()
   		)
   	</insert>
+
+  	<select id="selectPostList" resultType="com.hsp.hoicegram.post.model.Post">
+  		SELECT 
+  			`id`
+  			, `userId`
+  			, `content`
+  			, `imagePath`
+  			, `createdAt`
+  			, `updatedAt`
+  		FROM 
+  			`post`
+  	</select>
+
+
+
 
   </mapper>

src/main/resources/mappers/userMapper.xml

@@ -76,7 +76,16 @@
 
   	</select>
 
+  	<select id="selectNicknameList" resultType="com.hsp.hoicegram.user.model.User">
+  		SELECT
+  			 `id`
+  			, `userName`
+  		FROM 
+  			`user` 		
+  	</select>
+  </mapper>
+
+
 
 
-
-  </mapper>
+

src/main/resources/static/css/post/style.css

@@ -9,17 +9,7 @@ header {
 	height:70px;
 }
 
-.contents {
-	height:730px;
-}
-
-.contents > .img {
-	height:350px;
-}
 
-.contents > .like {
-	height:50px;
-}
 
 footer {
 	height:70px;

src/main/webapp/WEB-INF/jsp/post/list.jsp

@@ -23,19 +23,24 @@
 
 	<div id="wrap">
 		<header class="d-flex justify-content-between align-items-end">
-			<h1 class="font-weight-light Italianno">hoicegram</h1>
 			<c:if test="${not empty userId }">
+			<div class="ml-3">
+					<h4 class=" font-weight-light ml-1">${nickname }</h4>
+			</div>
 			<div class="mr-1"> <a href="/user/signout" class="btn btn-dark text-light">logout</a> </div>
 			</c:if>
 		</header>					
 		<section class="contents">
+		<c:forEach var="post" items="${postList }">
 		<div class="card-box border rounded mt-3">
 			<div class="d-flex justify-content-between align-items-end">
-				<c:if test="${not empty userId }">
 				<div class="ml-3">
-					<h4 class=" font-weight-light ml-1">${nickname }</h4>
+					<c:forEach var="user" items="${userList }">
+					<c:if test="${user.id eq post.userId }">
+					<h4 class=" font-weight-light ml-1">${user.nickname }</h4>
+					</c:if>
+					</c:forEach>
 				</div>
-				</c:if>
 				<div class="menu mt-3 mr-2">
 					<div class="dropdown">
 					  <button class="btn" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -49,11 +54,14 @@
 					</div>
 				</div>
 			</div>
+			<c:if test="${not empty post.imagePath }">
 			<div class="img d-flex justify-content-center align-items-center mt-3">
-				<img alt="도시사진" width="600px" src="https://cdn.pixabay.com/photo/2023/03/13/04/25/buildings-7848348_960_720.jpg">
+				<img alt="도시사진" width="600px" src="${post.imagePath }">
 			</div>
-			<div class="mt-4 mb-4">
-				시티뷰 지렸다..
+			</c:if>
+			<div class="content-box mt-4 mb-4 d-flex">
+				<div class="nickname font-weight-bold">${post.userId }</div>
+				<div class="content ml-2"> ${post.content }</div>
 			</div>
 			<div class="like d-flex align-items-center">
 				<i class="bi bi-heart"></i>
@@ -76,7 +84,9 @@
 				</div>
 			</div>
 		</div>
+		</c:forEach>
 		</section>
+
 		<footer>
 			<div class="text-center mt-3">CopyRight</div>
 		</footer>