Skip to content

Commit

Permalink
Merge pull request #76 from Bae-chaegyeom/Mypage
Browse files Browse the repository at this point in the history
[client] / #11,13,14,15 / Fix Small Bug
  • Loading branch information
GriGni authored Nov 19, 2020
2 parents 42d115d + 22e017f commit 15629e1
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions my-app/src/components/Func_page/modal/NavMenuModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ export default class NavMenuModal extends React.Component {
handleLogout() {
// axios({
// method: 'post',
// url: 'http://13.209.99.91:3001/user/signout',
// url: 'https://togolist-server.ml/user/signout',
// }
// ).then(res => {
// console.log(res)
// console.log('왜실행되는거야?',res)
// localStorage.removeItem('isLogin')
// this.props.history.push("/")
// }
Expand Down Expand Up @@ -53,7 +53,7 @@ export default class NavMenuModal extends React.Component {
</div>
<div className="modal_body">
<div className="menu_name">
<Link onClick={() => {this.handleLogout()}} to='/'>로그아웃</Link>
<Link to='/' onClick={this.handleLogout} >로그아웃</Link>
</div>
</div>
<div className="modal_body">
Expand Down
2 changes: 1 addition & 1 deletion my-app/src/components/Mypage/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Footer extends React.Component {
handleUserRemove = () => {
axios({
method: 'post',
url: 'http://13.209.99.91:3001/user/remove',
url: 'https://togolist-server.ml/user/remove',
},{withCredentials :true}
).then((res) => {
localStorage.removeItem('isLogin')
Expand Down
6 changes: 3 additions & 3 deletions my-app/src/components/Mypage/Nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ class Nav extends React.Component {
this.state = {

}
this.handleLogout = this.handleLogout.bind(this)
// this.handleLogout = this.handleLogout.bind(this)
}
handleLogout() {


axios({
method: 'post',
url: 'http://13.209.99.91:3001/user/signout',
url: 'https://togolist-server.ml/user/signout',
}
).then(res => {
console.log(res)
Expand All @@ -41,7 +41,7 @@ class Nav extends React.Component {
</Link>
</div>
<div className="Mypage_logout_btn_box">
<Link to='/' className="Mypage_logout_btn" onClick={() => { this.handleLogout() }}>
<Link to='/' className="Mypage_logout_btn" onClick={this.handleLogout}>
로그아웃
</Link>
</div>
Expand Down
8 changes: 4 additions & 4 deletions my-app/src/routes/Signup.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ class Signup extends React.Component {

{
axios
.post("http://13.209.99.91:3001/user/signup", {
.post("https://togolist-server.ml/user/signup", {
email: email,
password: password,
passwordCheck: passwordCheck,
name: name,
username: name,
birthDay: birthDay,
mobile: mobile
phonenum: mobile
})
this.props.history.push("/signin");
}
Expand All @@ -95,7 +95,7 @@ class Signup extends React.Component {
<div className="signup_frame">
<div className="login_logo">
<Link to='/' className="signup_link">
<img className="signup_page_logo" src="https://s3.us-west-2.amazonaws.com/secure.notion-static.com/ef8084f5-733a-43ab-bd87-e1c17835ce76/logo-black.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAT73L2G45O3KS52Y5%2F20201114%2Fus-west-2%2Fs3%2Faws4_request&X-Amz-Date=20201114T160641Z&X-Amz-Expires=86400&X-Amz-Signature=ca905a346ec454def0012675fc9abce879419a84139d5f7775b9241f210fd604&X-Amz-SignedHeaders=host&response-content-disposition=filename%20%3D%22logo-black.png%22" />
<img className="signup_page_logo" src="http://penzim.synology.me/image/To-Go_List-logo-black.png" />
<img className="signup_page_text_logo" src="http://penzim.synology.me/image/firstProject/icon/To-Go_List-logo-black.png" />
</Link>

Expand Down

0 comments on commit 15629e1

Please sign in to comment.