-
diff --git a/build/resources/main/templates/members/loginForm.html b/build/resources/main/templates/members/loginForm.html
new file mode 100644
index 0000000..380ab27
--- /dev/null
+++ b/build/resources/main/templates/members/loginForm.html
@@ -0,0 +1,17 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/MemberController.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/MemberController.class.uniqueId0
new file mode 100644
index 0000000..57d985b
Binary files /dev/null and b/build/tmp/compileJava/compileTransaction/stash-dir/MemberController.class.uniqueId0 differ
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/MemberService.class.uniqueId1 b/build/tmp/compileJava/compileTransaction/stash-dir/MemberService.class.uniqueId1
new file mode 100644
index 0000000..0e4242b
Binary files /dev/null and b/build/tmp/compileJava/compileTransaction/stash-dir/MemberService.class.uniqueId1 differ
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index 1a81f91..9433f22 100644
Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/src/main/java/com/landvibe/landlog/controller/MemberController.java b/src/main/java/com/landvibe/landlog/controller/MemberController.java
index dcc95a3..feb6535 100644
--- 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 = 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
index 32d7a01..87bed17 100644
--- 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
index acadd35..d3594b1 100644
--- 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
index 0034fe9..714c4cd 100644
--- 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 findByName(String name);
+ Optional findByEmail(String email);
+
+ Optional findByPwd(String pwd);
+
List findAll();
}
diff --git a/src/main/java/com/landvibe/landlog/repository/MemoryMemberRepository.java b/src/main/java/com/landvibe/landlog/repository/MemoryMemberRepository.java
index d84e250..994b363 100644
--- 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 findByName(String name) {
.findAny();
}
+ @Override
+ public Optional findByEmail(String email) {
+ return store.values().stream()
+ .filter(member -> member.getEmail().equals(email))
+ .findAny();
+ }
+
+ @Override
+ public Optional findByPwd(String pwd) {
+ return store.values().stream()
+ .filter(member -> member.getPwd().equals(pwd))
+ .findAny();
+ }
+
@Override
public List 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
index c4ac876..a2991c5 100644
--- 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 findMembers() {
return memberRepository.findAll();
}
diff --git a/src/main/resources/templates/blogList.html b/src/main/resources/templates/blogList.html
new file mode 100644
index 0000000..d74467a
--- /dev/null
+++ b/src/main/resources/templates/blogList.html
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
의 블로그
+
생성
+
+
+
+
+
+ | # |
+ 제목 |
+ 내용 |
+
+
+
+
+ |
+ |
+ |
+
+
+
+
+
Hello Spring
회원 기능
+ 로그인
회원 가입
회원 목록
diff --git a/src/main/resources/templates/members/createMemberForm.html b/src/main/resources/templates/members/createMemberForm.html
index c0353f2..676e04e 100644
--- a/src/main/resources/templates/members/createMemberForm.html
+++ b/src/main/resources/templates/members/createMemberForm.html
@@ -2,10 +2,16 @@
-
diff --git a/src/main/resources/templates/members/loginForm.html b/src/main/resources/templates/members/loginForm.html
new file mode 100644
index 0000000..380ab27
--- /dev/null
+++ b/src/main/resources/templates/members/loginForm.html
@@ -0,0 +1,17 @@
+
+
+
+
+
+
\ No newline at end of file