-
{
- setDay(day);
- handleSegment(day);
- }}
- />
+
+ {
+ setDay(day);
+ handleSegment(day);
+ if (day === 'ALL') {
+ setOption('총');
+ } else if (day === 'BOTH') {
+ setOption('양일권');
+ } else {
+ setOption(day);
+ }
+ }}
+ />
+ }
+ color="default"
+ style={{
+ margin: '4px 0 0 10px',
+ justifyContent: 'center',
+ alignItems: 'center',
+ height: '50%'
+ }}
+ >
+ {option} 주문 수: {data ? data.total : ''}
+
+
{
- console.log(' id값 : ', id);
dispatch(changeState({ id, e }, message));
};
const onPageChange = e => {
- console.log(e);
setPage(e);
if (value === 'All') {
dispatch(
@@ -47,7 +46,6 @@ function TicketsPage() {
);
}
};
- console.log(data);
useEffect(() => {
dispatch(
@@ -94,27 +92,35 @@ function TicketsPage() {
return (
<>
- {
- if (value === 'OB') {
- setValue(value);
- //handlefilt(value);
- console.log(value);
- handlefilt(value);
- } else if (value === 'YB') {
- setValue(value);
- //handlefilt(value);
- console.log(value);
- handlefilt(value);
- } else if (value === 'All') {
- setValue(value);
- console.log(value);
- handlefilt(value);
- }
- }}
- />
+
+
+ {
+ if (value === 'OB') {
+ setValue(value);
+ //handlefilt(value);
+ console.log(value);
+ handlefilt(value);
+ } else if (value === 'YB') {
+ setValue(value);
+ //handlefilt(value);
+ console.log(value);
+ handlefilt(value);
+ } else if (value === 'All') {
+ setValue(value);
+ console.log(value);
+ handlefilt(value);
+ }
+ }}
+ />
+ } color="default">
+ 총 티켓 수:{data ? data.meta.itemCount : ''}
+
+
+
+
{
// return {
// onClick: event => {
- // console.log(event, record);
// onStopClickHandler(record);
// } // click row
// };
diff --git a/src/components/Tables/UsersPage/Table.js b/src/components/Tables/UsersPage/Table.js
index e53fe9d..5216191 100644
--- a/src/components/Tables/UsersPage/Table.js
+++ b/src/components/Tables/UsersPage/Table.js
@@ -13,7 +13,6 @@ function UsersPageTable() {
const [page, setPage] = useState(1);
const onPageChange = e => {
- console.log('page', { data });
// 페이지네이션 번호 바뀔때 뜸.
setPage(e);
dispatch(
@@ -26,7 +25,6 @@ function UsersPageTable() {
};
useEffect(() => {
- console.log('search option: ', option.searchOption, option.searchString);
dispatch(
usersPage({
searchOption: option ? option.searchOption : '',
diff --git a/src/components/Tickets/CheckPage/CheckPage.js b/src/components/Tickets/CheckPage/CheckPage.js
index c08e1b3..61064db 100644
--- a/src/components/Tickets/CheckPage/CheckPage.js
+++ b/src/components/Tickets/CheckPage/CheckPage.js
@@ -14,8 +14,7 @@ import { message } from 'antd';
function CheckPage() {
const dispatch = useDispatch();
const location = useLocation();
- const sucAudio = new Audio(process.env.PUBLIC_URL + '/successSound.mp3');
- const errAudio = new Audio(process.env.PUBLIC_URL + '/errorSound.mp3');
+ const qrAudio = new Audio(process.env.PUBLIC_URL + '/qrSound.mp3');
const { data, pending, count } = useSelector(state => state.checkPage);
@@ -23,9 +22,6 @@ function CheckPage() {
if (!history.location.state) {
history.push('ticket/checkenter');
}
-
- // console.log('history.location.state:', history.location.state); //result: '{date: 'OB', cam: 'environment'}'
- // console.log('location:', location); //result: '{pathname: '/tickets/check', search: '', hash: '', state: {…}, key: 'xf82gqmb'}'
}, [location]);
const handleScan = (result, error) => {
@@ -34,13 +30,11 @@ function CheckPage() {
{ uuid: result ? result.text : null },
{ date: history.location.state.date },
message,
- { sucAudio },
- { errAudio }
+ { qrAudio }
)
);
dispatch(checkCount());
- // console.log('count:', count);
};
return (
diff --git a/src/contexts/socketProvider.js b/src/contexts/socketProvider.js
index 8dde7cd..4e8b674 100644
--- a/src/contexts/socketProvider.js
+++ b/src/contexts/socketProvider.js
@@ -11,6 +11,9 @@ const SocketProvider = ({ children }) => {
const dispatch = useDispatch();
const { accessToken } = useSelector(state => state.auth);
const placement = 'bottomRight';
+ const notificationAudio = new Audio(
+ process.env.PUBLIC_URL + '/notificationSound.mp3'
+ );
const socket = io('https://api.gosrock.band/socket/admin', {
auth: {
@@ -19,9 +22,7 @@ const SocketProvider = ({ children }) => {
});
useEffect(() => {
- socket.on('connect', data => {
- console.log('connection server', data);
- });
+ socket.on('connect', data => {});
socket.on('enter', data => {
dispatch(
enterPage({
@@ -43,6 +44,7 @@ const SocketProvider = ({ children }) => {
)
});
+ notificationAudio.play();
});
return () => {
@@ -50,11 +52,7 @@ const SocketProvider = ({ children }) => {
};
}, []);
- socket.on('connect_error', err => {
- console.log(err instanceof Error); // true
- console.log(err.message); // not authorized
- console.log(err.data); // { content: "Please retry later" }
- });
+ socket.on('connect_error', err => {});
return {children};
};
diff --git a/src/hoc/AuthPass.js b/src/hoc/AuthPass.js
index 5b1ef5b..45b9e2d 100644
--- a/src/hoc/AuthPass.js
+++ b/src/hoc/AuthPass.js
@@ -8,8 +8,6 @@ const requireAuth =
({ ...props }) => {
const { authenticated } = useSelector(state => state.auth);
- console.log('인증 부분 검사', authenticated, !authenticated);
-
return authenticated === false ? (
) : (
diff --git a/src/hoc/requireAuth.js b/src/hoc/requireAuth.js
index 562e22a..a27ce5d 100644
--- a/src/hoc/requireAuth.js
+++ b/src/hoc/requireAuth.js
@@ -1,14 +1,12 @@
-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);
-
- console.log("인증 부분 검사", authenticated, !authenticated);
+ const { authenticated } = useSelector(state => state.auth);
return authenticated !== false ? (
diff --git a/src/state/actions-creators/CheckPage.js b/src/state/actions-creators/CheckPage.js
index 1f1d919..e319069 100644
--- a/src/state/actions-creators/CheckPage.js
+++ b/src/state/actions-creators/CheckPage.js
@@ -8,10 +8,9 @@ import {
import { store } from '../storeSetting.js';
export const checkPage =
- ({ uuid }, { date }, message, { sucAudio }, { errAudio }, callback) =>
+ ({ uuid }, { date }, message, { qrAudio }, callback) =>
async dispatch => {
const { checkPage } = store.getState();
- // console.log();
if (uuid && checkPage.count > 4) {
try {
dispatch({ type: CHECKING_PENDING });
@@ -22,10 +21,8 @@ export const checkPage =
date: `${date}`
}
);
- console.log('서버 응답?', response);
- console.log('uuid, date: ', uuid, ',,,,', date);
- sucAudio.play();
+ qrAudio.play();
message.success('조회에 성공했습니다. 입장이 가능합니다.');
dispatch({ type: CHECKING_SUCCESS, payload: '조회 성공' });
@@ -34,11 +31,9 @@ export const checkPage =
} catch (e) {
//400 ~ 에러 타입에 따라서 경고메세지 다르게 표시
// dispatch({ type: CHECKING_ERROR, payload: error });
- // console.log('ERROR: ', error.response.data.error.message);
const ERROR = e.response.data.error.message;
- console.log('ERROR:', ERROR);
- errAudio.play();
+ qrAudio.play();
message.warn(`${ERROR}`);
dispatch({ type: CHECKING_ERROR, payload: e });
}
diff --git a/src/state/actions-creators/LandingPage.js b/src/state/actions-creators/LandingPage.js
index 1de2ed7..88a00d1 100644
--- a/src/state/actions-creators/LandingPage.js
+++ b/src/state/actions-creators/LandingPage.js
@@ -6,7 +6,6 @@ export const LandingPage = callback => async dispatch => {
const response = await axios.get(
`https://api.gosrock.band/v1/orders/report`
);
- console.log(response.data.data);
const newData = response.data.data;
const data = {
@@ -26,7 +25,6 @@ export const LandingPage = callback => async dispatch => {
// callback();
} catch (e) {
//400 ~
- console.log(e);
dispatch({ type: LANDING_PAGE_ERROR, payload: '조회 실패' });
}
};
diff --git a/src/state/actions-creators/enterPage.js b/src/state/actions-creators/enterPage.js
index dbd7264..9272e36 100644
--- a/src/state/actions-creators/enterPage.js
+++ b/src/state/actions-creators/enterPage.js
@@ -16,8 +16,6 @@ export const enterPage =
};
dispatch({ type: ENTER_PAGE_SUCCESS, payload: enterData });
-
- console.log('enterPage data', data);
} catch (e) {
dispatch({ type: ENTER_PAGE_ERROR, payload: '입장실패' });
}
diff --git a/src/state/actions-creators/examplePagination.js b/src/state/actions-creators/examplePagination.js
index 2fec126..6c6de1f 100644
--- a/src/state/actions-creators/examplePagination.js
+++ b/src/state/actions-creators/examplePagination.js
@@ -18,7 +18,6 @@ export const examplePagination =
const response = await axios.get(
'https://api.gosrock.band/v1/tickets/find?order=ASC&page=1&take=10'
);
- console.log('포토 조회액션', response);
const data = {
total: response.data.data.meta.itemCount,
diff --git a/src/state/actions-creators/logout.js b/src/state/actions-creators/logout.js
index e9f6f15..7fb5d32 100644
--- a/src/state/actions-creators/logout.js
+++ b/src/state/actions-creators/logout.js
@@ -12,7 +12,6 @@ export const logout = callback => async dispatch => {
// 자동으로 피쳐로 넘어가게끔
history.push('/auth/login');
TicketsApi.expireAccessTokne();
- console.log(TicketsApi.axiosInstance.defaults.headers);
callback();
};
diff --git a/src/state/actions-creators/orderListPagination.js b/src/state/actions-creators/orderListPagination.js
index 76d9436..d6c4768 100644
--- a/src/state/actions-creators/orderListPagination.js
+++ b/src/state/actions-creators/orderListPagination.js
@@ -30,7 +30,6 @@ export const orderListPagination =
// }
// }
);
- console.log('티켓 조회', response);
const data = {
total: response.data.data.meta.itemCount,
@@ -67,7 +66,6 @@ export const orderListReq =
}
}
);
- console.log('조건부 티켓 조회', response);
const data = {
total: response.data.data.meta.itemCount,
@@ -89,11 +87,7 @@ export const orderStatusChange =
({ id, e }, message) =>
async dispatch => {
try {
- console.log('ID: ', id);
- console.log('STATUS: ', e);
-
const intID = parseInt(id);
- console.log(intID);
message.config({ maxCount: 3 });
@@ -102,12 +96,10 @@ export const orderStatusChange =
`https://api.gosrock.band/v1/orders/status`,
{ orderId: intID, status: e }
);
- console.log(response);
message.success(`${id}주문의 상태를 ${e}으로 변경성공`);
dispatch({ type: SET_ORDER_STATUS, payload: response.data.data });
} catch (e) {
- console.log(e);
dispatch({ type: SET_ORDER_STATUS_ERROR, payload: e.response.data });
}
};
@@ -123,7 +115,6 @@ export const orderPriceChange =
dispatch({ type: SET_FREE_ORDER, payload: response.data.data });
} catch (error) {
- console.log(error);
dispatch({ type: SET_FREE_ORDER_ERROR, payload: error.response.data });
}
};
diff --git a/src/state/actions-creators/randomCom.js b/src/state/actions-creators/randomCom.js
index a1b10f7..129a215 100644
--- a/src/state/actions-creators/randomCom.js
+++ b/src/state/actions-creators/randomCom.js
@@ -7,14 +7,11 @@ export const randomCom = callback => async dispatch => {
`https://api.gosrock.band/v1/users/random/comment/userInfo?take=5`
);
- console.log(response.data);
-
const randm = {
_list: response.data.data
};
dispatch({ type: RANDOM_SUCCESS, payload: randm });
} catch (e) {
dispatch({ type: RANDOM_ERROR, payload: '조회실패' });
- console.log(e);
}
};
diff --git a/src/state/actions-creators/slackMessage.js b/src/state/actions-creators/slackMessage.js
index 63addb0..46fece7 100644
--- a/src/state/actions-creators/slackMessage.js
+++ b/src/state/actions-creators/slackMessage.js
@@ -31,7 +31,6 @@ export const slackMessage =
// slackEmail,
// }
// );
- // console.log(response);
dispatch({
type: SLACK_MESSAGE_SUCCESS,
diff --git a/src/state/actions-creators/slackValidation.js b/src/state/actions-creators/slackValidation.js
index 07846d0..9d6137c 100644
--- a/src/state/actions-creators/slackValidation.js
+++ b/src/state/actions-creators/slackValidation.js
@@ -22,7 +22,6 @@ export const slackValidation =
validationNumber
});
- console.log(response.data.data);
const adminAccessToken = response.data.data.accessToken;
localStorage.setItem('accessToken', adminAccessToken);
axios.defaults.headers.common.Authorization = `Bearer ${adminAccessToken}`;
@@ -38,7 +37,6 @@ export const slackValidation =
callback();
} catch (e) {
//400 ~
- console.log(e);
alert(e.response.data.message);
dispatch({
type: SLACK_VALIDATION_FAIL,
diff --git a/src/state/actions-creators/ticketPagination.js b/src/state/actions-creators/ticketPagination.js
index 2d8257c..e54c40b 100644
--- a/src/state/actions-creators/ticketPagination.js
+++ b/src/state/actions-creators/ticketPagination.js
@@ -16,12 +16,12 @@ export const ticketPagination =
const response = await axios.get(
`https://api.gosrock.band/v1/tickets/find?&order=DESC&page=${requestPage}&take=10`
);
- console.log(response.data);
const data = {
total: response.data.data.meta.itemCount,
currentPage: requestPage,
- ticketList: response.data.data.data
+ ticketList: response.data.data.data,
+ meta: response.data.data.meta
};
dispatch({ type: TICKET_PAGINATION_SUCCESS, payload: data });
@@ -40,20 +40,16 @@ export const changeState =
try {
message.config({ maxCount: 1 });
message.loading(`${id} 상태 ${e}으로 처리중`);
- // console.log('ticketId:', id);
- // console.log('status:', e);
const response = await axios.patch(
`https://api.gosrock.band/v1/tickets/status`,
{ ticketId: id, status: e }
);
- console.log(response.data);
// message.destory();
message.success(`${id}티켓 상태 ${e}으로 변경 성공`);
dispatch({ type: STATE_CHANGE, payload: response.data.data });
} catch (e) {
- console.log(e);
dispatch({
type: STATE_CHANGE_ERROR,
payload: e.response.data
@@ -78,12 +74,12 @@ export const ticketPagi =
}
}
);
- console.log(response.data);
const data = {
total: response.data.data.meta.itemCount,
currentPage: page,
- ticketList: response.data.data.data
+ ticketList: response.data.data.data,
+ meta: response.data.data.meta
};
dispatch({ type: TICKET_PAGINATION_SUCCESS, payload: data });
diff --git a/src/state/actions-creators/userLookup.js b/src/state/actions-creators/userLookup.js
index e6fa26a..196a5c2 100644
--- a/src/state/actions-creators/userLookup.js
+++ b/src/state/actions-creators/userLookup.js
@@ -1,30 +1,29 @@
-import axios from "axios";
+import axios from 'axios';
import {
GET_USER_LOOKUP,
GET_USER_LOOKUP_SUCCESS,
- GET_USER_LOOKUP_ERROR,
-} from "../action-types";
+ GET_USER_LOOKUP_ERROR
+} from '../action-types';
export const userLookup =
({ searchOption, page, searchString }, callback) =>
- async (dispatch) => {
+ async dispatch => {
try {
dispatch({ type: GET_USER_LOOKUP });
- const response = await axios.get("/api/admin/user/lookup", {
+ const response = await axios.get('/api/admin/user/lookup', {
params: {
searchOption,
page,
- searchString,
- },
+ searchString
+ }
});
- console.log("유저 조회 액션", response);
const data = {
userCount: response.data.data.userCount,
totalPage: response.data.data.totalPage,
currentPage: page,
- userList: response.data.data.userList,
+ userList: response.data.data.userList
};
dispatch({ type: GET_USER_LOOKUP_SUCCESS, payload: data });
@@ -33,6 +32,6 @@ export const userLookup =
// callback();
} catch (e) {
//400 ~
- dispatch({ type: GET_USER_LOOKUP_ERROR, payload: "조회 실패" });
+ dispatch({ type: GET_USER_LOOKUP_ERROR, payload: '조회 실패' });
}
};
diff --git a/src/state/actions-creators/usersPage.js b/src/state/actions-creators/usersPage.js
index 0a81d9b..b9c4d48 100644
--- a/src/state/actions-creators/usersPage.js
+++ b/src/state/actions-creators/usersPage.js
@@ -26,8 +26,6 @@ export const usersPage =
}
);
- console.log('포토 조회액션1', response);
-
const data = {
total: response.data.data.meta.itemCount,
currentPage: requestPage,
diff --git a/src/state/reducers/examplePagination.js b/src/state/reducers/examplePagination.js
index f4fa532..25b5e2a 100644
--- a/src/state/reducers/examplePagination.js
+++ b/src/state/reducers/examplePagination.js
@@ -24,10 +24,8 @@ export default function (
switch (action.type) {
// case USER_STATE_TO_STOP_SUCCESS:
// // 해당 변경된 아이디를 찾아서 정보를 변경합니다.
- // console.log("asdfasdfadsfas", action.payload);
// const newUserList = state.data.userList.map((element) => {
// if (element._id === action.payload._id) {
- // console.log("find", element._id);
// return action.payload;
// }
// return element;
@@ -45,7 +43,6 @@ export default function (
// case USER_STATE_TO_NORMAL_SUCCESS:
// const newNORMALUserList = state.data.userList.map((element) => {
// if (element._id === action.payload._id) {
- // console.log("find", element._id);
// return action.payload;
// }
// return element;
diff --git a/src/state/reducers/ticketPagination.js b/src/state/reducers/ticketPagination.js
index 1c0fe4f..c2fbe63 100644
--- a/src/state/reducers/ticketPagination.js
+++ b/src/state/reducers/ticketPagination.js
@@ -12,7 +12,8 @@ export default function (
data: {
totalPage: 0,
currentPage: 1,
- ticketList: []
+ ticketList: [],
+ meta: []
},
error: null,
pending: false
@@ -22,10 +23,8 @@ export default function (
switch (action.type) {
// case USER_STATE_TO_STOP_SUCCESS:
// // 해당 변경된 아이디를 찾아서 정보를 변경합니다.
- // console.log("asdfasdfadsfas", action.payload);
// const newUserList = state.data.userList.map((element) => {
// if (element._id === action.payload._id) {
- // console.log("find", element._id);
// return action.payload;
// }
// return element;
@@ -43,7 +42,6 @@ export default function (
// case USER_STATE_TO_NORMAL_SUCCESS:
// const newNORMALUserList = state.data.userList.map((element) => {
// if (element._id === action.payload._id) {
- // console.log("find", element._id);
// return action.payload;
// }
// return element;
diff --git a/src/state/storeSetting.js b/src/state/storeSetting.js
index b261222..0944f2b 100644
--- a/src/state/storeSetting.js
+++ b/src/state/storeSetting.js
@@ -1,23 +1,22 @@
import {
legacy_createStore as createStore,
applyMiddleware,
- compose,
-} from "redux";
-import reduxThunk from "redux-thunk";
-import reducers from "./reducers";
-import axios from "axios";
+ compose
+} from 'redux';
+import reduxThunk from 'redux-thunk';
+import reducers from './reducers';
+import axios from 'axios';
// 리덕스 데브툴 을 위한 세팅
const composeEnhancers =
- typeof window === "object" && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
+ typeof window === 'object' && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({})
: compose;
// other store enhancers if any
const enhancer = composeEnhancers(applyMiddleware(reduxThunk));
// 나중에 전화번호 인증된 상태일때 강제로 accessToken 불러오는 자리( initial 리덕스 에 집어넣기 위함 (새로고침 시))
-const adminAccessToken = localStorage.getItem("accessToken");
+const adminAccessToken = localStorage.getItem('accessToken');
-console.log(adminAccessToken);
// axios Bearer 토큰에 커먼 헤더로 껴놓기 위함
let authenticated = false;
if (adminAccessToken && adminAccessToken.length) {
@@ -31,9 +30,9 @@ export const store = createStore(
// initial state for autheticated
auth: {
authenticated: authenticated,
- accessToken: adminAccessToken,
+ accessToken: adminAccessToken
// user :
- },
+ }
// userLookup: {
// userCount: 0,
// totalPage: 0,