LandvibeDev · jlhyunii · Aug 18, 2024 · Aug 19, 2024 · Aug 19, 2024 · Aug 26, 2024
diff --git a/.gradle/7.6.1/checksums/checksums.lock b/.gradle/7.6.1/checksums/checksums.lock
diff --git a/.gradle/7.6.1/checksums/md5-checksums.bin b/.gradle/7.6.1/checksums/md5-checksums.bin
diff --git a/.gradle/7.6.1/checksums/sha1-checksums.bin b/.gradle/7.6.1/checksums/sha1-checksums.bin
diff --git a/.gradle/7.6.1/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.6.1/dependencies-accessors/dependencies-accessors.lock
diff --git a/.gradle/7.6.1/dependencies-accessors/gc.properties b/.gradle/7.6.1/dependencies-accessors/gc.properties
diff --git a/.gradle/7.6.1/executionHistory/executionHistory.bin b/.gradle/7.6.1/executionHistory/executionHistory.bin
diff --git a/.gradle/7.6.1/executionHistory/executionHistory.lock b/.gradle/7.6.1/executionHistory/executionHistory.lock
diff --git a/.gradle/7.6.1/fileChanges/last-build.bin b/.gradle/7.6.1/fileChanges/last-build.bin
diff --git a/.gradle/7.6.1/fileHashes/fileHashes.bin b/.gradle/7.6.1/fileHashes/fileHashes.bin
diff --git a/.gradle/7.6.1/fileHashes/fileHashes.lock b/.gradle/7.6.1/fileHashes/fileHashes.lock
diff --git a/.gradle/7.6.1/fileHashes/resourceHashesCache.bin b/.gradle/7.6.1/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/7.6.1/gc.properties b/.gradle/7.6.1/gc.properties
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Sun Aug 18 21:14:11 KST 2024
+gradle.version=7.6.1
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/build/classes/java/main/com/landvibe/landlog/controller/MemberController.class b/build/classes/java/main/com/landvibe/landlog/controller/MemberController.class
diff --git a/build/classes/java/main/com/landvibe/landlog/controller/MemberForm.class b/build/classes/java/main/com/landvibe/landlog/controller/MemberForm.class
diff --git a/build/classes/java/main/com/landvibe/landlog/domain/Member.class b/build/classes/java/main/com/landvibe/landlog/domain/Member.class
diff --git a/build/classes/java/main/com/landvibe/landlog/repository/MemberRepository.class b/build/classes/java/main/com/landvibe/landlog/repository/MemberRepository.class
diff --git a/build/classes/java/main/com/landvibe/landlog/repository/MemoryMemberRepository.class b/build/classes/java/main/com/landvibe/landlog/repository/MemoryMemberRepository.class
diff --git a/build/classes/java/main/com/landvibe/landlog/service/MemberService.class b/build/classes/java/main/com/landvibe/landlog/service/MemberService.class
diff --git a/build/resources/main/templates/blogList.html b/build/resources/main/templates/blogList.html
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<body>
+<div class="container">
+    <!--블로그 폼-->
+    <div>
+        <h1><span th:text="${name}"/>의 블로그</h1>
+    </div>
+</div> <!-- /container -->
+</body>
+</html>
diff --git a/build/resources/main/templates/home.html b/build/resources/main/templates/home.html
@@ -6,6 +6,7 @@
         <h1>Hello Spring</h1>
         <p>회원 기능</p>
         <p>
+            <a href="/members/login">로그인</a>
             <a href="/members/new">회원 가입</a>
             <a href="/members">회원 목록</a>
         </p>

diff --git a/build/resources/main/templates/members/createMemberForm.html b/build/resources/main/templates/members/createMemberForm.html
@@ -2,10 +2,16 @@
 <html xmlns:th="http://www.thymeleaf.org">
 <body>
 <div class="container">
-    <form action="/members/new" method="post">
+    <form action="/members/new" method="post"> <!--회원가입 폼-->
         <div class="form-group">
             <label for="name">이름</label>
             <input type="text" id="name" name="name" placeholder="이름을 입력하세요">
+            <br>
+            <label for="email">이메일</label>
+            <input type="email" id="email" name="email" placeholder="이메일을 입력하세요">
+            <br>
+            <label for="pwd">패스워드</label>
+            <input type="password" id="pwd" name="pwd" placeholder="비밀번호를 입력하세요">
         </div>
         <button type="submit">등록</button>
     </form>

diff --git a/build/resources/main/templates/members/loginForm.html b/build/resources/main/templates/members/loginForm.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<body>
+<div class="container">
+    <form action="/members/login" method="post"> <!--로그인 폼-->
+        <div class="form-group">
+            <label for="email">이메일</label>
+            <input type="email" id="email" name="email" placeholder="이메일을 입력하세요">
+            <br>
+            <label for="pwd">비밀번호</label>
+            <input type="password" id="pwd" name="pwd" placeholder="비밀번호를 입력하세요">
+        </div>
+        <button type="submit">로그인</button>
+    </form>
+</div> <!-- /container -->
+</body>
+</html>
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/MemberController.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/MemberController.class.uniqueId0
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/MemberService.class.uniqueId1 b/build/tmp/compileJava/compileTransaction/stash-dir/MemberService.class.uniqueId1
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/src/main/java/com/landvibe/landlog/controller/MemberController.java b/src/main/java/com/landvibe/landlog/controller/MemberController.java
@@ -6,8 +6,10 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Optional;
 
 @Controller
 public class MemberController {
@@ -20,12 +22,14 @@ public MemberController(MemberService memberService) {
     @GetMapping(value = "/members/new")
     public String createForm() {
         return "members/createMemberForm";
-    }
+    } //회원가입 폼 반환
 
     @PostMapping(value = "/members/new")
-    public String create(MemberForm form) {
+    public String create(MemberForm form) { //새로운 회원생성, 회원가입 후 메인 페이지로 리다이렉트
         Member member = new Member();
         member.setName(form.getName());
+        member.setEmail(form.getEmail());
+        member.setPwd(form.getPwd());
         memberService.join(member);
         return "redirect:/";
     }
@@ -36,4 +40,33 @@ public String list(Model model) {
         model.addAttribute("members", members);
         return "members/memberList";
     }
+
+    @GetMapping(value = "/members/login")
+    public String loginForm() {
+        return "members/loginForm";
+    } //로그인 폼 반환
+
+    //로그인 폼 요청처리
+    @PostMapping(value = "/members/login")
+    public String login(@RequestParam String email, @RequestParam String pwd, Model model) {
+        try {
+            Member member = memberService.checkLogin(email, pwd); //로그인 성공여부 판단
+            model.addAttribute("member", member);
+            Long creatorId = member.getId();
+            return "redirect:/blogs?creatorId=" + creatorId;
+        } catch (IllegalArgumentException e) {
+            model.addAttribute("error", e.getMessage());
+            return "redirect:/";
+        }
+    }
+
+    @GetMapping(value = "/blogs")
+    public String blogForm(@RequestParam Long creatorId, Model model) {
+        Optional<Member> member = memberService.findOne(creatorId);
+        model.addAttribute("creatorId", creatorId);
+        Member member1 = member.get(); //'Member' 객체를 가져옴
+        model.addAttribute("name", member1.getName()); //여기서 넘겨줘야 blogList.html에서 사용가능
+        return "blogList";
+    }
+
 }
diff --git a/src/main/java/com/landvibe/landlog/controller/MemberForm.java b/src/main/java/com/landvibe/landlog/controller/MemberForm.java
@@ -2,6 +2,8 @@
 
 public class MemberForm {
     private String name;
+    private String email;
+    private String pwd;
 
     public String getName() {
         return name;
@@ -10,4 +12,21 @@ public String getName() {
     public void setName(String name) {
         this.name = name;
     }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getPwd() {
+        return pwd;
+    }
+
+    public void setPwd(String pwd) {
+        this.pwd = pwd;
+    }
+
 }
diff --git a/src/main/java/com/landvibe/landlog/domain/Member.java b/src/main/java/com/landvibe/landlog/domain/Member.java
@@ -4,13 +4,17 @@ public class Member {
 
     private Long id;
     private String name;
+    private String email;
+    private String pwd;
 
     public Member() {
     }
 
-    public Member(Long id, String name) {
+    public Member(Long id, String name, String email, String pwd) {
         this.id = id;
         this.name = name;
+        this.email = email;
+        this.pwd = pwd;
     }
 
     public Long getId() {
@@ -28,4 +32,20 @@ public String getName() {
     public void setName(String name) {
         this.name = name;
     }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getPwd() {
+        return pwd;
+    }
+
+    public void setPwd(String pwd) {
+        this.pwd = pwd;
+    }
 }
diff --git a/src/main/java/com/landvibe/landlog/repository/MemberRepository.java b/src/main/java/com/landvibe/landlog/repository/MemberRepository.java
@@ -13,5 +13,9 @@ public interface MemberRepository {
 
     Optional<Member> findByName(String name);
 
+    Optional<Member> findByEmail(String email);
+
+    Optional<Member> findByPwd(String pwd);
+
     List<Member> findAll();
 }
diff --git a/src/main/java/com/landvibe/landlog/repository/MemoryMemberRepository.java b/src/main/java/com/landvibe/landlog/repository/MemoryMemberRepository.java
@@ -30,6 +30,20 @@ public Optional<Member> findByName(String name) {
                 .findAny();
     }
 
+    @Override
+    public Optional<Member> findByEmail(String email) {
+        return store.values().stream()
+                .filter(member -> member.getEmail().equals(email))
+                .findAny();
+    }
+
+    @Override
+    public Optional<Member> findByPwd(String pwd) {
+        return store.values().stream()
+                .filter(member -> member.getPwd().equals(pwd))
+                .findAny();
+    }
+
     @Override
     public List<Member> findAll() {
         return new ArrayList<>(store.values());

diff --git a/src/main/java/com/landvibe/landlog/service/MemberService.java b/src/main/java/com/landvibe/landlog/service/MemberService.java
@@ -28,6 +28,13 @@ private void validateDuplicateMember(Member member) {
                 });
     }
 
+    //로그인 성공여부 판단
+    public Member checkLogin(String email, String pwd) {
+        return memberRepository.findByEmail(email) //먼저 이메일이 일치하는지 확인하고
+                .filter(member -> member.getPwd().equals(pwd)) //그 중에서 비번 일치하는지 확인
+                .orElseThrow(() -> new IllegalArgumentException("잘못된 이메일 또는 비밀번호입니다."));
+    }
+
     public List<Member> findMembers() {
         return memberRepository.findAll();
     }

diff --git a/src/main/resources/templates/blogList.html b/src/main/resources/templates/blogList.html
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<body>
+<div class="container">
+    <!--블로그 폼-->
+    <div>
+        <h1><span th:text="${name}"/>의 블로그</h1>
+    </div>
+</div> <!-- /container -->
+</body>
+</html>
diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html
@@ -6,6 +6,7 @@
         <h1>Hello Spring</h1>
         <p>회원 기능</p>
         <p>
+            <a href="/members/login">로그인</a>
             <a href="/members/new">회원 가입</a>
             <a href="/members">회원 목록</a>
         </p>

diff --git a/src/main/resources/templates/members/createMemberForm.html b/src/main/resources/templates/members/createMemberForm.html
@@ -2,10 +2,16 @@
 <html xmlns:th="http://www.thymeleaf.org">
 <body>
 <div class="container">
-    <form action="/members/new" method="post">
+    <form action="/members/new" method="post"> <!--회원가입 폼-->
         <div class="form-group">
             <label for="name">이름</label>
             <input type="text" id="name" name="name" placeholder="이름을 입력하세요">
+            <br>
+            <label for="email">이메일</label>
+            <input type="email" id="email" name="email" placeholder="이메일을 입력하세요">
+            <br>
+            <label for="pwd">패스워드</label>
+            <input type="password" id="pwd" name="pwd" placeholder="비밀번호를 입력하세요">
         </div>
         <button type="submit">등록</button>
     </form>

diff --git a/src/main/resources/templates/members/loginForm.html b/src/main/resources/templates/members/loginForm.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<body>
+<div class="container">
+    <form action="/members/login" method="post"> <!--로그인 폼-->
+        <div class="form-group">
+            <label for="email">이메일</label>
+            <input type="email" id="email" name="email" placeholder="이메일을 입력하세요">
+            <br>
+            <label for="pwd">비밀번호</label>
+            <input type="password" id="pwd" name="pwd" placeholder="비밀번호를 입력하세요">
+        </div>
+        <button type="submit">로그인</button>
+    </form>
+</div> <!-- /container -->
+</body>
+</html>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#Sun Aug 18 21:14:11 KST 2024
		gradle.version=7.6.1