Skip to content

Commit

Permalink
Merge branch 'dev' into feature/#50
Browse files Browse the repository at this point in the history
  • Loading branch information
JitHoon authored Jan 21, 2024
2 parents 54af717 + 781a4ba commit d46d6e6
Show file tree
Hide file tree
Showing 36 changed files with 2,854 additions and 150 deletions.
347 changes: 346 additions & 1 deletion package-lock.json

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,29 @@
"@tanstack/react-query": "^5.17.9",
"@tanstack/react-query-devtools": "^5.17.9",
"axios": "^1.6.5",
"date-fns": "^2.0.0-alpha.27",
"date-fns-tz": "^2.0.0",
"react": "^18.2.0",
"react-chartjs-2": "^5.2.0",
"react-datepicker": "^4.25.0",
"react-dom": "^18.2.0",
"react-error-boundary": "^4.0.12",
"react-loading-skeleton": "^3.3.1",
"react-paginate": "^8.2.0",
"react-router-dom": "^6.21.1",
"recoil": "^0.7.7",
"recoil-persist": "^5.1.0"
"recoil-persist": "^5.1.0",
"semantic-ui-css": "^2.5.0",
"semantic-ui-react": "^2.1.5",
"xlsx": "^0.18.5"
},
"devDependencies": {
"@swc/core": "^1.3.102",
"@swc/jest": "^0.2.29",
"@tanstack/eslint-plugin-query": "^5.17.7",
"@types/jest": "^29.5.11",
"@types/react": "^18.2.43",
"@types/react-datepicker": "^4.19.5",
"@types/react-dom": "^18.2.17",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
Expand Down
1 change: 1 addition & 0 deletions src/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ export { default as postLogin } from './lib/postLogin';
export { default as postRefreshToken } from './lib/postRefreshToken';
export { default as getTotalReport } from './lib/getTotalReport';
export { default as getYearReport } from './lib/getYearReport';
export { default as getCouponList } from './lib/getCouponList';
22 changes: 22 additions & 0 deletions src/api/lib/getCouponList.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { CouponListResponse } from '@/types/couponList';
import { instance } from '..';

// 쿠폰 정보 가져오는 api
const getCouponList = async (
accommodationId: number,
date?: string,
status?: string,
title?: string
): Promise<CouponListResponse> => {
const params = {
date,
status,
title
};
const response = await instance.get(`/v1/coupons/${accommodationId}`, {
params
});
return response.data;
};

export default getCouponList;
32 changes: 32 additions & 0 deletions src/assets/icons/calendar-number-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/assets/icons/information-circle-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions src/assets/icons/receipt-sharp.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/icons/settlements-admin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/settlements-data-frame.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/icons/settlements-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/icons/sync-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/components/CouponList/CouponHeader/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import styled from '@emotion/styled';
import { useNavigate } from 'react-router-dom';

import theme from '@styles/theme';

const CouponHeader = () => {
Expand Down
Loading

0 comments on commit d46d6e6

Please sign in to comment.