Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 이메일 초대 수정 #115

Merged
merged 1 commit into from
Mar 13, 2024
Merged

feat: 이메일 초대 수정 #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function App() {
<BrowserRouter>
<Routes>
<Route path="/" element={<AuthPage />} />
<Route path="/main" element={<Mainpage />} />
<Route path="/main/*" element={<Mainpage />} />
<Route path="/login" element={<LoginPage />} />
<Route path="/signup" element={<SignupPage />} />
<Route path="/editProfile" element={<UserProfileEdit />} />
Expand Down
49 changes: 29 additions & 20 deletions frontend/src/Component/Auth/LoginPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import React, { useState } from "react";
import { useNavigate } from "react-router-dom";
import styled from "styled-components";
import toastr from "toastr";
import "toastr/build/toastr.css";

import GoogleLoginBtn from "../../image/googleLoginBtn.png";

const LoginPage = () => {
Expand Down Expand Up @@ -46,7 +49,10 @@ const LoginPage = () => {
localStorage.setItem("userId", userId); // 백엔드로부터 받은 유저 (고유)아이디
localStorage.setItem("nickname", name); // 백엔드로부터 받은 유저 닉네임
localStorage.setItem("email", email); // 로그인한 아이디
localStorage.removeItem("token");
if (token != undefined){
localStorage.removeItem('token');
toastr.success("초대 수락 완료!");
}
navigate("/main");
}
} else {
Expand All @@ -64,7 +70,8 @@ const LoginPage = () => {
};
return (
<Container>
<ContentWrapper>
<ContentWrapper>
<form onSubmit={handleSubmit}> {/* 폼 요소 추가 */}
<p style={{ fontWeight: "bold", fontSize: "25px" }}>로그인</p>
<Email_InputWrapper>
이메일
Expand All @@ -86,24 +93,26 @@ const LoginPage = () => {
value={password}
/>
</Password_InputWrapper>
<LoginBtn onClick={handleSubmit}>로그인</LoginBtn>
<IsNotUser>
<p style={{ display: "inline", margin: "0", marginRight: "8px" }}>
<small>회원이 아니신가요?</small>
</p>
<SignupBtn onClick={() => navigate("/signup")}>
<small>회원가입하기</small>
</SignupBtn>
</IsNotUser>
<GoogleLoginBtnContainer>
<GoogleLoginImg
src={GoogleLoginBtn}
alt="Google Login Button"
onClick={() => navigate("/signup")}
/>
</GoogleLoginBtnContainer>
</ContentWrapper>
</Container>
<LoginBtn type="submit">로그인</LoginBtn>
</form>
<IsNotUser>
<p style={{ display: "inline", margin: "0", marginRight: "8px" }}>
<small>회원이 아니신가요?</small>
</p>
<SignupBtn onClick={() => navigate("/signup")}>
<small>회원가입하기</small>
</SignupBtn>
</IsNotUser>
<GoogleLoginBtnContainer>
<GoogleLoginImg
src={GoogleLoginBtn}
alt="Google Login Button"
onClick={() => navigate("/signup")}
/>
</GoogleLoginBtnContainer>
</ContentWrapper>
</Container>

);
};

Expand Down
98 changes: 50 additions & 48 deletions frontend/src/Component/Auth/SignupPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,54 +115,56 @@ const SignupPage = () => {
return (
<Container>
<ContentWrapper>
<p style={{ fontWeight: "bold", fontSize: "25px" }}>회원가입</p>
<Email_InputWrapper>
이메일(ID)
<Email_Input
name="email"
type="text"
placeholder="이메일을 입력하세요."
onChange={handleInputChange} // 이 부분을 추가
value={email}
/>
<Email_Duplicate_CheckBtn onClick={handleEmailDuplicateCheck}>
중복확인
</Email_Duplicate_CheckBtn>
</Email_InputWrapper>
<Nickname_InputWrapper>
닉네임
<Nickname_Input
name="nickname"
type="text"
placeholder="닉네임을 입력하세요."
onChange={handleInputChange}
value={nickname}
/>
<Nickname_Duplicate_CheckBtn onClick={handleNicknameDuplicateCheck}>
중복확인
</Nickname_Duplicate_CheckBtn>{" "}
</Nickname_InputWrapper>
<Password_InputWrapper>
비밀번호
<Password_Input
name="password" // 올바른 name 속성 값으로 변경
type="password"
placeholder="비밀번호를 입력해주세요."
value={password}
onChange={handleInputChange} // 이 부분을 추가
/>
</Password_InputWrapper>
<Passwordcheck_InputWrapper>
비밀번호 확인
<Passwordcheck_Input
name="passwordCheck" // 올바른 name 속성 값으로 변경
type="password"
placeholder="비밀번호를 한 번 더 입력해주세요."
value={passwordCheck}
onChange={handleInputChange} // 이 부분을 추가}
/>
</Passwordcheck_InputWrapper>
<SignupBtn onClick={handleSubmit}>회원가입</SignupBtn>
<form onSubmit={handleSubmit}>
<p style={{ fontWeight: "bold", fontSize: "25px" }}>회원가입</p>
<Email_InputWrapper>
이메일(ID)
<Email_Input
name="email"
type="text"
placeholder="이메일을 입력하세요."
onChange={handleInputChange}
value={email}
/>
<Email_Duplicate_CheckBtn onClick={handleEmailDuplicateCheck}>
중복확인
</Email_Duplicate_CheckBtn>
</Email_InputWrapper>
<Nickname_InputWrapper>
닉네임
<Nickname_Input
name="nickname"
type="text"
placeholder="닉네임을 입력하세요."
onChange={handleInputChange}
value={nickname}
/>
<Nickname_Duplicate_CheckBtn onClick={handleNicknameDuplicateCheck}>
중복확인
</Nickname_Duplicate_CheckBtn>{" "}
</Nickname_InputWrapper>
<Password_InputWrapper>
비밀번호
<Password_Input
name="password"
type="password"
placeholder="비밀번호를 입력해주세요."
value={password}
onChange={handleInputChange}
/>
</Password_InputWrapper>
<Passwordcheck_InputWrapper>
비밀번호 확인
<Passwordcheck_Input
name="passwordCheck"
type="password"
placeholder="비밀번호를 한 번 더 입력해주세요."
value={passwordCheck}
onChange={handleInputChange}
/>
</Passwordcheck_InputWrapper>
<SignupBtn type="submit">회원가입</SignupBtn>
</form>
<HomeBtn onClick={() => navigate("/")}>
<small>홈으로 돌아가기</small>
</HomeBtn>
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/Component/Page/Page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import { keymap } from "prosemirror-keymap";


import { updateImageNode, imagePlugin } from "prosemirror-image-plugin";
import "./ProseMirror_css/prosemirror_image_plugin/common.css";
import "./ProseMirror_css/prosemirror_image_plugin/withResize.css";
import "./ProseMirror_css/prosemirror_image_plugin/sideResize.css";
import "./ProseMirror_css/prosemirror_image_plugin/withoutResize.css";
import "./ProseMirror_css/ProseMirror.css";
import "./prosemirror_css/prosemirror_image_plugin/common.css";
import "./prosemirror_css/prosemirror_image_plugin/withResize.css";
import "./prosemirror_css/prosemirror_image_plugin/sideResize.css";
import "./prosemirror_css/prosemirror_image_plugin/withoutResize.css";
import "./prosemirror_css/ProseMirror.css";

// yjs 라이브러리(동시편집)
import { WebsocketProvider } from "y-websocket";
Expand Down
11 changes: 5 additions & 6 deletions frontend/src/Component/Utils/EmailTokenHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const EmailTokenHandler = () => {
localStorage.setItem('token', token);
}

if (isLoggedIn){
if (token && isLoggedIn()){
fetchEmailInvitationToken();
}
}, [location]);
Expand All @@ -29,8 +29,6 @@ const EmailTokenHandler = () => {
try {
const userId = localStorage.getItem('userId');
const token = localStorage.getItem('token');
console.log(userId);
console.log(token);
const response = await fetch("/api/user/organization/invitation/accept", {
method: "POST",
headers: {
Expand All @@ -43,16 +41,17 @@ const EmailTokenHandler = () => {

if (response.ok) {
if (contentType && contentType.includes('text/plain')) {
localStorage.removeItem("token");
const responseMessage = await response.text();
toastr.success(responseMessage);
}
} else {
const errorMessage = await response.text();
toastr.error(errorMessage);
}
} catch (error) {
console.error("Error: ", error);
localStorage.removeItem("token");
toastr.error("에러가 발생했습니다.");
}
localStorage.removeItem("token");
}

if (isLoggedIn()) {
Expand Down
Loading