LandvibeDev · haewonee · Aug 15, 2024 · Aug 15, 2024 · Aug 18, 2024 · Aug 18, 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/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 @@
+#Thu Aug 15 22:04:20 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,10 @@
+<!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
@@ -6,6 +6,13 @@
         <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="password">비밀번호</label>
+            <input type="password" id="password" name="password" placeholder="비밀번호를 입력하세요">
+            <br>
         </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,18 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<body>
+<div class="container">
+    <form action="/members/login" method="post">
+
+            <label for="email">이메일</label>
+            <input type="email" id="email" name="email" placeholder="이메일을 입력하세요">
+            <br>
+            <label for="password">비밀번호</label>
+            <input type="password" id="password" name="password" placeholder="비밀번호를 입력하세요">
+            <br>
+
+        <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/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 {
@@ -27,6 +29,8 @@ public String create(MemberForm form) {
         Member member = new Member();
         member.setName(form.getName());
         memberService.join(member);
+        member.setEmail(form.getEmail()); //추가
+        member.setPassword(form.getPassword());
         return "redirect:/";
     }
 
@@ -36,4 +40,33 @@ public String list(Model model) {
         model.addAttribute("members", members);
         return "members/memberList";
     }
+    //폼 데이터: 사용자가 HTML 폼을 통해 제출한 데이터, MemberForm은 사용자가 입력한 데이터를 담기위한 객체
+    //모델: 컨트롤러에서 처리된 결과를 뷰에 넘겨서 표시하기 위해 사용(사용자목록)
+    @PostMapping(value = "/members/login")
+    public String loginPost(MemberForm form, Model model){
+        String email = form.getEmail();
+        String password = form.getPassword();
+        Optional<Member> member = memberService.findByEmail(email);
+        if(member.isPresent()){ //비번일치-> 블로그페이지, 불일치->홈
+            if(member.get().getPassword().equals(password)){
+                return "redirect:/blogs?creatorId="+member.get().getId();
+            }
+            else{
+                return "redirect:/";
+            }
+        }
+        else{
+            return "redirect:/"; //로그인 실패
+        }
+    }
+    @GetMapping(value = "/members/login")
+    public String login(){
+        return "members/loginForm";
+    }
+    @GetMapping(value = "/blogs")
+    public String blog(@RequestParam("creatorId")Long Id,Model model){ //url에 적힌값 복사해서 변수에 넣기
+        Optional<Member> member = memberService.findOne(Id);
+        model.addAttribute("name",member.get().getName());
+        return "blogList";
+    }
 }
diff --git a/src/main/java/com/landvibe/landlog/controller/MemberForm.java b/src/main/java/com/landvibe/landlog/controller/MemberForm.java
@@ -1,13 +1,22 @@
 package com.landvibe.landlog.controller;
 
-public class MemberForm {
+public class MemberForm { // 게터세터추가
     private String name;
-
+    private String email;
+    private String password;
     public String getName() {
         return name;
     }
 
     public void setName(String name) {
         this.name = name;
     }
+
+    public String getEmail(){return email;}
+
+    public void setEmail(String email){this.email = email;}
+
+    public String getPassword(){return password;}
+
+    public void setPassword(String password){this.password = password;}
 }
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 password;
 
     public Member() {
     }
 
-    public Member(Long id, String name) {
+    public Member(Long id, String name,String email, String password) {
         this.id = id;
         this.name = name;
+        this.email = email;
+        this.password = password;
     }
 
     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 getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password){this.password=password;}
+
+
+
+
 }
diff --git a/src/main/java/com/landvibe/landlog/repository/MemberRepository.java b/src/main/java/com/landvibe/landlog/repository/MemberRepository.java
@@ -11,6 +11,8 @@ public interface MemberRepository {
 
     Optional<Member> findById(Long id);
 
+    Optional<Member> findByEmail(String email);
+
     Optional<Member> findByName(String name);
 
     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
@@ -4,38 +4,43 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.*;
-
+//디비 사용하지않는 메모리 기반 저장소.
 @Repository
 public class MemoryMemberRepository implements MemberRepository {
 
-    private static Map<Long, Member> store = new HashMap<>();
-    private static long sequence = 0L;
+    private static Map<Long, Member> store = new HashMap<>(); // ID, 회원객체
+    private static long sequence = 0L; //회원ID자동증가를 위한 변수
 
     @Override
-    public Member save(Member member) {
+    public Member save(Member member) { //새로운 회원 저장 sequence증가시켜 새로운 회원 ID생성
         member.setId(++sequence);
-        store.put(member.getId(), member);
-        return member;
+        store.put(member.getId(), member); // 해당 ID를 member객체에 설정
+        return member; 
     }
 
     @Override
     public Optional<Member> findById(Long id) {
         return Optional.ofNullable(store.get(id));
     }
-
+    //주어진 ID에 해당하는 회원 찾기. 
     @Override
-    public Optional<Member> findByName(String name) {
+    public Optional<Member> findByName(String name) { //주어진 이름에 해당하는 회원 찾기
         return store.values().stream()
                 .filter(member -> member.getName().equals(name))
                 .findAny();
     }
-
+    @Override
+    public Optional<Member> findByEmail(String email){
+        return store.values().stream()
+                .filter(member -> member.getEmail().equals(email))
+                .findAny();
+    }
     @Override
     public List<Member> findAll() {
         return new ArrayList<>(store.values());
-    }
+    } //저장된 모든회원 ArrayList로 변환하여 반환
 
     public void clearStore() {
         store.clear();
-    }
+    } //store에 저장된 모든 회원 데이터 삭제
 }
diff --git a/src/main/java/com/landvibe/landlog/service/MemberService.java b/src/main/java/com/landvibe/landlog/service/MemberService.java
@@ -15,9 +15,9 @@ public MemberService(MemberRepository memberRepository) {
         this.memberRepository = memberRepository;
     }
 
-    public Long join(Member member) {
+    public Long join(Member member) { //새로운 회원 등록+ 중복검증
         validateDuplicateMember(member); //중복 회원 검증
-        memberRepository.save(member);
+        memberRepository.save(member); //회원객체저장역할
         return member.getId();
     }
 
@@ -32,6 +32,7 @@ public List<Member> findMembers() {
         return memberRepository.findAll();
     }
 
+    public Optional<Member> findByEmail(String email){return memberRepository.findByEmail(email);}
     public Optional<Member> findOne(Long memberId) {
         return memberRepository.findById(memberId);
     }

diff --git a/src/main/resources/templates/blogList.html b/src/main/resources/templates/blogList.html
@@ -0,0 +1,10 @@
+<!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
@@ -6,6 +6,13 @@
         <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="password">비밀번호</label>
+            <input type="password" id="password" name="password" placeholder="비밀번호를 입력하세요">
+            <br>
         </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,18 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<body>
+<div class="container">
+    <form action="/members/login" method="post">
+
+            <label for="email">이메일</label>
+            <input type="email" id="email" name="email" placeholder="이메일을 입력하세요">
+            <br>
+            <label for="password">비밀번호</label>
+            <input type="password" id="password" name="password" placeholder="비밀번호를 입력하세요">
+            <br>
+
+        <button type="submit">로그인</button>
+    </form>
+</div> <!-- /container -->
+</body>
+</html>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#Thu Aug 15 22:04:20 KST 2024
		gradle.version=7.6.1