Skip to content

Commit

Permalink
Conflict 해결
Browse files Browse the repository at this point in the history
  • Loading branch information
bongsh0112 committed Jul 24, 2022
2 parents 95d5040 + 8133c82 commit 5508f9e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/components/Tables/TicketsPage/TicketsPage.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import React from 'react';

function TicketsPage() {
return <div>TicketsPage</div>;
return <div>ㅁㄴㅇㄹㅁㄴㅇㄹㅁㄴㅇㄹ</div>;
}

export default TicketsPage;
4 changes: 2 additions & 2 deletions src/components/Tables/UsersPage/UsersPage.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import React from 'react';

function UsersPage() {
return <div>UsersPage</div>;
return <div>ㅁㄴㅇㄹㅁㄴㅇㄹ</div>;
}

export default UsersPage;
12 changes: 6 additions & 6 deletions src/hoc/AuthPass.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React from "react";
import { Navigate } from "react-router-dom";
import React from 'react';
import { Navigate } from 'react-router-dom';

import { useSelector } from "react-redux";
import { useSelector } from 'react-redux';

const requireAuth =
(Component) =>
Component =>
({ ...props }) => {
const { authenticated } = useSelector((state) => state.auth);
const { authenticated } = useSelector(state => state.auth);

console.log("인증 부분 검사", authenticated, !authenticated);
console.log('인증 부분 검사', authenticated, !authenticated);

return authenticated === false ? (
<Component {...props} />
Expand Down
2 changes: 1 addition & 1 deletion src/state/actions-creators/logout.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import TicketsApi from '../../apis/tickets/TicketsApi';
export const logout = callback => async dispatch => {
dispatch({ type: LOGOUT_USER });

localStorage.setItem('accessToken', null);
localStorage.removeItem('accessToken');
axios.defaults.headers.common.Authorization = null;

// 자동으로 피쳐로 넘어가게끔
Expand Down

0 comments on commit 5508f9e

Please sign in to comment.