Skip to content

Commit

Permalink
Merge pull request #276 from mash-up-kr/develop
Browse files Browse the repository at this point in the history
Main Release/1.6.0
  • Loading branch information
sanoopark committed Jul 29, 2023
2 parents 73e0496 + 26119d5 commit f2f479e
Show file tree
Hide file tree
Showing 63 changed files with 1,284 additions and 106 deletions.
150 changes: 150 additions & 0 deletions .pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
9 changes: 9 additions & 0 deletions @types/custom-types/editorjs.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
declare module '@editorjs/list';
declare module '@editorjs/checklist';
declare module '@editorjs/table';
declare module '@editorjs/marker';
declare module '@editorjs/underline';
declare module '@editorjs/underline';
declare module '@editorjs/text-variant-tune';
declare module 'editorjs-drag-drop';
declare module '@editorjs/paragraph';
7 changes: 7 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"@testing-library/react": "^12.1.2",
"@testing-library/react-hooks": "^7.0.2",
"@testing-library/user-event": "^13.5.0",
"@types/editorjs__header": "^2.6.0",
"@types/jest": "^27.4.0",
"@types/lodash-es": "^4.17.6",
"@types/node": "^17.0.10",
Expand Down Expand Up @@ -99,11 +100,17 @@
"webpack-merge": "^5.8.0"
},
"dependencies": {
"@editorjs/editorjs": "^2.26.5",
"@editorjs/header": "^2.7.0",
"@editorjs/list": "^1.8.0",
"@editorjs/paragraph": "^2.9.0",
"@editorjs/underline": "^1.1.0",
"@emotion/css": "^11.7.1",
"@emotion/react": "^11.7.1",
"@emotion/styled": "^11.6.0",
"axios": "^0.26.0",
"dayjs": "^1.10.7",
"editorjs-drag-drop": "^1.1.13",
"history": "^5.3.0",
"lodash-es": "^4.17.21",
"react": "^17.0.2",
Expand Down
10 changes: 10 additions & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
CreateSchedule,
ScheduleDetail,
UpdateSchedule,
UpdatePlatformRecruit,
} from './pages';

interface RequiredAuthProps extends Partial<NavigateProps> {
Expand Down Expand Up @@ -198,6 +199,15 @@ const App = () => {
}
/>

<Route
path={PATH.UPDATE_PLATFORM_RECRUIT}
element={
<RequiredAuth isAuth={isAuthorized}>
<UpdatePlatformRecruit />
</RequiredAuth>
}
/>

<Route path="/" element={<Navigate to={TOKEN ? PATH.APPLICATION : PATH.LOGIN} />} />
</Route>
<Route
Expand Down
1 change: 1 addition & 0 deletions src/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ export * from './generation';
export * from './member';
export * from './scoreHistory';
export * from './schedule';
export * from './storage';
13 changes: 13 additions & 0 deletions src/api/storage.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { BaseResponse, StorageRequest, StorageResponse } from '@/types';
import http from '@/api/core';

export const getStorage = async (key: string): Promise<BaseResponse<StorageResponse>> => {
return http.get({ url: `/storage/key/${key}` });
};

export const postStorage = async (data: StorageRequest): Promise<BaseResponse<StorageResponse>> => {
return http.post({
url: '/storage',
data,
});
};
5 changes: 5 additions & 0 deletions src/assets/svg/activity-score.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/assets/svg/admin-members.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/svg/application-form.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/assets/svg/application.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/svg/email.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit f2f479e

Please sign in to comment.