diff --git a/.eslintrc.json b/.eslintrc.json index 1b1607b..8c713f8 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -50,18 +50,28 @@ "error", { "endOfLine": "auto", - "singleQuote": true, - "importOrder": "off" + "singleQuote": true } ], "react/react-in-jsx-scope": "off", "import/no-unresolved": "off", "@typescript-eslint/no-unused-vars": "warn", - "no-console": "warn", + "no-console": "off", "arrow-body-style": "off", "prefer-arrow-callback": "off", "max-len": "off", "no-mixed-operators": "off", - "no-multiple-empty-lines": "off" + "no-multiple-empty-lines": "off", + "import/order": [ + "error", + { + "groups": [ + ["builtin", "external"], + "internal", + ["parent", "sibling", "index"] + ], + "newlines-between": "always" + } + ] } } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c63de5..6acdbf6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,9 @@ -name: Test +name: Test and Lint on: pull_request: branches: - - main + - '**' workflow_dispatch: jobs: @@ -21,6 +21,9 @@ jobs: - name: Install Dependencies run: pnpm install + - name: Run Lint + run: pnpm lint --max-warnings 50 + - name: Run Test - run: pnpm run test + run: pnpm test \ No newline at end of file diff --git a/.prettierrc.json b/.prettierrc.json index 91ee768..c87fa72 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -18,28 +18,6 @@ "useTabs": false, "vueIndentScriptAndStyle": false, - "plugins": ["@trivago/prettier-plugin-sort-imports"], - "importOrder": [ - "^react", - - "", - - "^(@gdg/components)(.*)$", - "^(@gdg/pages)(.*)$", - "^(@gdg/hooks)(.*)$", - "^(@gdg/assets)(.*)$", - - "^(@gdg/constants)(.*)$", - "^(@gdg/utils)(.*)$", - "^(@gdg/apis)(.*)$", - "^(@gdg/common)(.*)$", - "^(@gdg/config)(.*)$", - "^(@gdg/store)(.*)$", - - "^(@gdg/styles)(.*)$", - - "^(.*)/(.*)$" - ], "importOrderSeparation": true, "importOrderSortSpecifiers": false } diff --git a/package.json b/package.json index d4baa0a..fb99084 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ "@prerenderer/renderer-puppeteer": "^1.2.4", "@prerenderer/rollup-plugin": "^0.3.12", "@testing-library/jest-dom": "^6.6.3", - "@trivago/prettier-plugin-sort-imports": "^4.3.0", "@types/jest": "^29.5.14", "@types/node": "^20.17.6", "@types/prismjs": "^1.26.5", @@ -83,7 +82,7 @@ "eslint-plugin-react-refresh": "^0.4.14", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", - "prettier": "^2.8.8", + "prettier": "^3.3.3", "puppeteer": "^23.8.0", "ts-node": "^10.9.2", "typescript": "^5.6.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9aa9b02..9ecb1f8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -147,9 +147,6 @@ importers: '@testing-library/jest-dom': specifier: ^6.6.3 version: 6.6.3 - '@trivago/prettier-plugin-sort-imports': - specifier: ^4.3.0 - version: 4.3.0(prettier@2.8.8) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -194,7 +191,7 @@ importers: version: 16.6.2(eslint@8.57.1) eslint-plugin-prettier: specifier: ^5.2.1 - version: 5.2.1(eslint-config-prettier@9.1.0(eslint@8.57.1))(eslint@8.57.1)(prettier@2.8.8) + version: 5.2.1(eslint-config-prettier@9.1.0(eslint@8.57.1))(eslint@8.57.1)(prettier@3.3.3) eslint-plugin-promise: specifier: ^6.6.0 version: 6.6.0(eslint@8.57.1) @@ -214,8 +211,8 @@ importers: specifier: ^29.7.0 version: 29.7.0 prettier: - specifier: ^2.8.8 - version: 2.8.8 + specifier: ^3.3.3 + version: 3.3.3 puppeteer: specifier: ^23.8.0 version: 23.8.0(typescript@5.6.3) @@ -250,10 +247,6 @@ packages: resolution: {integrity: sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==} engines: {node: '>=6.9.0'} - '@babel/generator@7.17.7': - resolution: {integrity: sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==} - engines: {node: '>=6.9.0'} - '@babel/generator@7.26.2': resolution: {integrity: sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==} engines: {node: '>=6.9.0'} @@ -287,18 +280,6 @@ packages: peerDependencies: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 - '@babel/helper-environment-visitor@7.24.7': - resolution: {integrity: sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==} - engines: {node: '>=6.9.0'} - - '@babel/helper-function-name@7.24.7': - resolution: {integrity: sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==} - engines: {node: '>=6.9.0'} - - '@babel/helper-hoist-variables@7.24.7': - resolution: {integrity: sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==} - engines: {node: '>=6.9.0'} - '@babel/helper-member-expression-to-functions@7.25.9': resolution: {integrity: sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==} engines: {node: '>=6.9.0'} @@ -341,10 +322,6 @@ packages: resolution: {integrity: sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==} engines: {node: '>=6.9.0'} - '@babel/helper-split-export-declaration@7.24.7': - resolution: {integrity: sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==} - engines: {node: '>=6.9.0'} - '@babel/helper-string-parser@7.25.9': resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==} engines: {node: '>=6.9.0'} @@ -852,18 +829,10 @@ packages: resolution: {integrity: sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==} engines: {node: '>=6.9.0'} - '@babel/traverse@7.23.2': - resolution: {integrity: sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==} - engines: {node: '>=6.9.0'} - '@babel/traverse@7.25.9': resolution: {integrity: sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==} engines: {node: '>=6.9.0'} - '@babel/types@7.17.0': - resolution: {integrity: sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==} - engines: {node: '>=6.9.0'} - '@babel/types@7.26.0': resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==} engines: {node: '>=6.9.0'} @@ -1457,15 +1426,6 @@ packages: '@tootallnate/quickjs-emscripten@0.23.0': resolution: {integrity: sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==} - '@trivago/prettier-plugin-sort-imports@4.3.0': - resolution: {integrity: sha512-r3n0onD3BTOVUNPhR4lhVK4/pABGpbA7bW3eumZnYdKaHkf1qEC+Mag6DPbGNuuh0eG8AaYj+YqmVHSiGslaTQ==} - peerDependencies: - '@vue/compiler-sfc': 3.x - prettier: 2.x - 3.x - peerDependenciesMeta: - '@vue/compiler-sfc': - optional: true - '@tsconfig/node10@1.0.11': resolution: {integrity: sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==} @@ -2971,9 +2931,6 @@ packages: resolution: {integrity: sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==} engines: {node: '>= 0.4'} - javascript-natural-sort@0.7.1: - resolution: {integrity: sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==} - jest-changed-files@29.7.0: resolution: {integrity: sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -3135,11 +3092,6 @@ packages: canvas: optional: true - jsesc@2.5.2: - resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} - engines: {node: '>=4'} - hasBin: true - jsesc@3.0.2: resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==} engines: {node: '>=6'} @@ -3510,9 +3462,9 @@ packages: resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==} engines: {node: '>=6.0.0'} - prettier@2.8.8: - resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} - engines: {node: '>=10.13.0'} + prettier@3.3.3: + resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==} + engines: {node: '>=14'} hasBin: true pretty-format@29.7.0: @@ -4090,10 +4042,6 @@ packages: tmpl@1.0.5: resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==} - to-fast-properties@2.0.0: - resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} - engines: {node: '>=4'} - to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} @@ -4476,12 +4424,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/generator@7.17.7': - dependencies: - '@babel/types': 7.17.0 - jsesc: 2.5.2 - source-map: 0.5.7 - '@babel/generator@7.26.2': dependencies: '@babel/parser': 7.26.2 @@ -4540,19 +4482,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-environment-visitor@7.24.7': - dependencies: - '@babel/types': 7.26.0 - - '@babel/helper-function-name@7.24.7': - dependencies: - '@babel/template': 7.25.9 - '@babel/types': 7.26.0 - - '@babel/helper-hoist-variables@7.24.7': - dependencies: - '@babel/types': 7.26.0 - '@babel/helper-member-expression-to-functions@7.25.9': dependencies: '@babel/traverse': 7.25.9 @@ -4614,10 +4543,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-split-export-declaration@7.24.7': - dependencies: - '@babel/types': 7.26.0 - '@babel/helper-string-parser@7.25.9': {} '@babel/helper-validator-identifier@7.25.9': {} @@ -5223,21 +5148,6 @@ snapshots: '@babel/parser': 7.26.2 '@babel/types': 7.26.0 - '@babel/traverse@7.23.2': - dependencies: - '@babel/code-frame': 7.26.2 - '@babel/generator': 7.26.2 - '@babel/helper-environment-visitor': 7.24.7 - '@babel/helper-function-name': 7.24.7 - '@babel/helper-hoist-variables': 7.24.7 - '@babel/helper-split-export-declaration': 7.24.7 - '@babel/parser': 7.26.2 - '@babel/types': 7.26.0 - debug: 4.3.7 - globals: 11.12.0 - transitivePeerDependencies: - - supports-color - '@babel/traverse@7.25.9': dependencies: '@babel/code-frame': 7.26.2 @@ -5250,11 +5160,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/types@7.17.0': - dependencies: - '@babel/helper-validator-identifier': 7.25.9 - to-fast-properties: 2.0.0 - '@babel/types@7.26.0': dependencies: '@babel/helper-string-parser': 7.25.9 @@ -5919,18 +5824,6 @@ snapshots: '@tootallnate/quickjs-emscripten@0.23.0': {} - '@trivago/prettier-plugin-sort-imports@4.3.0(prettier@2.8.8)': - dependencies: - '@babel/generator': 7.17.7 - '@babel/parser': 7.26.2 - '@babel/traverse': 7.23.2 - '@babel/types': 7.17.0 - javascript-natural-sort: 0.7.1 - lodash: 4.17.21 - prettier: 2.8.8 - transitivePeerDependencies: - - supports-color - '@tsconfig/node10@1.0.11': {} '@tsconfig/node12@1.0.11': {} @@ -7049,10 +6942,10 @@ snapshots: resolve: 1.22.8 semver: 7.6.3 - eslint-plugin-prettier@5.2.1(eslint-config-prettier@9.1.0(eslint@8.57.1))(eslint@8.57.1)(prettier@2.8.8): + eslint-plugin-prettier@5.2.1(eslint-config-prettier@9.1.0(eslint@8.57.1))(eslint@8.57.1)(prettier@3.3.3): dependencies: eslint: 8.57.1 - prettier: 2.8.8 + prettier: 3.3.3 prettier-linter-helpers: 1.0.0 synckit: 0.9.2 optionalDependencies: @@ -7750,8 +7643,6 @@ snapshots: reflect.getprototypeof: 1.0.6 set-function-name: 2.0.2 - javascript-natural-sort@0.7.1: {} - jest-changed-files@29.7.0: dependencies: execa: 5.1.1 @@ -8122,8 +8013,6 @@ snapshots: - supports-color - utf-8-validate - jsesc@2.5.2: {} - jsesc@3.0.2: {} json-buffer@3.0.1: {} @@ -8455,7 +8344,7 @@ snapshots: dependencies: fast-diff: 1.3.0 - prettier@2.8.8: {} + prettier@3.3.3: {} pretty-format@29.7.0: dependencies: @@ -9149,8 +9038,6 @@ snapshots: tmpl@1.0.5: {} - to-fast-properties@2.0.0: {} - to-regex-range@5.0.1: dependencies: is-number: 7.0.0 diff --git a/src/App.tsx b/src/App.tsx index 391ed4f..3861f01 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,6 +1,6 @@ +import { Global } from '@emotion/react'; import { RouterProvider } from 'react-router-dom'; -import { Global } from '@emotion/react'; import { Router } from '@gdg/router/Router'; import { GlobalStyle } from '@gdg/styles/GlobalStyle'; diff --git a/src/apis/hooks/admin/docs/useGetApplyDocs.ts b/src/apis/hooks/admin/docs/useGetApplyDocs.ts index 96e60f1..0bf0931 100644 --- a/src/apis/hooks/admin/docs/useGetApplyDocs.ts +++ b/src/apis/hooks/admin/docs/useGetApplyDocs.ts @@ -1,6 +1,7 @@ +import { useQuery } from '@tanstack/react-query'; + import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { MemberData } from '@gdg/types/AdminInterface'; -import { useQuery } from '@tanstack/react-query'; export interface applyDocsInterface { data: MemberData[]; diff --git a/src/apis/hooks/admin/docs/useGetDocsDetail.ts b/src/apis/hooks/admin/docs/useGetDocsDetail.ts index c841c9b..5bca098 100644 --- a/src/apis/hooks/admin/docs/useGetDocsDetail.ts +++ b/src/apis/hooks/admin/docs/useGetDocsDetail.ts @@ -1,6 +1,7 @@ -import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { useQuery } from '@tanstack/react-query'; +import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; + export type AnswerData = { questionNumber: number; answer: string; diff --git a/src/apis/hooks/admin/docs/useGetSearch.ts b/src/apis/hooks/admin/docs/useGetSearch.ts index 8cf8dc0..7a6effd 100644 --- a/src/apis/hooks/admin/docs/useGetSearch.ts +++ b/src/apis/hooks/admin/docs/useGetSearch.ts @@ -1,6 +1,7 @@ +import { useQuery } from '@tanstack/react-query'; + import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { MemberData } from '@gdg/types/AdminInterface'; -import { useQuery } from '@tanstack/react-query'; export interface SearchInterface { data: MemberData[]; diff --git a/src/apis/hooks/admin/docs/useGetStatistic.ts b/src/apis/hooks/admin/docs/useGetStatistic.ts index db00b91..5e91549 100644 --- a/src/apis/hooks/admin/docs/useGetStatistic.ts +++ b/src/apis/hooks/admin/docs/useGetStatistic.ts @@ -1,6 +1,7 @@ -import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { useQuery } from '@tanstack/react-query'; +import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; + export interface statisticInterface { total: number; openCount: number; diff --git a/src/apis/hooks/admin/docs/useGetTrack.ts b/src/apis/hooks/admin/docs/useGetTrack.ts index abc0417..f861cc1 100644 --- a/src/apis/hooks/admin/docs/useGetTrack.ts +++ b/src/apis/hooks/admin/docs/useGetTrack.ts @@ -1,6 +1,7 @@ -import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { useQuery } from '@tanstack/react-query'; +import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; + export interface TrackInterface { TOTAL: number; FRONT_END: number; diff --git a/src/apis/hooks/admin/docs/usePatchDocsMemo.ts b/src/apis/hooks/admin/docs/usePatchDocsMemo.ts index 47389b4..b17e02a 100644 --- a/src/apis/hooks/admin/docs/usePatchDocsMemo.ts +++ b/src/apis/hooks/admin/docs/usePatchDocsMemo.ts @@ -1,6 +1,7 @@ -import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { useMutation } from '@tanstack/react-query'; +import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; + const patchMemoPath = () => '/api/admin/application/note'; const patchDocsMemo = async (id: number, memo: string): Promise => { diff --git a/src/apis/hooks/admin/docs/usePatchMark.ts b/src/apis/hooks/admin/docs/usePatchMark.ts index 518b660..3ddb172 100644 --- a/src/apis/hooks/admin/docs/usePatchMark.ts +++ b/src/apis/hooks/admin/docs/usePatchMark.ts @@ -1,6 +1,7 @@ -import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { useMutation } from '@tanstack/react-query'; +import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; + const patchMarkPath = () => '/api/admin/application/mark'; const patchMark = async (userId: number) => { diff --git a/src/apis/hooks/admin/docs/usePatchStatus.ts b/src/apis/hooks/admin/docs/usePatchStatus.ts index 28c58cb..91c62f2 100644 --- a/src/apis/hooks/admin/docs/usePatchStatus.ts +++ b/src/apis/hooks/admin/docs/usePatchStatus.ts @@ -1,6 +1,7 @@ -import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { useMutation } from '@tanstack/react-query'; +import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; + const patchStatusPath = () => '/api/admin/application/status'; export const patchStatus = async (id: number, status: string) => { diff --git a/src/apis/hooks/admin/status/useDeleteUser.ts b/src/apis/hooks/admin/status/useDeleteUser.ts index e8af889..db6f122 100644 --- a/src/apis/hooks/admin/status/useDeleteUser.ts +++ b/src/apis/hooks/admin/status/useDeleteUser.ts @@ -1,6 +1,7 @@ -import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { useMutation } from '@tanstack/react-query'; +import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; + const deleteUserListPath = () => '/api/admin/member'; const deleteUserList = async (selectedUser: number[]): Promise => { diff --git a/src/apis/hooks/admin/status/useGetUserList.ts b/src/apis/hooks/admin/status/useGetUserList.ts index 3227a07..75ab8a4 100644 --- a/src/apis/hooks/admin/status/useGetUserList.ts +++ b/src/apis/hooks/admin/status/useGetUserList.ts @@ -1,6 +1,7 @@ -import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { useQuery, UseQueryResult } from '@tanstack/react-query'; +import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; + export type PersonData = { id: number; track: string | null; diff --git a/src/apis/hooks/admin/team/useGetAllTeamToken.ts b/src/apis/hooks/admin/team/useGetAllTeamToken.ts index 9a54683..0c5c1e4 100644 --- a/src/apis/hooks/admin/team/useGetAllTeamToken.ts +++ b/src/apis/hooks/admin/team/useGetAllTeamToken.ts @@ -1,6 +1,7 @@ -import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { useQuery, UseQueryResult } from '@tanstack/react-query'; +import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; + export interface SubTeam { id: number; teamName: string; diff --git a/src/apis/hooks/admin/team/useGetTeamMember.ts b/src/apis/hooks/admin/team/useGetTeamMember.ts index 5cd9ced..0722b4f 100644 --- a/src/apis/hooks/admin/team/useGetTeamMember.ts +++ b/src/apis/hooks/admin/team/useGetTeamMember.ts @@ -1,6 +1,7 @@ -import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { useQuery, UseQueryResult } from '@tanstack/react-query'; +import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; + export interface TeamMember { id: number; name: string; diff --git a/src/apis/hooks/admin/useApproveUser.ts b/src/apis/hooks/admin/useApproveUser.ts index e1fe18e..c7b1ae8 100644 --- a/src/apis/hooks/admin/useApproveUser.ts +++ b/src/apis/hooks/admin/useApproveUser.ts @@ -1,6 +1,7 @@ -import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { useMutation } from '@tanstack/react-query'; +import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; + const approveUserListPath = () => '/api/admin/member/role'; const approveUserList = async ( diff --git a/src/apis/hooks/admin/useGetSearchList.ts b/src/apis/hooks/admin/useGetSearchList.ts index 92f6bc3..0b67d99 100644 --- a/src/apis/hooks/admin/useGetSearchList.ts +++ b/src/apis/hooks/admin/useGetSearchList.ts @@ -1,7 +1,9 @@ -import { userListInterface } from './status/useGetUserList'; -import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { useQuery, UseQueryResult } from '@tanstack/react-query'; +import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; + +import { userListInterface } from './status/useGetUserList'; + const getSearchListPath = () => '/api/admin/member/search'; const searchListQueryKey = [getSearchListPath()]; diff --git a/src/apis/hooks/apply/ApplyFormQuery.ts b/src/apis/hooks/apply/ApplyFormQuery.ts index 9c51111..8814bc3 100644 --- a/src/apis/hooks/apply/ApplyFormQuery.ts +++ b/src/apis/hooks/apply/ApplyFormQuery.ts @@ -1,9 +1,9 @@ +import { useMutation, UseMutationOptions } from '@tanstack/react-query'; import { useNavigate } from 'react-router-dom'; import { ApplyAPI } from '@gdg/apis/hooks/apply/ApplyAPI'; import { queryClient } from '@gdg/apis/instance/Http'; import { ApplyFormInterface } from '@gdg/types/ApplyInterface'; -import { useMutation, UseMutationOptions } from '@tanstack/react-query'; export const useApplyFormMutation = ( options?: Omit< diff --git a/src/apis/hooks/apply/ApplyInquiryQuery.ts b/src/apis/hooks/apply/ApplyInquiryQuery.ts index a2148ba..27dcf5d 100644 --- a/src/apis/hooks/apply/ApplyInquiryQuery.ts +++ b/src/apis/hooks/apply/ApplyInquiryQuery.ts @@ -1,6 +1,7 @@ -import { ApplyInquiryAPI } from '@gdg/apis/hooks/apply/ApplyInquiryAPI'; import { useQuery } from '@tanstack/react-query'; +import { ApplyInquiryAPI } from '@gdg/apis/hooks/apply/ApplyInquiryAPI'; + export const ApplyInquiryQuery = (name: string, studentNumber: string) => { const { data, isLoading, isFetching, isError, error, refetch } = useQuery({ queryKey: ['getApplyData', name, studentNumber], diff --git a/src/apis/hooks/apply/ApplySaveQuery.ts b/src/apis/hooks/apply/ApplySaveQuery.ts index 67741a6..a96224a 100644 --- a/src/apis/hooks/apply/ApplySaveQuery.ts +++ b/src/apis/hooks/apply/ApplySaveQuery.ts @@ -1,9 +1,9 @@ +import { useMutation, UseMutationOptions } from '@tanstack/react-query'; import { useNavigate } from 'react-router-dom'; import { ApplySaveAPI } from '@gdg/apis/hooks/apply/ApplySaveAPI'; import { queryClient } from '@gdg/apis/instance/Http'; import { ApplyFormInterface } from '@gdg/types/ApplyInterface'; -import { useMutation, UseMutationOptions } from '@tanstack/react-query'; export const useApplySaveMutation = ( options?: Omit< diff --git a/src/apis/hooks/mypage/useGetMyData.ts b/src/apis/hooks/mypage/useGetMyData.ts index 6fd6c61..1e29a4e 100644 --- a/src/apis/hooks/mypage/useGetMyData.ts +++ b/src/apis/hooks/mypage/useGetMyData.ts @@ -1,6 +1,7 @@ +import { useQuery, UseQueryResult } from '@tanstack/react-query'; + import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { userDataInterface } from '@gdg/types/UserInterface'; -import { useQuery, UseQueryResult } from '@tanstack/react-query'; const getMyDataPath = () => '/api/user'; diff --git a/src/apis/hooks/mypage/usePatchMyData.ts b/src/apis/hooks/mypage/usePatchMyData.ts index 361df59..4e5c8fc 100644 --- a/src/apis/hooks/mypage/usePatchMyData.ts +++ b/src/apis/hooks/mypage/usePatchMyData.ts @@ -1,11 +1,11 @@ +import { useMutation, UseMutationResult } from '@tanstack/react-query'; + import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { queryClient } from '@gdg/apis/instance/Http'; - import { patchUserStatusInterface, patchUserStatusRequest, } from '@gdg/types/UserInterface'; -import { useMutation, UseMutationResult } from '@tanstack/react-query'; const patchMyDataPath = () => '/api/user'; diff --git a/src/apis/hooks/mypage/usePutMyData.ts b/src/apis/hooks/mypage/usePutMyData.ts index 6039f63..fbea7b5 100644 --- a/src/apis/hooks/mypage/usePutMyData.ts +++ b/src/apis/hooks/mypage/usePutMyData.ts @@ -1,7 +1,8 @@ +import { useMutation, UseMutationResult } from '@tanstack/react-query'; + import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { queryClient } from '@gdg/apis/instance/Http'; import { putUserDataInterface } from '@gdg/types/UserInterface'; -import { useMutation, UseMutationResult } from '@tanstack/react-query'; const getMyDataPath = () => '/api/user'; diff --git a/src/apis/hooks/signin/SigninQuery.ts b/src/apis/hooks/signin/SigninQuery.ts index 7c2e054..1d892fb 100644 --- a/src/apis/hooks/signin/SigninQuery.ts +++ b/src/apis/hooks/signin/SigninQuery.ts @@ -1,7 +1,8 @@ +import { useMutation } from '@tanstack/react-query'; + import { SigninGoogleAPI } from '@gdg/apis/hooks/signin/SigninGoogleAPI'; import { queryClient } from '@gdg/apis/instance/Http'; import { SigninAPIInterface } from '@gdg/types/OAuthInterface'; -import { useMutation } from '@tanstack/react-query'; export const SigninQuery = (onSuccess: (data: SigninAPIInterface) => void) => { const { mutate, data, isPending, isError, error } = useMutation({ diff --git a/src/apis/hooks/signup/SignupQuery.ts b/src/apis/hooks/signup/SignupQuery.ts index c8cf686..4c0efcd 100644 --- a/src/apis/hooks/signup/SignupQuery.ts +++ b/src/apis/hooks/signup/SignupQuery.ts @@ -1,6 +1,7 @@ +import { useMutation } from '@tanstack/react-query'; + import { SignupAPI } from '@gdg/apis/hooks/signup/SignupAPI'; import { queryClient } from '@gdg/apis/instance/Http'; -import { useMutation } from '@tanstack/react-query'; export const SignupQuery = () => { const { mutate, isPending, isError, error } = useMutation({ diff --git a/src/apis/hooks/team/useGetTeamList.ts b/src/apis/hooks/team/useGetTeamList.ts index f00cbb8..1a70c5a 100644 --- a/src/apis/hooks/team/useGetTeamList.ts +++ b/src/apis/hooks/team/useGetTeamList.ts @@ -1,6 +1,7 @@ -import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { useQuery, UseQueryResult } from '@tanstack/react-query'; +import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; + export type TeamList = { id: number; teamName: string; diff --git a/src/apis/hooks/team/useGetTeamMate.ts b/src/apis/hooks/team/useGetTeamMate.ts index 2469a55..0e6e480 100644 --- a/src/apis/hooks/team/useGetTeamMate.ts +++ b/src/apis/hooks/team/useGetTeamMate.ts @@ -1,6 +1,7 @@ +import { useQuery, UseQueryResult } from '@tanstack/react-query'; + import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import type { TeamData } from '@gdg/types/TeamData.type'; -import { useQuery, UseQueryResult } from '@tanstack/react-query'; const getTeamMatePath = (teamId: number) => `/api/team/${teamId}/member`; diff --git a/src/apis/hooks/techblog/useGetImage.ts b/src/apis/hooks/techblog/useGetImage.ts index 9196bcc..de7f722 100644 --- a/src/apis/hooks/techblog/useGetImage.ts +++ b/src/apis/hooks/techblog/useGetImage.ts @@ -1,7 +1,7 @@ -import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; - import { useMutation } from '@tanstack/react-query'; +import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; + type imageResponse = { imageUrl: string; }; diff --git a/src/apis/hooks/techblog/usePostBlog.ts b/src/apis/hooks/techblog/usePostBlog.ts index 266b693..64fe271 100644 --- a/src/apis/hooks/techblog/usePostBlog.ts +++ b/src/apis/hooks/techblog/usePostBlog.ts @@ -1,8 +1,8 @@ +import { useMutation, UseMutationResult } from '@tanstack/react-query'; + import { fetchInstance } from '@gdg/apis/instance/Api_JWT'; import { queryClient } from '@gdg/apis/instance/Http'; - import { blogPostInterface } from '@gdg/types/UserInterface'; -import { useMutation, UseMutationResult } from '@tanstack/react-query'; const postBlogPath = () => '/api/post'; diff --git a/src/apis/instance/Http.ts b/src/apis/instance/Http.ts index 6e7b17c..9cc200a 100644 --- a/src/apis/instance/Http.ts +++ b/src/apis/instance/Http.ts @@ -1,6 +1,5 @@ -import { toast } from 'react-hot-toast'; - import { QueryClient, QueryCache } from '@tanstack/react-query'; +import { toast } from 'react-hot-toast'; export const queryClient = new QueryClient({ defaultOptions: { diff --git a/src/components/common/View/LazyLoad.tsx b/src/components/common/View/LazyLoad.tsx index 1df38fa..e0934b5 100644 --- a/src/components/common/View/LazyLoad.tsx +++ b/src/components/common/View/LazyLoad.tsx @@ -1,10 +1,4 @@ -import React, { - Suspense, - ComponentType, - useEffect, - useRef, - useState, -} from 'react'; +import { Suspense, ComponentType, useEffect, useRef, useState } from 'react'; import { LoadingView } from './LoadingView'; diff --git a/src/components/common/View/LoadingView.tsx b/src/components/common/View/LoadingView.tsx index cf85d36..8e8e56f 100644 --- a/src/components/common/View/LoadingView.tsx +++ b/src/components/common/View/LoadingView.tsx @@ -1,6 +1,7 @@ -import { Spinner } from '../Spinner'; import styled from '@emotion/styled'; +import { Spinner } from '../Spinner'; + export const LoadingView = () => ( diff --git a/src/components/common/button/CommonBtn.tsx b/src/components/common/button/CommonBtn.tsx index 0694911..2f5465f 100644 --- a/src/components/common/button/CommonBtn.tsx +++ b/src/components/common/button/CommonBtn.tsx @@ -1,4 +1,5 @@ import styled from '@emotion/styled'; + import { ICButton } from '@gdg/types/ButtonInterfaces'; const Button = styled.button` diff --git a/src/components/common/button/CompleteBtn.tsx b/src/components/common/button/CompleteBtn.tsx index 0899585..797db31 100644 --- a/src/components/common/button/CompleteBtn.tsx +++ b/src/components/common/button/CompleteBtn.tsx @@ -1,4 +1,5 @@ import styled from '@emotion/styled'; + import { IButton, ICButton } from '@gdg/types/ButtonInterfaces'; const Button = styled.button` diff --git a/src/components/common/button/MobileBtn.tsx b/src/components/common/button/MobileBtn.tsx index 62b667f..acc1c35 100644 --- a/src/components/common/button/MobileBtn.tsx +++ b/src/components/common/button/MobileBtn.tsx @@ -1,4 +1,5 @@ import styled from '@emotion/styled'; + import { IButton } from '@gdg/types/ButtonInterfaces'; const LoginButton = styled.button` diff --git a/src/components/common/button/SigninBtn.tsx b/src/components/common/button/SigninBtn.tsx index 18f031a..d829226 100644 --- a/src/components/common/button/SigninBtn.tsx +++ b/src/components/common/button/SigninBtn.tsx @@ -1,4 +1,5 @@ import styled from '@emotion/styled'; + import SigninLogo from '@gdg/assets/SigninLogo.svg'; import Text from '@gdg/components/common/typography/Text'; diff --git a/src/components/common/dropdown/index.tsx b/src/components/common/dropdown/index.tsx index 75bd929..e1c709d 100644 --- a/src/components/common/dropdown/index.tsx +++ b/src/components/common/dropdown/index.tsx @@ -1,6 +1,6 @@ +import styled from '@emotion/styled'; import { useEffect, useState } from 'react'; -import styled from '@emotion/styled'; import type { TeamList } from '@gdg/apis/hooks/team/useGetTeamList'; import HdDropDown from '@gdg/assets/HdDropDown.svg'; import HdDropUp from '@gdg/assets/HdDropUp.svg'; diff --git a/src/components/common/form/FormInput.tsx b/src/components/common/form/FormInput.tsx index 17c59f0..2c4cea8 100644 --- a/src/components/common/form/FormInput.tsx +++ b/src/components/common/form/FormInput.tsx @@ -1,6 +1,5 @@ -import { UseFormRegisterReturn } from 'react-hook-form'; - import styled from '@emotion/styled'; +import { UseFormRegisterReturn } from 'react-hook-form'; interface InputLabelInterface { margin: string; diff --git a/src/components/common/form/FormTextArea.tsx b/src/components/common/form/FormTextArea.tsx index a1ab4ac..31d130c 100644 --- a/src/components/common/form/FormTextArea.tsx +++ b/src/components/common/form/FormTextArea.tsx @@ -1,8 +1,7 @@ +import styled from '@emotion/styled'; import { useState } from 'react'; import { UseFormRegisterReturn } from 'react-hook-form'; -import styled from '@emotion/styled'; - interface ITextArea { id: string; label: string; diff --git a/src/components/common/form/Profile.tsx b/src/components/common/form/Profile.tsx index aaff61e..b7ff90d 100644 --- a/src/components/common/form/Profile.tsx +++ b/src/components/common/form/Profile.tsx @@ -1,6 +1,6 @@ +import styled from '@emotion/styled'; import { useState, useRef, ChangeEvent } from 'react'; -import styled from '@emotion/styled'; import DefaultProfile from '@gdg/assets/DefaultProfile.svg'; import PencilIcon from '@gdg/assets/EditIcon.svg'; import { displayCenter } from '@gdg/styles/LayoutStyle'; diff --git a/src/components/common/form/SignupInput.tsx b/src/components/common/form/SignupInput.tsx index 7c909ed..b06a153 100644 --- a/src/components/common/form/SignupInput.tsx +++ b/src/components/common/form/SignupInput.tsx @@ -1,6 +1,5 @@ -import { UseFormRegisterReturn } from 'react-hook-form'; - import styled from '@emotion/styled'; +import { UseFormRegisterReturn } from 'react-hook-form'; interface IInput { id: string; diff --git a/src/components/common/form/TextArea.tsx b/src/components/common/form/TextArea.tsx index 69a5a00..72447fe 100644 --- a/src/components/common/form/TextArea.tsx +++ b/src/components/common/form/TextArea.tsx @@ -1,7 +1,7 @@ +import styled from '@emotion/styled'; import { useState, useEffect } from 'react'; import Text from '../typography/Text'; -import styled from '@emotion/styled'; interface ITextArea { id: string; diff --git a/src/components/common/layouts/grid/index.tsx b/src/components/common/layouts/grid/index.tsx index e5d49f2..a84ecbb 100644 --- a/src/components/common/layouts/grid/index.tsx +++ b/src/components/common/layouts/grid/index.tsx @@ -1,7 +1,7 @@ -import { breakpoints } from '@gdg/styles/variants'; - import styled from '@emotion/styled'; +import { breakpoints } from '@gdg/styles/variants'; + type ResponseGridStyle = { [key in keyof typeof breakpoints]?: number | string; }; @@ -40,7 +40,7 @@ const Wrapper = styled.div>( }; } - let defaultPadding = padding?.lg; + const defaultPadding = padding?.lg; const responsive = Object.keys(padding) as (keyof typeof breakpoints)[]; return [ @@ -59,7 +59,7 @@ const Wrapper = styled.div>( }; } - let defaultGap = gap?.lg; + const defaultGap = gap?.lg; const responsive = Object.keys(gap) as (keyof typeof breakpoints)[]; return [ @@ -78,7 +78,7 @@ const Wrapper = styled.div>( }; } - let defaultColumns = columns?.lg; + const defaultColumns = columns?.lg; const responsive = Object.keys(columns) as (keyof typeof breakpoints)[]; return [ diff --git a/src/components/common/layouts/spacing/index.tsx b/src/components/common/layouts/spacing/index.tsx index d96c70b..6b653d5 100644 --- a/src/components/common/layouts/spacing/index.tsx +++ b/src/components/common/layouts/spacing/index.tsx @@ -1,7 +1,7 @@ -import { breakpoints } from '@gdg/styles/variants'; - import styled from '@emotion/styled'; +import { breakpoints } from '@gdg/styles/variants'; + type ResponseGridStyle = { [key in keyof typeof breakpoints]?: number; }; @@ -33,7 +33,7 @@ const Wrapper = styled.div>( }; } - let defaultHeight = height?.lg; + const defaultHeight = height?.lg; const responsive = Object.keys(height) as (keyof typeof breakpoints)[]; return [ diff --git a/src/components/common/pagination/pagination.style.ts b/src/components/common/pagination/pagination.style.ts index 456d70a..a9043e0 100644 --- a/src/components/common/pagination/pagination.style.ts +++ b/src/components/common/pagination/pagination.style.ts @@ -1,4 +1,5 @@ import styled from '@emotion/styled'; + import { displayCenter } from '@gdg/styles/LayoutStyle'; export const PageBtn = styled.button<{ isActive?: boolean }>` diff --git a/src/components/common/title/PageTitle.tsx b/src/components/common/title/PageTitle.tsx index 39eff3e..5057dde 100644 --- a/src/components/common/title/PageTitle.tsx +++ b/src/components/common/title/PageTitle.tsx @@ -1,9 +1,10 @@ +import styled from '@emotion/styled'; import { useMediaQuery } from 'react-responsive'; +import { displayCenter } from '@gdg/styles/LayoutStyle'; + import Text from '../typography/Text'; import Title from '../typography/Title'; -import styled from '@emotion/styled'; -import { displayCenter } from '@gdg/styles/LayoutStyle'; const MainTitlelayout = styled.div` width: 100%; diff --git a/src/components/feature/auth/AuthModal.tsx b/src/components/feature/auth/AuthModal.tsx index 1249a22..922ab77 100644 --- a/src/components/feature/auth/AuthModal.tsx +++ b/src/components/feature/auth/AuthModal.tsx @@ -1,9 +1,11 @@ -import logo from '/GDSC.svg'; import styled from '@emotion/styled'; + import Text from '@gdg/components/common/typography/Text'; import { AuthBox } from '@gdg/styles/AuthModalStyle'; import { displayCenter } from '@gdg/styles/LayoutStyle'; +import logo from '/GDSC.svg'; + interface ISignModal { title?: string; text?: string; diff --git a/src/components/feature/blog/RatioImg.tsx b/src/components/feature/blog/RatioImg.tsx index fe71747..512ab6b 100644 --- a/src/components/feature/blog/RatioImg.tsx +++ b/src/components/feature/blog/RatioImg.tsx @@ -1,7 +1,8 @@ +import styled from '@emotion/styled'; + import { LazyLoadImg } from '@gdg/components/common/img/LazyLoadingImg'; import { ratioBreakpoints } from './variants'; -import styled from '@emotion/styled'; const RatioImg = ({ src, diff --git a/src/components/feature/blog/ThumbNailCard.tsx b/src/components/feature/blog/ThumbNailCard.tsx index d55add4..8ab18e2 100644 --- a/src/components/feature/blog/ThumbNailCard.tsx +++ b/src/components/feature/blog/ThumbNailCard.tsx @@ -1,9 +1,9 @@ +import styled from '@emotion/styled'; import { memo } from 'react'; import Text from '@gdg/components/common/typography/Text'; import RatioImg from './RatioImg'; -import styled from '@emotion/styled'; type CardType = { src: string; diff --git a/src/components/feature/footer/MainFooter.tsx b/src/components/feature/footer/MainFooter.tsx index 4ca6607..51134a5 100644 --- a/src/components/feature/footer/MainFooter.tsx +++ b/src/components/feature/footer/MainFooter.tsx @@ -1,10 +1,8 @@ -import Text from '@gdg/components/common/typography/Text'; - import CompanyLogo from '@gdg/assets/CompanyLogo.svg'; import GithubLogo from '@gdg/assets/GithubLogo.svg'; import InstagramLogo from '@gdg/assets/InstagramLogo.svg'; import Phone from '@gdg/assets/Phone.svg'; - +import Text from '@gdg/components/common/typography/Text'; import { Footer, DisplayFooter, diff --git a/src/components/feature/footer/MainFooterMobile.tsx b/src/components/feature/footer/MainFooterMobile.tsx index d04f928..c286917 100644 --- a/src/components/feature/footer/MainFooterMobile.tsx +++ b/src/components/feature/footer/MainFooterMobile.tsx @@ -1,6 +1,6 @@ +import styled from '@emotion/styled'; import { Link } from 'react-router-dom'; -import styled from '@emotion/styled'; import CompanyLogo from '@gdg/assets/CompanyLogo.svg'; import GithubLogo from '@gdg/assets/GithubLogo.svg'; import InstagramLogo from '@gdg/assets/InstagramLogo.svg'; diff --git a/src/components/feature/header/MainNavigation.tsx b/src/components/feature/header/MainNavigation.tsx index d961d0c..57e66c2 100644 --- a/src/components/feature/header/MainNavigation.tsx +++ b/src/components/feature/header/MainNavigation.tsx @@ -1,11 +1,9 @@ +import styled from '@emotion/styled'; +import { motion } from 'framer-motion'; import { useEffect } from 'react'; import { useMediaQuery } from 'react-responsive'; import { Link, useNavigate } from 'react-router-dom'; -import { motion } from 'framer-motion'; - -import { renderDropdownItems } from './StatusDropDownItems'; -import styled from '@emotion/styled'; import { useGetMyData } from '@gdg/apis/hooks/mypage/useGetMyData'; import HdDropDown from '@gdg/assets/HdDropDown.svg'; import HdDropUp from '@gdg/assets/HdDropUp.svg'; @@ -17,6 +15,8 @@ import { useHeaderDropDownState } from '@gdg/store/useHeaderDropDownStore'; import useUserStatusStore from '@gdg/store/useUserStatusStore'; import { displayCenter } from '@gdg/styles/LayoutStyle'; +import { renderDropdownItems } from './StatusDropDownItems'; + export const LinkText = styled(Link)` margin-top: 3px; `; diff --git a/src/components/feature/header/MainNavigationMobile.tsx b/src/components/feature/header/MainNavigationMobile.tsx index 215d754..5d3da74 100644 --- a/src/components/feature/header/MainNavigationMobile.tsx +++ b/src/components/feature/header/MainNavigationMobile.tsx @@ -1,6 +1,6 @@ +import styled from '@emotion/styled'; import { lazy } from 'react'; -import styled from '@emotion/styled'; import MenuHamburger from '@gdg/assets/MenuHamburger.svg'; import { useNavigationStore } from '@gdg/store/useNavigationStore'; import { displayCenter } from '@gdg/styles/LayoutStyle'; diff --git a/src/components/feature/header/NavigationSlideMobile.style.ts b/src/components/feature/header/NavigationSlideMobile.style.ts index ddd49ca..1226dae 100644 --- a/src/components/feature/header/NavigationSlideMobile.style.ts +++ b/src/components/feature/header/NavigationSlideMobile.style.ts @@ -1,6 +1,6 @@ +import styled from '@emotion/styled'; import { motion } from 'framer-motion'; -import styled from '@emotion/styled'; import Text from '@gdg/components/common/typography/Text'; import { displayCenter } from '@gdg/styles/LayoutStyle'; diff --git a/src/components/feature/header/NavigationSlideMobile.tsx b/src/components/feature/header/NavigationSlideMobile.tsx index a9c8f09..94a07d4 100644 --- a/src/components/feature/header/NavigationSlideMobile.tsx +++ b/src/components/feature/header/NavigationSlideMobile.tsx @@ -1,22 +1,7 @@ +import { AnimatePresence } from 'framer-motion'; import { useEffect } from 'react'; import { NavLink, useNavigate } from 'react-router-dom'; -import { AnimatePresence } from 'framer-motion'; - -import { - CloseButton, - InformationBox, - MobileDropdownMenu, - MobileMenu, - NameText, - NavHeader, - NavImg, - NavList, - NavMenu, - NavSection, - StyledImg, -} from './NavigationSlideMobile.style'; -import { renderDropdownItems } from './StatusDropDownItems'; import { useGetMyData } from '@gdg/apis/hooks/mypage/useGetMyData'; import Apply from '@gdg/assets/Apply.svg'; import Community from '@gdg/assets/Community.svg'; @@ -33,6 +18,21 @@ import { useHeaderDropDownState } from '@gdg/store/useHeaderDropDownStore'; import { useNavigationStore } from '@gdg/store/useNavigationStore'; import useUserStatusStore from '@gdg/store/useUserStatusStore'; +import { + CloseButton, + InformationBox, + MobileDropdownMenu, + MobileMenu, + NameText, + NavHeader, + NavImg, + NavList, + NavMenu, + NavSection, + StyledImg, +} from './NavigationSlideMobile.style'; +import { renderDropdownItems } from './StatusDropDownItems'; + interface MenuItemProps { to: string; src: string; diff --git a/src/components/feature/header/StatusDropDownItems.tsx b/src/components/feature/header/StatusDropDownItems.tsx index 45a995e..a054852 100644 --- a/src/components/feature/header/StatusDropDownItems.tsx +++ b/src/components/feature/header/StatusDropDownItems.tsx @@ -1,11 +1,12 @@ +import styled from '@emotion/styled'; import * as React from 'react'; import { NavLink } from 'react-router-dom'; -import { DropdownItem } from './MainNavigation'; -import styled from '@emotion/styled'; import Text from '@gdg/components/common/typography/Text'; import { userDataInterface } from '@gdg/types/UserInterface'; +import { DropdownItem } from './MainNavigation'; + const handleLogout = () => { sessionStorage.removeItem('accessToken'); sessionStorage.removeItem('refreshToken'); diff --git a/src/components/feature/header/admin/AdminNavigation.tsx b/src/components/feature/header/admin/AdminNavigation.tsx index a5966f3..f3ab97d 100644 --- a/src/components/feature/header/admin/AdminNavigation.tsx +++ b/src/components/feature/header/admin/AdminNavigation.tsx @@ -1,6 +1,9 @@ import { useMediaQuery } from 'react-responsive'; import { NavLink } from 'react-router-dom'; +import NavigationLogo768 from '@gdg/assets/NavigationLogo768.svg'; +import NavigationLogo from '@gdg/assets/NavigationLogo.svg'; + import { Header, DisplayHeader, @@ -8,8 +11,6 @@ import { MenuList, NavImg, } from '../MainNavigation'; -import NavigationLogo768 from '@gdg/assets/NavigationLogo768.svg'; -import NavigationLogo from '@gdg/assets/NavigationLogo.svg'; export type DropdownMenuProps = { isOpen: boolean; diff --git a/src/components/feature/header/admin/AdminNavigationMobile.tsx b/src/components/feature/header/admin/AdminNavigationMobile.tsx index 5a128b6..82f79c7 100644 --- a/src/components/feature/header/admin/AdminNavigationMobile.tsx +++ b/src/components/feature/header/admin/AdminNavigationMobile.tsx @@ -1,11 +1,12 @@ +import MenuHamburger from '@gdg/assets/MenuHamburger.svg'; +import { useNavigationStore } from '@gdg/store/useNavigationStore'; + import { MobileHeader, DisplayMobileHeader, MobileImg, } from '../MainNavigationMobile'; import AdminNavigationSlide from './AdminNavigationSlide'; -import MenuHamburger from '@gdg/assets/MenuHamburger.svg'; -import { useNavigationStore } from '@gdg/store/useNavigationStore'; const AdminMainNavigationMobile = () => { const { isOpen, open } = useNavigationStore(); diff --git a/src/components/feature/header/admin/AdminNavigationSlide.tsx b/src/components/feature/header/admin/AdminNavigationSlide.tsx index 4b3a75b..c2f2b69 100644 --- a/src/components/feature/header/admin/AdminNavigationSlide.tsx +++ b/src/components/feature/header/admin/AdminNavigationSlide.tsx @@ -1,8 +1,7 @@ -import { NavLink } from 'react-router-dom'; - +import styled from '@emotion/styled'; import { motion, AnimatePresence } from 'framer-motion'; +import { NavLink } from 'react-router-dom'; -import styled from '@emotion/styled'; import Home from '@gdg/assets/Home.svg'; import NavSlideClose from '@gdg/assets/NavSlideClose.svg'; import Text from '@gdg/components/common/typography/Text'; diff --git a/src/components/feature/header/admin/AdminSideBar.style.ts b/src/components/feature/header/admin/AdminSideBar.style.ts index a703638..532f943 100644 --- a/src/components/feature/header/admin/AdminSideBar.style.ts +++ b/src/components/feature/header/admin/AdminSideBar.style.ts @@ -1,9 +1,8 @@ +import styled from '@emotion/styled'; import { motion } from 'framer-motion'; import CloseIcon from '@gdg/assets/CloseIcon.svg'; -import styled from '@emotion/styled'; - export const NavMenu = styled(motion.ul)` z-index: 4; width: 200px; diff --git a/src/components/feature/header/admin/AdminSideBar.tsx b/src/components/feature/header/admin/AdminSideBar.tsx index 2c8b3fc..efb17f8 100644 --- a/src/components/feature/header/admin/AdminSideBar.tsx +++ b/src/components/feature/header/admin/AdminSideBar.tsx @@ -1,5 +1,8 @@ import { NavLink } from 'react-router-dom'; +import Text from '@gdg/components/common/typography/Text'; +import { useNavigationStore } from '@gdg/store/useNavigationStore'; + import { NavMenu, GotoState, @@ -7,8 +10,6 @@ import { GotoDocs, CloseBtn, } from './AdminSideBar.style'; -import Text from '@gdg/components/common/typography/Text'; -import { useNavigationStore } from '@gdg/store/useNavigationStore'; const AdminSideBar = ({ open }: { open: boolean }) => { const { close } = useNavigationStore(); diff --git a/src/components/feature/header/admin/AdminTitle.tsx b/src/components/feature/header/admin/AdminTitle.tsx index 4d484c2..f7779ff 100644 --- a/src/components/feature/header/admin/AdminTitle.tsx +++ b/src/components/feature/header/admin/AdminTitle.tsx @@ -1,7 +1,13 @@ +import styled from '@emotion/styled'; import * as React from 'react'; import { useMediaQuery } from 'react-responsive'; import { useLocation, Location } from 'react-router-dom'; +import MenuHamburger from '@gdg/assets/MenuHamburger.svg'; +import Text from '@gdg/components/common/typography/Text'; +import { useNavigationStore } from '@gdg/store/useNavigationStore'; +import { DisplayLayout } from '@gdg/styles/LayoutStyle'; + import AdminSideBar from './AdminSideBar'; import { TitleWrapper, @@ -10,11 +16,6 @@ import { HamburgerMenu, } from './AdminTitle.style'; import MobileErrorPage from './MobileErrorPage'; -import styled from '@emotion/styled'; -import MenuHamburger from '@gdg/assets/MenuHamburger.svg'; -import Text from '@gdg/components/common/typography/Text'; -import { useNavigationStore } from '@gdg/store/useNavigationStore'; -import { DisplayLayout } from '@gdg/styles/LayoutStyle'; const getTitle = (pathname: string): string => { switch (pathname) { diff --git a/src/components/feature/header/admin/MobileErrorPage.tsx b/src/components/feature/header/admin/MobileErrorPage.tsx index e927a81..ab4a764 100644 --- a/src/components/feature/header/admin/MobileErrorPage.tsx +++ b/src/components/feature/header/admin/MobileErrorPage.tsx @@ -1,5 +1,9 @@ import { useNavigate } from 'react-router-dom'; +import ErrorImg from '@gdg/assets/admin/error.png'; +import CompleteBtn from '@gdg/components/common/button/CompleteBtn'; +import { LazyLoadImg } from '@gdg/components/common/img/LazyLoadingImg'; + import { MobileTitleWrapper, MobileContentContainer, @@ -9,9 +13,6 @@ import { MobileContentWrapper, MobileContainer, } from './AdminTitle.style'; -import ErrorImg from '@gdg/assets/admin/error.png'; -import CompleteBtn from '@gdg/components/common/button/CompleteBtn'; -import { LazyLoadImg } from '@gdg/components/common/img/LazyLoadingImg'; const MobileErrorPage = () => { const navigate = useNavigate(); diff --git a/src/components/feature/star/Cross.tsx b/src/components/feature/star/Cross.tsx index d1489e0..ec654d6 100644 --- a/src/components/feature/star/Cross.tsx +++ b/src/components/feature/star/Cross.tsx @@ -1,6 +1,5 @@ -import { motion } from 'framer-motion'; - import styled from '@emotion/styled'; +import { motion } from 'framer-motion'; // CrossShape 컴포넌트에 top과 left를 props로 전달받도록 설정 interface CrossShapeProps { diff --git a/src/constants/DocsTableColumns.tsx b/src/constants/DocsTableColumns.tsx index ad061e2..f1d3b39 100644 --- a/src/constants/DocsTableColumns.tsx +++ b/src/constants/DocsTableColumns.tsx @@ -1,7 +1,8 @@ +import { createColumnHelper } from '@tanstack/react-table'; + import CheckIcon from '@gdg/assets/admin/Check.svg'; import star from '@gdg/assets/admin/miniStar.svg'; import { MemberData } from '@gdg/types/AdminInterface'; -import { createColumnHelper } from '@tanstack/react-table'; const columnHelper = createColumnHelper(); diff --git a/src/constants/MemberTableColumns.tsx b/src/constants/MemberTableColumns.tsx index 876c78c..4c456cc 100644 --- a/src/constants/MemberTableColumns.tsx +++ b/src/constants/MemberTableColumns.tsx @@ -1,6 +1,7 @@ +import { createColumnHelper } from '@tanstack/react-table'; + import { PersonData } from '@gdg/apis/hooks/admin/status/useGetUserList'; import TeamCell from '@gdg/pages/admin/components/status/TeamCell'; -import { createColumnHelper } from '@tanstack/react-table'; const Role: { [key: string]: string } = { ROLE_CORE: 'Core', diff --git a/src/main.tsx b/src/main.tsx index 19e74f4..81651b8 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -1,9 +1,9 @@ +import { QueryClientProvider } from '@tanstack/react-query'; import { createRoot } from 'react-dom/client'; import { HelmetProvider } from 'react-helmet-async'; -import App from '@gdg/App.tsx'; import { queryClient } from '@gdg/apis/instance/Http'; -import { QueryClientProvider } from '@tanstack/react-query'; +import App from '@gdg/App.tsx'; createRoot(document.getElementById('root')!).render( diff --git a/src/pages/CommingSoonPage.tsx b/src/pages/CommingSoonPage.tsx index a499377..a609d77 100644 --- a/src/pages/CommingSoonPage.tsx +++ b/src/pages/CommingSoonPage.tsx @@ -1,7 +1,7 @@ +import styled from '@emotion/styled'; import { useMediaQuery } from 'react-responsive'; import { Link } from 'react-router-dom'; -import styled from '@emotion/styled'; import Home from '@gdg/assets/GDSCLogo.svg'; import CommonBtn from '@gdg/components/common/button/CommonBtn'; import Text from '@gdg/components/common/typography/Text'; diff --git a/src/pages/ErrorPage.tsx b/src/pages/ErrorPage.tsx index fb60563..d951d0c 100644 --- a/src/pages/ErrorPage.tsx +++ b/src/pages/ErrorPage.tsx @@ -1,6 +1,6 @@ +import styled from '@emotion/styled'; import { Link } from 'react-router-dom'; -import styled from '@emotion/styled'; import Home from '@gdg/assets/GDSCLogo.svg'; import CommonBtn from '@gdg/components/common/button/CommonBtn'; import Text from '@gdg/components/common/typography/Text'; diff --git a/src/pages/RootPage.tsx b/src/pages/RootPage.tsx index 3593e4c..8467efe 100644 --- a/src/pages/RootPage.tsx +++ b/src/pages/RootPage.tsx @@ -1,11 +1,10 @@ +import styled from '@emotion/styled'; import { lazy } from 'react'; import { useMediaQuery } from 'react-responsive'; import { Outlet } from 'react-router-dom'; import { displayCenter } from '@gdg/styles/LayoutStyle'; -import styled from '@emotion/styled'; - const MainNavigation = lazy( () => import('@gdg/components/feature/header/MainNavigation') ); diff --git a/src/pages/admin/AdminDocConfirmPage.tsx b/src/pages/admin/AdminDocConfirmPage.tsx index 1394442..83b8346 100644 --- a/src/pages/admin/AdminDocConfirmPage.tsx +++ b/src/pages/admin/AdminDocConfirmPage.tsx @@ -1,10 +1,11 @@ import { useState, lazy } from 'react'; -import { PassBtn, ButtonBox, InfoBox } from './AdminDocConfirmPage.style'; import { useGetStatistic } from '@gdg/apis/hooks/admin/docs/useGetStatistic'; import { useGetTrack } from '@gdg/apis/hooks/admin/docs/useGetTrack'; import { DisplayLayout } from '@gdg/styles/LayoutStyle'; +import { PassBtn, ButtonBox, InfoBox } from './AdminDocConfirmPage.style'; + const TrackSelectBar = lazy(() => import('./components/docs/TrackSelectBar')); const DocsTable = lazy( diff --git a/src/pages/admin/AdminSetStatePage.tsx b/src/pages/admin/AdminSetStatePage.tsx index 305999e..123e7e5 100644 --- a/src/pages/admin/AdminSetStatePage.tsx +++ b/src/pages/admin/AdminSetStatePage.tsx @@ -1,12 +1,13 @@ import { useState } from 'react'; +import CommonBtn from '@gdg/components/common/button/CommonBtn'; +import { DisplayLayout } from '@gdg/styles/LayoutStyle'; + import { ButtonContainer, TopContainer } from './AdminSetStatePage.style'; import AdminSearchBar from './components/AdminSearchBar'; import MemberTable from './components/MemberTable'; import ApproveModal from './components/status/ApproveModal'; import DeleteModal from './components/status/DeleteModal'; -import CommonBtn from '@gdg/components/common/button/CommonBtn'; -import { DisplayLayout } from '@gdg/styles/LayoutStyle'; const AdminSetStatePage = () => { const [deleteModalOpen, setDeleteModalOpen] = useState(false); diff --git a/src/pages/admin/AdminTeamArrangePage.tsx b/src/pages/admin/AdminTeamArrangePage.tsx index a32f63a..e1e26a6 100644 --- a/src/pages/admin/AdminTeamArrangePage.tsx +++ b/src/pages/admin/AdminTeamArrangePage.tsx @@ -1,6 +1,6 @@ +import styled from '@emotion/styled'; import { lazy } from 'react'; -import styled from '@emotion/styled'; import { DisplayLayout } from '@gdg/styles/LayoutStyle'; const CreateTeamToken = lazy( diff --git a/src/pages/admin/components/MemberTable.tsx b/src/pages/admin/components/MemberTable.tsx index 689c3b3..36c7a16 100644 --- a/src/pages/admin/components/MemberTable.tsx +++ b/src/pages/admin/components/MemberTable.tsx @@ -1,13 +1,10 @@ +import { + flexRender, + getCoreRowModel, + useReactTable, +} from '@tanstack/react-table'; import { useState, useEffect } from 'react'; -import { - StyledTable, - TableHeader, - TableHeaderRow, - TableCell, - TableHeaderCell, - TableRow, -} from './MemberTable.style'; import { userListInterface, useGetUserList, @@ -16,11 +13,15 @@ import { useGetSearchList } from '@gdg/apis/hooks/admin/useGetSearchList'; import Pagination from '@gdg/components/common/pagination/pagination'; import { columns } from '@gdg/constants/MemberTableColumns'; import { useSelectedUserStore } from '@gdg/store/useSelectedUserStore'; + import { - flexRender, - getCoreRowModel, - useReactTable, -} from '@tanstack/react-table'; + StyledTable, + TableHeader, + TableHeaderRow, + TableCell, + TableHeaderCell, + TableRow, +} from './MemberTable.style'; const MemberTable = ({ searchName }: { searchName?: string | undefined }) => { const [currentPage, setCurrentPage] = useState(0); diff --git a/src/pages/admin/components/TeamCell.tsx b/src/pages/admin/components/TeamCell.tsx index 1d268c7..cee1dec 100644 --- a/src/pages/admin/components/TeamCell.tsx +++ b/src/pages/admin/components/TeamCell.tsx @@ -1,6 +1,5 @@ -import { useState } from 'react'; - import styled from '@emotion/styled'; +import { useState } from 'react'; const DropdownBtn = styled.button` color: var(--color-white); diff --git a/src/pages/admin/components/docs/ApplyDetailModal.style.ts b/src/pages/admin/components/docs/ApplyDetailModal.style.ts index 7f84740..5a5d702 100644 --- a/src/pages/admin/components/docs/ApplyDetailModal.style.ts +++ b/src/pages/admin/components/docs/ApplyDetailModal.style.ts @@ -1,4 +1,5 @@ import styled from '@emotion/styled'; + import { displayCenter } from '@gdg/styles/LayoutStyle'; export const ModalBackdrop = styled.div` diff --git a/src/pages/admin/components/docs/ApplyDetailModal.tsx b/src/pages/admin/components/docs/ApplyDetailModal.tsx index 9f38f2e..4ba2bf0 100644 --- a/src/pages/admin/components/docs/ApplyDetailModal.tsx +++ b/src/pages/admin/components/docs/ApplyDetailModal.tsx @@ -1,5 +1,20 @@ +import styled from '@emotion/styled'; import { useState, useEffect } from 'react'; +import { useGetDocsDetail } from '@gdg/apis/hooks/admin/docs/useGetDocsDetail'; +import { usePatchMark } from '@gdg/apis/hooks/admin/docs/usePatchMark'; +import { usePatchStatus } from '@gdg/apis/hooks/admin/docs/usePatchStatus'; +import CloseIcon from '@gdg/assets/CloseIcon.svg'; +import CommonBtn from '@gdg/components/common/button/CommonBtn'; +import Text from '@gdg/components/common/typography/Text'; +import { + FrontendData, + BackendData, + AIData, + AndroidData, + DesignerData, +} from '@gdg/pages/apply/components/ApplyFormDocs'; + import { ModalBackdrop, ModalWrapper, @@ -19,20 +34,6 @@ import BasicInfo from './BasicInfo'; import Memo from './Memo'; import Stars from './Stars'; import TechStack from './TechStack'; -import styled from '@emotion/styled'; -import { useGetDocsDetail } from '@gdg/apis/hooks/admin/docs/useGetDocsDetail'; -import { usePatchMark } from '@gdg/apis/hooks/admin/docs/usePatchMark'; -import { usePatchStatus } from '@gdg/apis/hooks/admin/docs/usePatchStatus'; -import CloseIcon from '@gdg/assets/CloseIcon.svg'; -import CommonBtn from '@gdg/components/common/button/CommonBtn'; -import Text from '@gdg/components/common/typography/Text'; -import { - FrontendData, - BackendData, - AIData, - AndroidData, - DesignerData, -} from '@gdg/pages/apply/components/ApplyFormDocs'; // 트랙별 질문 데이터 가져오기 diff --git a/src/pages/admin/components/docs/ApplyDetailModalSkeleton.tsx b/src/pages/admin/components/docs/ApplyDetailModalSkeleton.tsx index 1f893b3..a7f054b 100644 --- a/src/pages/admin/components/docs/ApplyDetailModalSkeleton.tsx +++ b/src/pages/admin/components/docs/ApplyDetailModalSkeleton.tsx @@ -1,3 +1,8 @@ +import styled from '@emotion/styled'; + +import CommonBtn from '@gdg/components/common/button/CommonBtn'; +import Text from '@gdg/components/common/typography/Text'; + import { TitleWrapper, CloseBtn, @@ -13,9 +18,6 @@ import BasicInfo from './BasicInfo'; import Memo from './Memo'; import Stars from './Stars'; import TechStack from './TechStack'; -import styled from '@emotion/styled'; -import CommonBtn from '@gdg/components/common/button/CommonBtn'; -import Text from '@gdg/components/common/typography/Text'; const MarkBtn = styled.button` width: 30px; diff --git a/src/pages/admin/components/docs/ApplyInfo.tsx b/src/pages/admin/components/docs/ApplyInfo.tsx index 2017156..2c67915 100644 --- a/src/pages/admin/components/docs/ApplyInfo.tsx +++ b/src/pages/admin/components/docs/ApplyInfo.tsx @@ -1,4 +1,5 @@ import styled from '@emotion/styled'; + import Text from '@gdg/components/common/typography/Text'; const InfoWrapper = styled.div` diff --git a/src/pages/admin/components/docs/BasicInfo.tsx b/src/pages/admin/components/docs/BasicInfo.tsx index 0e985a9..8bcba35 100644 --- a/src/pages/admin/components/docs/BasicInfo.tsx +++ b/src/pages/admin/components/docs/BasicInfo.tsx @@ -1,6 +1,6 @@ +import styled from '@emotion/styled'; import { useMediaQuery } from 'react-responsive'; -import styled from '@emotion/styled'; import Text from '@gdg/components/common/typography/Text'; const CardWrapper = styled.div` diff --git a/src/pages/admin/components/docs/CurrentApplyInfo.tsx b/src/pages/admin/components/docs/CurrentApplyInfo.tsx index d12fb31..a2e4d9b 100644 --- a/src/pages/admin/components/docs/CurrentApplyInfo.tsx +++ b/src/pages/admin/components/docs/CurrentApplyInfo.tsx @@ -1,4 +1,5 @@ import styled from '@emotion/styled'; + import Text from '@gdg/components/common/typography/Text'; type Props = { diff --git a/src/pages/admin/components/docs/DocsTable.tsx b/src/pages/admin/components/docs/DocsTable.tsx index 65ff59c..d90a0d3 100644 --- a/src/pages/admin/components/docs/DocsTable.tsx +++ b/src/pages/admin/components/docs/DocsTable.tsx @@ -1,6 +1,10 @@ +import { + flexRender, + getCoreRowModel, + useReactTable, +} from '@tanstack/react-table'; import { useState, useEffect } from 'react'; -import ApplyDetailModal from './ApplyDetailModal'; import { applyDocsInterface, useGetApplyDocs, @@ -16,11 +20,8 @@ import { TableHeaderCell, TableRow, } from '@gdg/pages/admin/components/MemberTable.style'; -import { - flexRender, - getCoreRowModel, - useReactTable, -} from '@tanstack/react-table'; + +import ApplyDetailModal from './ApplyDetailModal'; const getTrack = (index: number) => { switch (index) { diff --git a/src/pages/admin/components/docs/Memo.tsx b/src/pages/admin/components/docs/Memo.tsx index a833459..5572ca0 100644 --- a/src/pages/admin/components/docs/Memo.tsx +++ b/src/pages/admin/components/docs/Memo.tsx @@ -1,6 +1,6 @@ +import styled from '@emotion/styled'; import { useState } from 'react'; -import styled from '@emotion/styled'; import { usePatchDocsMemo } from '@gdg/apis/hooks/admin/docs/usePatchDocsMemo'; import CommonBtn from '@gdg/components/common/button/CommonBtn'; import Text from '@gdg/components/common/typography/Text'; diff --git a/src/pages/admin/components/docs/TechStack.tsx b/src/pages/admin/components/docs/TechStack.tsx index 2905b7f..d32842b 100644 --- a/src/pages/admin/components/docs/TechStack.tsx +++ b/src/pages/admin/components/docs/TechStack.tsx @@ -1,4 +1,5 @@ import styled from '@emotion/styled'; + import linkIcon from '@gdg/assets/admin/linkIcon.svg'; import CommonBtn from '@gdg/components/common/button/CommonBtn'; import Text from '@gdg/components/common/typography/Text'; diff --git a/src/pages/admin/components/docs/TrackSelectBar.tsx b/src/pages/admin/components/docs/TrackSelectBar.tsx index f6c6db9..c688768 100644 --- a/src/pages/admin/components/docs/TrackSelectBar.tsx +++ b/src/pages/admin/components/docs/TrackSelectBar.tsx @@ -1,9 +1,10 @@ import { useState } from 'react'; -import { SelectBarWrapper, TrackBtnStyle } from './TrackSelectBar.style'; import { TrackInterface } from '@gdg/apis/hooks/admin/docs/useGetTrack'; import Text from '@gdg/components/common/typography/Text'; +import { SelectBarWrapper, TrackBtnStyle } from './TrackSelectBar.style'; + interface ITrackButton { onClick?: () => void; isSelected: boolean; diff --git a/src/pages/admin/components/status/AdminSearchBar.tsx b/src/pages/admin/components/status/AdminSearchBar.tsx index 4dd1dd7..8345a73 100644 --- a/src/pages/admin/components/status/AdminSearchBar.tsx +++ b/src/pages/admin/components/status/AdminSearchBar.tsx @@ -1,9 +1,10 @@ +import SearchIcon from '@gdg/assets/SearchIcon.svg'; + import { SearchBarContainer, SearchIconImg, SearchInput, } from './AdminSearchBar.style'; -import SearchIcon from '@gdg/assets/SearchIcon.svg'; const AdminSearchBar = () => { return ( diff --git a/src/pages/admin/components/status/ApproveModal.tsx b/src/pages/admin/components/status/ApproveModal.tsx index 94f93e1..0536543 100644 --- a/src/pages/admin/components/status/ApproveModal.tsx +++ b/src/pages/admin/components/status/ApproveModal.tsx @@ -1,14 +1,15 @@ -import { - ModalBackdrop, - ModalWrapper, - ButtonContainer, -} from './ApproveModal.style'; import { useApproveUserList } from '@gdg/apis/hooks/admin/useApproveUser'; import CommonBtn from '@gdg/components/common/button/CommonBtn'; import Text from '@gdg/components/common/typography/Text'; import { CloseBtn } from '@gdg/components/feature/header/admin/AdminSideBar.style'; import { useSelectedUserStore } from '@gdg/store/useSelectedUserStore'; +import { + ModalBackdrop, + ModalWrapper, + ButtonContainer, +} from './ApproveModal.style'; + interface ApproveModalProps { onClose: () => void; } @@ -28,7 +29,8 @@ const ApproveModal = ({ onClose }: ApproveModalProps) => { window.location.reload(); }, onError: (error) => { - console.error('승인 실패:', error); + // console.error('승인 실패:', error); + throw new Error(error.message || 'Unknown error'); }, } ); diff --git a/src/pages/admin/components/status/DeleteModal.tsx b/src/pages/admin/components/status/DeleteModal.tsx index b9053b4..dc37f41 100644 --- a/src/pages/admin/components/status/DeleteModal.tsx +++ b/src/pages/admin/components/status/DeleteModal.tsx @@ -1,4 +1,3 @@ -import { ModalWrapper, ButtonContainer } from './DeleteModal.style'; import { useDeleteUserList } from '@gdg/apis/hooks/admin/status/useDeleteUser'; import trashcanIcon from '@gdg/assets/admin/trashcanIcon.svg'; import CommonBtn from '@gdg/components/common/button/CommonBtn'; @@ -6,6 +5,8 @@ import Text from '@gdg/components/common/typography/Text'; import { CloseBtn } from '@gdg/components/feature/header/admin/AdminSideBar.style'; import { useSelectedUserStore } from '@gdg/store/useSelectedUserStore'; +import { ModalWrapper, ButtonContainer } from './DeleteModal.style'; + interface DeleteModalProps { onClose: () => void; } @@ -25,7 +26,7 @@ const DeleteModal = ({ onClose }: DeleteModalProps) => { alert('사용자가 성공적으로 삭제되었습니다.'); window.location.reload(); } catch (error) { - console.error(error); + // console.error(error); alert('사용자 삭제에 실패했습니다'); } finally { onClose(); diff --git a/src/pages/admin/components/status/MemberTable.tsx b/src/pages/admin/components/status/MemberTable.tsx index a232126..32a90a2 100644 --- a/src/pages/admin/components/status/MemberTable.tsx +++ b/src/pages/admin/components/status/MemberTable.tsx @@ -1,13 +1,10 @@ +import { + flexRender, + getCoreRowModel, + useReactTable, +} from '@tanstack/react-table'; import { useState, useEffect } from 'react'; -import { - StyledTable, - TableHeader, - TableHeaderRow, - TableCell, - TableHeaderCell, - TableRow, -} from './MemberTable.style'; import { userListInterface, useGetUserList, @@ -15,11 +12,15 @@ import { import Pagination from '@gdg/components/common/pagination/pagination'; import { columns } from '@gdg/constants/MemberTableColumns'; import { useSelectedUserStore } from '@gdg/store/useSelectedUserStore'; + import { - flexRender, - getCoreRowModel, - useReactTable, -} from '@tanstack/react-table'; + StyledTable, + TableHeader, + TableHeaderRow, + TableCell, + TableHeaderCell, + TableRow, +} from './MemberTable.style'; const MemberTable = () => { const [currentPage, setCurrentPage] = useState(0); diff --git a/src/pages/admin/components/status/TeamCell.tsx b/src/pages/admin/components/status/TeamCell.tsx index 1d268c7..cee1dec 100644 --- a/src/pages/admin/components/status/TeamCell.tsx +++ b/src/pages/admin/components/status/TeamCell.tsx @@ -1,6 +1,5 @@ -import { useState } from 'react'; - import styled from '@emotion/styled'; +import { useState } from 'react'; const DropdownBtn = styled.button` color: var(--color-white); diff --git a/src/pages/admin/components/team/CreateTeamToken.tsx b/src/pages/admin/components/team/CreateTeamToken.tsx index 4748d55..e6479bf 100644 --- a/src/pages/admin/components/team/CreateTeamToken.tsx +++ b/src/pages/admin/components/team/CreateTeamToken.tsx @@ -1,5 +1,14 @@ +import { DragDropContext, DropResult } from '@hello-pangea/dnd'; import { useEffect, useState, lazy } from 'react'; +import { deleteParentTeam } from '@gdg/apis/hooks/admin/team/deleteParentTeam'; +import { putTeamMember } from '@gdg/apis/hooks/admin/team/putTeamMember'; +import { useGetAllTeamToken } from '@gdg/apis/hooks/admin/team/useGetAllTeamToken'; +import type { Team } from '@gdg/apis/hooks/admin/team/useGetAllTeamToken'; +import PlusBtn from '@gdg/assets/admin/PlusBtn.svg'; +import close from '@gdg/assets/admin/remove.svg'; +import { useTeamUpdate } from '@gdg/provider/TeamUpdate'; + import { BtnWrapper, PlusBtnImg, @@ -9,14 +18,6 @@ import { CloseButton, ButtonContainer, } from './CreateTeamToken.style'; -import { deleteParentTeam } from '@gdg/apis/hooks/admin/team/deleteParentTeam'; -import { putTeamMember } from '@gdg/apis/hooks/admin/team/putTeamMember'; -import { useGetAllTeamToken } from '@gdg/apis/hooks/admin/team/useGetAllTeamToken'; -import type { Team } from '@gdg/apis/hooks/admin/team/useGetAllTeamToken'; -import PlusBtn from '@gdg/assets/admin/PlusBtn.svg'; -import close from '@gdg/assets/admin/remove.svg'; -import { useTeamUpdate } from '@gdg/provider/TeamUpdate'; -import { DragDropContext, DropResult } from '@hello-pangea/dnd'; const TeamBox = lazy(() => import('./TeamBox')); const CreateTeamModal = lazy(() => import('./modal/CreateTeamModal')); @@ -84,7 +85,7 @@ const CreateTeamToken = () => { await putTeamMember({ oldTeamId, newTeamId, memberId }); setIsTeamUpdate(true); } catch (error) { - console.error(error); + // console.error(error); } }; diff --git a/src/pages/admin/components/team/MemberProfile.tsx b/src/pages/admin/components/team/MemberProfile.tsx index bb0845b..934d9b5 100644 --- a/src/pages/admin/components/team/MemberProfile.tsx +++ b/src/pages/admin/components/team/MemberProfile.tsx @@ -1,7 +1,9 @@ -import { MemberBox, TextWrapper } from './TeamBox.style'; +import { Draggable } from '@hello-pangea/dnd'; + import type { TeamMember } from '@gdg/apis/hooks/admin/team/useGetTeamMember'; import Text from '@gdg/components/common/typography/Text'; -import { Draggable } from '@hello-pangea/dnd'; + +import { MemberBox, TextWrapper } from './TeamBox.style'; const MemberProfile = ({ member, diff --git a/src/pages/admin/components/team/SubTeamBox.tsx b/src/pages/admin/components/team/SubTeamBox.tsx index c2bfef5..60e91ef 100644 --- a/src/pages/admin/components/team/SubTeamBox.tsx +++ b/src/pages/admin/components/team/SubTeamBox.tsx @@ -1,14 +1,15 @@ +import { Droppable } from '@hello-pangea/dnd'; import { useEffect, lazy } from 'react'; -import { RemoveBtn } from './CreateTeamToken.style'; -import { MemberTable, ParentTeamBox, TitleWrapper } from './TeamBox.style'; import { deleteSubTeam } from '@gdg/apis/hooks/admin/team/deleteSubTeam'; import { useGetTeamMember } from '@gdg/apis/hooks/admin/team/useGetTeamMember'; import close from '@gdg/assets/admin/remove.svg'; import { LoadingView } from '@gdg/components/common/View/LoadingView'; import Text from '@gdg/components/common/typography/Text'; import { useTeamUpdate } from '@gdg/provider/TeamUpdate'; -import { Droppable } from '@hello-pangea/dnd'; + +import { RemoveBtn } from './CreateTeamToken.style'; +import { MemberTable, ParentTeamBox, TitleWrapper } from './TeamBox.style'; const MemberProfile = lazy(() => import('./MemberProfile')); diff --git a/src/pages/admin/components/team/TeamBox.tsx b/src/pages/admin/components/team/TeamBox.tsx index 7a095c2..74896e3 100644 --- a/src/pages/admin/components/team/TeamBox.tsx +++ b/src/pages/admin/components/team/TeamBox.tsx @@ -1,18 +1,19 @@ +import { Droppable } from '@hello-pangea/dnd'; import { useEffect, lazy } from 'react'; -import { - MemberTable, - ParentTeamBox, - PlusBox, - TeamBoxContainer, -} from './TeamBox.style'; import { postSubTeam } from '@gdg/apis/hooks/admin/team/postSubTeam'; import type { SubTeam } from '@gdg/apis/hooks/admin/team/useGetAllTeamToken'; import { useGetTeamMember } from '@gdg/apis/hooks/admin/team/useGetTeamMember'; import PlusBtn from '@gdg/assets/admin/PlusBtn.svg'; import Text from '@gdg/components/common/typography/Text'; import { useTeamUpdate } from '@gdg/provider/TeamUpdate'; -import { Droppable } from '@hello-pangea/dnd'; + +import { + MemberTable, + ParentTeamBox, + PlusBox, + TeamBoxContainer, +} from './TeamBox.style'; const MemberProfile = lazy(() => import('./MemberProfile')); const SubTeamBox = lazy(() => import('./SubTeamBox')); diff --git a/src/pages/admin/components/team/modal/CreateTeamModal.tsx b/src/pages/admin/components/team/modal/CreateTeamModal.tsx index 585bcf9..5ce7f7f 100644 --- a/src/pages/admin/components/team/modal/CreateTeamModal.tsx +++ b/src/pages/admin/components/team/modal/CreateTeamModal.tsx @@ -1,11 +1,12 @@ import { useState } from 'react'; import { useForm } from 'react-hook-form'; -import ModalContent from './ModalContent'; import { postTeamToken } from '@gdg/apis/hooks/admin/team/postTeamToken'; import { useGetAllTeamToken } from '@gdg/apis/hooks/admin/team/useGetAllTeamToken'; import { ModalBackdrop, ModalOverlay } from '@gdg/styles/GlobalModal.style'; +import ModalContent from './ModalContent'; + type TrackType = 'FRONT_END' | 'BACK_END' | 'ANDROID' | 'AI' | 'DESIGNER'; export type FormData = { diff --git a/src/pages/admin/components/team/modal/ModalContent.tsx b/src/pages/admin/components/team/modal/ModalContent.tsx index 8515308..63dda4a 100644 --- a/src/pages/admin/components/team/modal/ModalContent.tsx +++ b/src/pages/admin/components/team/modal/ModalContent.tsx @@ -1,13 +1,13 @@ +import styled from '@emotion/styled'; +import { motion } from 'framer-motion'; import { UseFormRegister, UseFormHandleSubmit } from 'react-hook-form'; -import { motion } from 'framer-motion'; +import Text from '@gdg/components/common/typography/Text'; import ButtonContainer from './ButtonContainer'; import type { FormData } from './CreateTeamModal'; import FormField from './FormField'; import { TextContainer } from './TextContainer'; -import styled from '@emotion/styled'; -import Text from '@gdg/components/common/typography/Text'; interface ModalContentProps { register: UseFormRegister; diff --git a/src/pages/apply/ApplyExPage.tsx b/src/pages/apply/ApplyExPage.tsx index 212a783..b60fae5 100644 --- a/src/pages/apply/ApplyExPage.tsx +++ b/src/pages/apply/ApplyExPage.tsx @@ -1,11 +1,9 @@ -import Star from '@gdg/components/feature/star/Star'; +import styled from '@emotion/styled'; +import Star from '@gdg/components/feature/star/Star'; import ApplyEx from '@gdg/pages/apply/components/ApplyEx'; - -import { DisplayLayout } from '@gdg/styles/LayoutStyle'; - -import styled from '@emotion/styled'; import { ApplyExMetaData } from '@gdg/router/components/MetaData'; +import { DisplayLayout } from '@gdg/styles/LayoutStyle'; const ApplyLayout = styled(DisplayLayout)` height: 100%; diff --git a/src/pages/apply/ApplyFormPage.tsx b/src/pages/apply/ApplyFormPage.tsx index 37492f5..4e31510 100644 --- a/src/pages/apply/ApplyFormPage.tsx +++ b/src/pages/apply/ApplyFormPage.tsx @@ -1,10 +1,7 @@ import Star from '@gdg/components/feature/star/Star'; - import ApplyForm from '@gdg/pages/apply/components/ApplyForm'; - -import { DisplayLayout } from '@gdg/styles/LayoutStyle'; - import { ApplyFormMetaData } from '@gdg/router/components/MetaData'; +import { DisplayLayout } from '@gdg/styles/LayoutStyle'; const ApplyFormPage = () => { return ( diff --git a/src/pages/apply/ApplyPage.tsx b/src/pages/apply/ApplyPage.tsx index 06977f8..cc8a290 100644 --- a/src/pages/apply/ApplyPage.tsx +++ b/src/pages/apply/ApplyPage.tsx @@ -1,18 +1,14 @@ -import { useEffect, useState } from 'react'; - +import styled from '@emotion/styled'; import dayjs from 'dayjs'; +import { useEffect, useState } from 'react'; import InnerCircle from '@gdg/components/feature/background/InnerCircle'; import CrossShape from '@gdg/components/feature/star/Cross'; import Star from '@gdg/components/feature/star/Star'; - import ApplyNav from '@gdg/pages/apply/components/ApplyNav'; import ApplyNavEnd from '@gdg/pages/apply/components/ApplyNavEnd'; - -import { DisplayLayout } from '@gdg/styles/LayoutStyle'; - -import styled from '@emotion/styled'; import { ApplyMetaData } from '@gdg/router/components/MetaData'; +import { DisplayLayout } from '@gdg/styles/LayoutStyle'; const ApplyLayout = styled(DisplayLayout)` height: 100%; diff --git a/src/pages/apply/components/ApplyEx.tsx b/src/pages/apply/components/ApplyEx.tsx index f928317..7ffffce 100644 --- a/src/pages/apply/components/ApplyEx.tsx +++ b/src/pages/apply/components/ApplyEx.tsx @@ -1,7 +1,7 @@ +import styled from '@emotion/styled'; import { useMediaQuery } from 'react-responsive'; import { useParams, useNavigate } from 'react-router-dom'; -import styled from '@emotion/styled'; import CommonBtn from '@gdg/components/common/button/CommonBtn'; import { FrontendData, diff --git a/src/pages/apply/components/ApplyForm.style.ts b/src/pages/apply/components/ApplyForm.style.ts index a0ad50b..f5f15b6 100644 --- a/src/pages/apply/components/ApplyForm.style.ts +++ b/src/pages/apply/components/ApplyForm.style.ts @@ -1,4 +1,5 @@ import styled from '@emotion/styled'; + import Text from '@gdg/components/common/typography/Text'; export const Error = styled.small` diff --git a/src/pages/apply/components/ApplyForm.tsx b/src/pages/apply/components/ApplyForm.tsx index 794ce19..cafbb5d 100644 --- a/src/pages/apply/components/ApplyForm.tsx +++ b/src/pages/apply/components/ApplyForm.tsx @@ -1,3 +1,5 @@ +import { ErrorMessage } from '@hookform/error-message'; +import { zodResolver } from '@hookform/resolvers/zod'; import { useState } from 'react'; import { useForm } from 'react-hook-form'; import { Oval } from 'react-loader-spinner'; @@ -43,8 +45,6 @@ import { } from '@gdg/types/ApplyInterface'; import { ApplyFormSchema } from '@gdg/utils/ApplyFormScehma.util'; import { handleFormSubmit } from '@gdg/utils/anlytics'; -import { ErrorMessage } from '@hookform/error-message'; -import { zodResolver } from '@hookform/resolvers/zod'; const getTrack = (tech: string): string => { switch (tech.toLowerCase()) { diff --git a/src/pages/apply/components/ApplyNavBox.tsx b/src/pages/apply/components/ApplyNavBox.tsx index b877256..840fe68 100644 --- a/src/pages/apply/components/ApplyNavBox.tsx +++ b/src/pages/apply/components/ApplyNavBox.tsx @@ -1,6 +1,6 @@ +import styled from '@emotion/styled'; import { NavLink } from 'react-router-dom'; -import styled from '@emotion/styled'; import CommonBtn from '@gdg/components/common/button/CommonBtn'; import Text from '@gdg/components/common/typography/Text'; diff --git a/src/pages/apply/components/ApplyNavEnd.tsx b/src/pages/apply/components/ApplyNavEnd.tsx index 75c6073..6c1466b 100644 --- a/src/pages/apply/components/ApplyNavEnd.tsx +++ b/src/pages/apply/components/ApplyNavEnd.tsx @@ -1,8 +1,8 @@ +import styled from '@emotion/styled'; import { useMediaQuery } from 'react-responsive'; import { Link } from 'react-router-dom'; import Text from '@gdg/components/common/typography/Text'; - import { ApplyLayout, TitleLayout, @@ -14,8 +14,6 @@ import { InquiryText, } from '@gdg/styles/ApplyStyle'; -import styled from '@emotion/styled'; - const ApplyLayoutEnd = styled(ApplyLayout)` height: calc(100vh - 95px); `; diff --git a/src/pages/apply/components/ApplyQualify.tsx b/src/pages/apply/components/ApplyQualify.tsx index d5b9bf3..a10d067 100644 --- a/src/pages/apply/components/ApplyQualify.tsx +++ b/src/pages/apply/components/ApplyQualify.tsx @@ -1,4 +1,5 @@ import styled from '@emotion/styled'; + import ApplyArrow from '@gdg/assets/ApplyArrow.svg'; import ApplyForm from '@gdg/assets/ApplyForm.svg'; import ApplyInterview from '@gdg/assets/ApplyInterview.svg'; diff --git a/src/pages/apply/components/ApplySaveForm.tsx b/src/pages/apply/components/ApplySaveForm.tsx index 0a1ef9e..b99bfee 100644 --- a/src/pages/apply/components/ApplySaveForm.tsx +++ b/src/pages/apply/components/ApplySaveForm.tsx @@ -1,3 +1,5 @@ +import { ErrorMessage } from '@hookform/error-message'; +import { zodResolver } from '@hookform/resolvers/zod'; import { useState } from 'react'; import { useForm } from 'react-hook-form'; import { Oval } from 'react-loader-spinner'; @@ -43,8 +45,6 @@ import { } from '@gdg/types/ApplyInterface'; import { ApplyFormSchema } from '@gdg/utils/ApplyFormScehma.util'; import { handleFormSubmit } from '@gdg/utils/anlytics'; -import { ErrorMessage } from '@hookform/error-message'; -import { zodResolver } from '@hookform/resolvers/zod'; interface ApplySaveFormProps { SaveData: ApplyFormAPIInterface; diff --git a/src/pages/apply/components/InquiryModal.tsx b/src/pages/apply/components/InquiryModal.tsx index b16484d..38dc118 100644 --- a/src/pages/apply/components/InquiryModal.tsx +++ b/src/pages/apply/components/InquiryModal.tsx @@ -1,11 +1,11 @@ +import styled from '@emotion/styled'; +import { useQueryClient } from '@tanstack/react-query'; +import dayjs from 'dayjs'; import { useEffect, useState } from 'react'; import { Oval } from 'react-loader-spinner'; import { useMediaQuery } from 'react-responsive'; import { useNavigate } from 'react-router-dom'; -import dayjs from 'dayjs'; - -import styled from '@emotion/styled'; import { ApplyInquiryQuery } from '@gdg/apis/hooks/apply/ApplyInquiryQuery'; import CommonBtn from '@gdg/components/common/button/CommonBtn'; import Input from '@gdg/components/common/form/Input'; @@ -13,7 +13,6 @@ import Text from '@gdg/components/common/typography/Text'; import ApplySaveForm from '@gdg/pages/apply/components/ApplySaveForm'; import { AuthWrapper, AuthForm } from '@gdg/styles/AuthModalStyle'; import { displayCenter, DisplayLayout } from '@gdg/styles/LayoutStyle'; -import { useQueryClient } from '@tanstack/react-query'; const TitleContainer = styled.h2` width: 80%; diff --git a/src/pages/apply/components/PCApplyBox.tsx b/src/pages/apply/components/PCApplyBox.tsx index 58c74b9..35bea17 100644 --- a/src/pages/apply/components/PCApplyBox.tsx +++ b/src/pages/apply/components/PCApplyBox.tsx @@ -1,6 +1,6 @@ +import styled from '@emotion/styled'; import { NavLink } from 'react-router-dom'; -import styled from '@emotion/styled'; import CommonBtn from '@gdg/components/common/button/CommonBtn'; import Text from '@gdg/components/common/typography/Text'; import { ApplyExInterface } from '@gdg/types/ApplyInterface'; diff --git a/src/pages/community/CommunityPage.tsx b/src/pages/community/CommunityPage.tsx index 8ebdef1..5256626 100644 --- a/src/pages/community/CommunityPage.tsx +++ b/src/pages/community/CommunityPage.tsx @@ -1,6 +1,7 @@ -import CommingSoonPage from '../CommingSoonPage'; import { CommunityMetaData } from '@gdg/router/components/MetaData'; +import CommingSoonPage from '../CommingSoonPage'; + const CommunityPage = () => { return ( <> diff --git a/src/pages/introduce/IntroducePage.tsx b/src/pages/introduce/IntroducePage.tsx index 77f0f20..f9d8857 100644 --- a/src/pages/introduce/IntroducePage.tsx +++ b/src/pages/introduce/IntroducePage.tsx @@ -1,4 +1,5 @@ import gsap from 'gsap'; +import { ScrollTrigger } from 'gsap/ScrollTrigger'; import useScrollTracker from '@gdg/hooks/useScrollTracker'; import AboutEvent from '@gdg/pages/introduce/components/AboutEvent'; @@ -10,7 +11,6 @@ import IntroduceEvent from '@gdg/pages/introduce/components/IntroduceEvent'; import LineEvent from '@gdg/pages/introduce/components/LineEvent'; import { IntroduceMetaData } from '@gdg/router/components/MetaData'; import { DisplayLayout } from '@gdg/styles/LayoutStyle'; -import { ScrollTrigger } from 'gsap/ScrollTrigger'; gsap.registerPlugin(ScrollTrigger); diff --git a/src/pages/introduce/components/AboutEvent.tsx b/src/pages/introduce/components/AboutEvent.tsx index c56c862..6c04f28 100644 --- a/src/pages/introduce/components/AboutEvent.tsx +++ b/src/pages/introduce/components/AboutEvent.tsx @@ -1,12 +1,11 @@ -import { useEffect } from 'react'; - +import styled from '@emotion/styled'; import gsap from 'gsap'; +import { ScrollTrigger } from 'gsap/ScrollTrigger'; +import { useEffect } from 'react'; -import styled from '@emotion/styled'; import Text from '@gdg/components/common/typography/Text'; import { GDSCText, IntroText } from '@gdg/styles/IntroduceStyle'; import { displayCenter } from '@gdg/styles/LayoutStyle'; -import { ScrollTrigger } from 'gsap/ScrollTrigger'; gsap.registerPlugin(ScrollTrigger); diff --git a/src/pages/introduce/components/CoreTable.tsx b/src/pages/introduce/components/CoreTable.tsx index 4b3a8f2..153affe 100644 --- a/src/pages/introduce/components/CoreTable.tsx +++ b/src/pages/introduce/components/CoreTable.tsx @@ -1,8 +1,8 @@ -import { useEffect } from 'react'; - +import styled from '@emotion/styled'; import gsap from 'gsap'; +import { ScrollTrigger } from 'gsap/ScrollTrigger'; +import { useEffect } from 'react'; -import styled from '@emotion/styled'; import Bosung from '@gdg/assets/gdscknu4/Core-Bosung.jpg'; import Chaewon from '@gdg/assets/gdscknu4/Core-Chaewon.png'; import Daegun from '@gdg/assets/gdscknu4/Core-Daegun.jpg'; @@ -15,7 +15,6 @@ import Suhyeon from '@gdg/assets/gdscknu4/Core-Suhyeon.jpg'; import Yeongin from '@gdg/assets/gdscknu4/Core-Yeongin.jpeg'; import Kyuhoi from '@gdg/assets/gdscknu4/Lead-Kyuhoi.png'; import { IntroText, IntroTextStyle } from '@gdg/styles/IntroduceStyle'; -import { ScrollTrigger } from 'gsap/ScrollTrigger'; gsap.registerPlugin(ScrollTrigger); diff --git a/src/pages/introduce/components/Diagonal.tsx b/src/pages/introduce/components/Diagonal.tsx index 3b35413..201a1c3 100644 --- a/src/pages/introduce/components/Diagonal.tsx +++ b/src/pages/introduce/components/Diagonal.tsx @@ -1,9 +1,7 @@ -import { useEffect } from 'react'; - -import gsap from 'gsap'; - import styled from '@emotion/styled'; +import gsap from 'gsap'; import { ScrollTrigger } from 'gsap/ScrollTrigger'; +import { useEffect } from 'react'; gsap.registerPlugin(ScrollTrigger); diff --git a/src/pages/introduce/components/FieldEvent.tsx b/src/pages/introduce/components/FieldEvent.tsx index a9d8532..3d05785 100644 --- a/src/pages/introduce/components/FieldEvent.tsx +++ b/src/pages/introduce/components/FieldEvent.tsx @@ -1,12 +1,11 @@ -import { useEffect } from 'react'; - +import styled from '@emotion/styled'; import gsap from 'gsap'; +import { ScrollTrigger } from 'gsap/ScrollTrigger'; +import { useEffect } from 'react'; -import styled from '@emotion/styled'; import Text from '@gdg/components/common/typography/Text'; import { GDSCText, IntroText } from '@gdg/styles/IntroduceStyle'; import { displayCenter } from '@gdg/styles/LayoutStyle'; -import { ScrollTrigger } from 'gsap/ScrollTrigger'; gsap.registerPlugin(ScrollTrigger); diff --git a/src/pages/introduce/components/FieldTable.tsx b/src/pages/introduce/components/FieldTable.tsx index d54cd80..411a666 100644 --- a/src/pages/introduce/components/FieldTable.tsx +++ b/src/pages/introduce/components/FieldTable.tsx @@ -1,11 +1,10 @@ +import styled from '@emotion/styled'; +import gsap from 'gsap'; +import { ScrollTrigger } from 'gsap/ScrollTrigger'; import { useEffect } from 'react'; import { useMediaQuery } from 'react-responsive'; -import gsap from 'gsap'; - -import styled from '@emotion/styled'; import Text from '@gdg/components/common/typography/Text'; -import { ScrollTrigger } from 'gsap/ScrollTrigger'; gsap.registerPlugin(ScrollTrigger); diff --git a/src/pages/introduce/components/IntroduceEvent.tsx b/src/pages/introduce/components/IntroduceEvent.tsx index 57b95cb..0290ef3 100644 --- a/src/pages/introduce/components/IntroduceEvent.tsx +++ b/src/pages/introduce/components/IntroduceEvent.tsx @@ -1,12 +1,11 @@ -import { useEffect } from 'react'; - +import styled from '@emotion/styled'; import gsap from 'gsap'; +import { ScrollTrigger } from 'gsap/ScrollTrigger'; +import { useEffect } from 'react'; -import styled from '@emotion/styled'; import Text from '@gdg/components/common/typography/Text'; import { GDSCText, IntroText } from '@gdg/styles/IntroduceStyle'; import { displayCenter } from '@gdg/styles/LayoutStyle'; -import { ScrollTrigger } from 'gsap/ScrollTrigger'; gsap.registerPlugin(ScrollTrigger); diff --git a/src/pages/introduce/components/LineEvent.tsx b/src/pages/introduce/components/LineEvent.tsx index 0c19fcc..dbe46a3 100644 --- a/src/pages/introduce/components/LineEvent.tsx +++ b/src/pages/introduce/components/LineEvent.tsx @@ -1,9 +1,7 @@ -import { useEffect } from 'react'; - -import gsap from 'gsap'; - import styled from '@emotion/styled'; +import gsap from 'gsap'; import { ScrollTrigger } from 'gsap/ScrollTrigger'; +import { useEffect } from 'react'; gsap.registerPlugin(ScrollTrigger); diff --git a/src/pages/main/MainPage.tsx b/src/pages/main/MainPage.tsx index 36f879f..a3d125b 100644 --- a/src/pages/main/MainPage.tsx +++ b/src/pages/main/MainPage.tsx @@ -1,15 +1,12 @@ +import styled from '@emotion/styled'; import { lazy } from 'react'; import { useMediaQuery } from 'react-responsive'; import CrossShape from '@gdg/components/feature/star/Cross'; - import Content from '@gdg/pages/main/components/Content'; import MainRound from '@gdg/pages/main/components/MainRound'; - -import { DisplayLayout } from '@gdg/styles/LayoutStyle'; - -import styled from '@emotion/styled'; import { MainMetaData } from '@gdg/router/components/MetaData'; +import { DisplayLayout } from '@gdg/styles/LayoutStyle'; const MainFooterMobile = lazy( () => import('@gdg/components/feature/footer/MainFooterMobile') diff --git a/src/pages/main/components/Content.tsx b/src/pages/main/components/Content.tsx index 9a9a0e3..a525482 100644 --- a/src/pages/main/components/Content.tsx +++ b/src/pages/main/components/Content.tsx @@ -1,12 +1,9 @@ -import { useEffect, useRef } from 'react'; - +import styled from '@emotion/styled'; import gsap from 'gsap'; - -import Text from '@gdg/components/common/typography/Text'; +import { useEffect, useRef } from 'react'; import SpaceShip from '@gdg/assets/SpaceShip.svg'; - -import styled from '@emotion/styled'; +import Text from '@gdg/components/common/typography/Text'; const ContentLayout = styled.div` display: flex; diff --git a/src/pages/main/components/MainRound.tsx b/src/pages/main/components/MainRound.tsx index fa01ccb..c5a4d6b 100644 --- a/src/pages/main/components/MainRound.tsx +++ b/src/pages/main/components/MainRound.tsx @@ -1,8 +1,6 @@ -import { useEffect, useRef, lazy } from 'react'; - -import gsap from 'gsap'; - import styled from '@emotion/styled'; +import gsap from 'gsap'; +import { useEffect, useRef, lazy } from 'react'; const RotateCarousel = lazy(() => import('./RotateCarousel')); diff --git a/src/pages/main/components/PCRotateCarousel.tsx b/src/pages/main/components/PCRotateCarousel.tsx index bdf7e50..857bf08 100644 --- a/src/pages/main/components/PCRotateCarousel.tsx +++ b/src/pages/main/components/PCRotateCarousel.tsx @@ -1,6 +1,14 @@ import { memo } from 'react'; import { Link } from 'react-router-dom'; +import EarthWebM from '@gdg/assets/Earth.webm'; +import LeftArrow from '@gdg/assets/LeftArrow.svg'; +import RightArrow from '@gdg/assets/RightArrow.svg'; +import CompleteBtn from '@gdg/components/common/button/CompleteBtn'; +import Text from '@gdg/components/common/typography/Text'; +import { useColTz } from '@gdg/hooks/useColTz'; +import { useCarouselStore } from '@gdg/store/useCarouselStore'; + import { cardData } from './MainIntroduceText'; import { ArrowImg, @@ -14,13 +22,6 @@ import { Scene, EarthVideo, } from './RotateCarousel.style'; -import EarthWebM from '@gdg/assets/Earth.webm'; -import LeftArrow from '@gdg/assets/LeftArrow.svg'; -import RightArrow from '@gdg/assets/RightArrow.svg'; -import CompleteBtn from '@gdg/components/common/button/CompleteBtn'; -import Text from '@gdg/components/common/typography/Text'; -import { useColTz } from '@gdg/hooks/useColTz'; -import { useCarouselStore } from '@gdg/store/useCarouselStore'; export interface RotateCarouselProps { handleNextClick: () => void; diff --git a/src/pages/main/components/RotateCarousel.style.ts b/src/pages/main/components/RotateCarousel.style.ts index b6c0d9f..31cf157 100644 --- a/src/pages/main/components/RotateCarousel.style.ts +++ b/src/pages/main/components/RotateCarousel.style.ts @@ -1,4 +1,5 @@ import styled from '@emotion/styled'; + import Text from '@gdg/components/common/typography/Text'; export const Container = styled.div` diff --git a/src/pages/main/components/Tablet/TabletRotateCarousel.tsx b/src/pages/main/components/Tablet/TabletRotateCarousel.tsx index ee0c1d9..e3347d5 100644 --- a/src/pages/main/components/Tablet/TabletRotateCarousel.tsx +++ b/src/pages/main/components/Tablet/TabletRotateCarousel.tsx @@ -1,6 +1,15 @@ +import styled from '@emotion/styled'; import { memo } from 'react'; import { Link } from 'react-router-dom'; +import EarthWebM from '@gdg/assets/Earth.webm'; +import LeftArrow from '@gdg/assets/LeftArrow.svg'; +import RightArrow from '@gdg/assets/RightArrow.svg'; +import CompleteBtn from '@gdg/components/common/button/CompleteBtn'; +import Text from '@gdg/components/common/typography/Text'; +import { useColTz } from '@gdg/hooks/useColTz'; +import { useCarouselStore } from '@gdg/store/useCarouselStore'; + import { cardData } from '../MainIntroduceText'; import { RotateCarouselProps } from '../PCRotateCarousel'; import { @@ -14,14 +23,6 @@ import { Scene, EarthVideo, } from '../RotateCarousel.style'; -import styled from '@emotion/styled'; -import EarthWebM from '@gdg/assets/Earth.webm'; -import LeftArrow from '@gdg/assets/LeftArrow.svg'; -import RightArrow from '@gdg/assets/RightArrow.svg'; -import CompleteBtn from '@gdg/components/common/button/CompleteBtn'; -import Text from '@gdg/components/common/typography/Text'; -import { useColTz } from '@gdg/hooks/useColTz'; -import { useCarouselStore } from '@gdg/store/useCarouselStore'; const TabletRotateCarousel = ({ handleNextClick, diff --git a/src/pages/mypage/MyPage.tsx b/src/pages/mypage/MyPage.tsx index 6b9408f..3004cb0 100644 --- a/src/pages/mypage/MyPage.tsx +++ b/src/pages/mypage/MyPage.tsx @@ -1,21 +1,17 @@ +import styled from '@emotion/styled'; import { useState, useEffect } from 'react'; import { useMediaQuery } from 'react-responsive'; +import { useGetMyData } from '@gdg/apis/hooks/mypage/useGetMyData'; +import { usePutMyData } from '@gdg/apis/hooks/mypage/usePutMyData'; import CompleteBtn from '@gdg/components/common/button/CompleteBtn'; import Input from '@gdg/components/common/form/Input'; import Profile from '@gdg/components/common/form/Profile'; import TextArea from '@gdg/components/common/form/TextArea'; import PageTitle from '@gdg/components/common/title/PageTitle'; - import TeamToken from '@gdg/pages/mypage/components/TeamToken'; - -import { useGetMyData } from '@gdg/apis/hooks/mypage/useGetMyData'; -import { usePutMyData } from '@gdg/apis/hooks/mypage/usePutMyData'; - -import { displayCenter } from '@gdg/styles/LayoutStyle'; - -import styled from '@emotion/styled'; import { MypageMetaData } from '@gdg/router/components/MetaData'; +import { displayCenter } from '@gdg/styles/LayoutStyle'; import { putUserDataInterface } from '@gdg/types/UserInterface'; const MyPageWrapper = styled.div<{ color: string }>` diff --git a/src/pages/mypage/components/TeamToken.tsx b/src/pages/mypage/components/TeamToken.tsx index ebf0979..80c0cf8 100644 --- a/src/pages/mypage/components/TeamToken.tsx +++ b/src/pages/mypage/components/TeamToken.tsx @@ -1,4 +1,5 @@ import styled from '@emotion/styled'; + import { displayCenter } from '@gdg/styles/LayoutStyle'; type teamData = { diff --git a/src/pages/signup/SignupPendingPage.tsx b/src/pages/signup/SignupPendingPage.tsx index a7a4cef..1aaff32 100644 --- a/src/pages/signup/SignupPendingPage.tsx +++ b/src/pages/signup/SignupPendingPage.tsx @@ -1,11 +1,13 @@ -import logo from '/GDSC.svg'; import styled from '@emotion/styled'; + import homeIcon from '@gdg/assets/HomeIcon.svg'; import CommonBtn from '@gdg/components/common/button/CommonBtn'; import Text from '@gdg/components/common/typography/Text'; import { AuthWrapper, AuthBox } from '@gdg/styles/AuthModalStyle'; import { displayCenter } from '@gdg/styles/LayoutStyle'; +import logo from '/GDSC.svg'; + const CompleteContainer = styled.div` ${displayCenter} flex-direction: column; diff --git a/src/pages/signup/components/MobileSignUpForm.tsx b/src/pages/signup/components/MobileSignUpForm.tsx index b792366..18d3917 100644 --- a/src/pages/signup/components/MobileSignUpForm.tsx +++ b/src/pages/signup/components/MobileSignUpForm.tsx @@ -1,3 +1,5 @@ +import { ErrorMessage } from '@hookform/error-message'; +import { zodResolver } from '@hookform/resolvers/zod'; import * as React from 'react'; import { useForm } from 'react-hook-form'; @@ -5,8 +7,6 @@ import SignupInput from '@gdg/components/common/form/SignupInput'; import { InputWrapper } from '@gdg/pages/apply/components/ApplyForm.style'; import { Error, InputLine } from '@gdg/styles/SignUpForm.style'; import { SignUpSchema, SignUpSchemaType } from '@gdg/utils/SignUpSchema.util'; -import { ErrorMessage } from '@hookform/error-message'; -import { zodResolver } from '@hookform/resolvers/zod'; const MobileSignUpForm = () => { const { diff --git a/src/pages/signup/components/SignUpForm.tsx b/src/pages/signup/components/SignUpForm.tsx index a42e45f..025de65 100644 --- a/src/pages/signup/components/SignUpForm.tsx +++ b/src/pages/signup/components/SignUpForm.tsx @@ -1,7 +1,9 @@ +import styled from '@emotion/styled'; +import { ErrorMessage } from '@hookform/error-message'; +import { zodResolver } from '@hookform/resolvers/zod'; import { useForm } from 'react-hook-form'; import { useMediaQuery } from 'react-responsive'; -import styled from '@emotion/styled'; import { SignupQuery } from '@gdg/apis/hooks/signup/SignupQuery'; import CommonBtn from '@gdg/components/common/button/CommonBtn'; import SignupInput from '@gdg/components/common/form/SignupInput'; @@ -11,8 +13,6 @@ import { AuthBox } from '@gdg/styles/AuthModalStyle'; import { Error, InputLine } from '@gdg/styles/SignUpForm.style'; import { signUpUserInterface } from '@gdg/types/UserInterface'; import { SignUpSchema, SignUpSchemaType } from '@gdg/utils/SignUpSchema.util'; -import { ErrorMessage } from '@hookform/error-message'; -import { zodResolver } from '@hookform/resolvers/zod'; const SignFormWrapper = styled.form` display: flex; @@ -55,7 +55,7 @@ const SignUpForm = () => { mutate(data); // console.log(data); } - console.log(data); + // console.log(data); }; return ( diff --git a/src/pages/team/components/blog/TeamBlogList.tsx b/src/pages/team/components/blog/TeamBlogList.tsx index 1d6084b..0bcfdd0 100644 --- a/src/pages/team/components/blog/TeamBlogList.tsx +++ b/src/pages/team/components/blog/TeamBlogList.tsx @@ -1,13 +1,12 @@ +import styled from '@emotion/styled'; +// import ThumbNailCard from '@gdg/components/feature/blog/ThumbNailCard'; import { lazy } from 'react'; +import MaskGroup from '@gdg/assets/thumbnail/Mask group.png'; // import Grid from '@gdg/components/common/layouts/grid'; import { Spacing } from '@gdg/components/common/layouts/spacing'; -// import ThumbNailCard from '@gdg/components/feature/blog/ThumbNailCard'; -import MaskGroup from '@gdg/assets/thumbnail/Mask group.png'; - import { TeamName } from '../name'; -import styled from '@emotion/styled'; const ThumbNailCard = lazy( () => import('@gdg/components/feature/blog/ThumbNailCard') diff --git a/src/pages/team/components/calendar/DateCell.tsx b/src/pages/team/components/calendar/DateCell.tsx index bdfba03..106fccb 100644 --- a/src/pages/team/components/calendar/DateCell.tsx +++ b/src/pages/team/components/calendar/DateCell.tsx @@ -1,7 +1,7 @@ -import { DateNumber } from '@gdg/pages/team/components'; - import styled from '@emotion/styled'; +import { DateNumber } from '@gdg/pages/team/components'; + type DateContentProps = { date: Date; hoveredDate: string | null; diff --git a/src/pages/team/components/calendar/DateNumber.tsx b/src/pages/team/components/calendar/DateNumber.tsx index 1cb1bc6..003866d 100644 --- a/src/pages/team/components/calendar/DateNumber.tsx +++ b/src/pages/team/components/calendar/DateNumber.tsx @@ -2,7 +2,7 @@ import styled from '@emotion/styled'; const today = new Date().toLocaleDateString('en-CA'); -console.log(today); +// console.log(today); const DateNumber = (arg: { date: Date }) => { const dateStr = arg.date.toLocaleDateString('en-CA'); diff --git a/src/pages/team/components/calendar/TeamCalendar.tsx b/src/pages/team/components/calendar/TeamCalendar.tsx index dfa8070..bf5b2c1 100644 --- a/src/pages/team/components/calendar/TeamCalendar.tsx +++ b/src/pages/team/components/calendar/TeamCalendar.tsx @@ -1,7 +1,9 @@ +import dayGridPlugin from '@fullcalendar/daygrid'; +import interactionPlugin from '@fullcalendar/interaction'; +import FullCalendar from '@fullcalendar/react'; import { useEffect, useState } from 'react'; import { Spacing } from '@gdg/components/common/layouts/spacing'; - import { TeamName, DateCell, @@ -10,9 +12,6 @@ import { } from '@gdg/pages/team/components'; import './Calendar.style.css'; -import dayGridPlugin from '@fullcalendar/daygrid'; -import interactionPlugin from '@fullcalendar/interaction'; -import FullCalendar from '@fullcalendar/react'; const TeamCalendar = ({ selectedTeamName }: { selectedTeamName: string }) => { const [headerToolbar, setHeaderToolbar] = useState({ @@ -21,7 +20,7 @@ const TeamCalendar = ({ selectedTeamName }: { selectedTeamName: string }) => { right: '', }); const [hoveredDate, setHoveredDate] = useState(null); - console.log(2); + // console.log(2); useEffect(() => { const updateHeaderToolbar = () => { diff --git a/src/pages/team/components/content/TeamContent.tsx b/src/pages/team/components/content/TeamContent.tsx index be99ae4..b3083b0 100644 --- a/src/pages/team/components/content/TeamContent.tsx +++ b/src/pages/team/components/content/TeamContent.tsx @@ -1,17 +1,15 @@ +import styled from '@emotion/styled'; import { useState, lazy } from 'react'; import { useMediaQuery } from 'react-responsive'; -import LazyLoad from '@gdg/components/common/View/LazyLoad'; - import { TeamList } from '@gdg/apis/hooks/team/useGetTeamList'; - -import styled from '@emotion/styled'; +import LazyLoad from '@gdg/components/common/View/LazyLoad'; const TeamMember = lazy(() => import('../member/TeamMember')); const TeamCalendar = lazy(() => import('../calendar/TeamCalendar')); const TeamTitle = lazy(() => import('../title/TeamTitle')); const TeamTitleMobile = lazy(() => import('../title/TeamTitle.mobile')); -const TeamBlogList = lazy(() => import('../blog/TeamBlogList')); +// const TeamBlogList = lazy(() => import('../blog/TeamBlogList')); const TeamContent = ({ data }: { data: TeamList[] }) => { const [selectedTeamName, setSelectedTeamName] = useState( diff --git a/src/pages/team/components/member/TeamMember.tsx b/src/pages/team/components/member/TeamMember.tsx index 3da71f7..94ab8ed 100644 --- a/src/pages/team/components/member/TeamMember.tsx +++ b/src/pages/team/components/member/TeamMember.tsx @@ -1,13 +1,11 @@ +import styled from '@emotion/styled'; import { memo } from 'react'; -import Text from '@gdg/components/common/typography/Text'; - -import gdgknu from '@gdg/assets/gdgknu.png'; - import { useGetTeamMate } from '@gdg/apis/hooks/team/useGetTeamMate'; +import gdgknu from '@gdg/assets/gdgknu.png'; +import Text from '@gdg/components/common/typography/Text'; import TeamName from '../name/TeamName'; -import styled from '@emotion/styled'; const TeamMember = ({ selectedTeamId, @@ -17,7 +15,7 @@ const TeamMember = ({ selectedTeamName: string; }) => { const { data } = useGetTeamMate(selectedTeamId); - console.log(1); + // console.log(1); return ( <> diff --git a/src/pages/team/components/name/TeamName.tsx b/src/pages/team/components/name/TeamName.tsx index a894561..98f293a 100644 --- a/src/pages/team/components/name/TeamName.tsx +++ b/src/pages/team/components/name/TeamName.tsx @@ -1,7 +1,7 @@ -import Text from '@gdg/components/common/typography/Text'; - import styled from '@emotion/styled'; +import Text from '@gdg/components/common/typography/Text'; + type TeamNameProps = { selectedTeamName?: string; description?: string; diff --git a/src/pages/team/components/title/TeamTitle.mobile.tsx b/src/pages/team/components/title/TeamTitle.mobile.tsx index 7c6611b..c972cfa 100644 --- a/src/pages/team/components/title/TeamTitle.mobile.tsx +++ b/src/pages/team/components/title/TeamTitle.mobile.tsx @@ -1,10 +1,8 @@ +import styled from '@emotion/styled'; import { lazy } from 'react'; -import { DropBoxContainer } from '@gdg/pages/team/components/title/TeamTitle'; - import { TeamList } from '@gdg/apis/hooks/team/useGetTeamList'; - -import styled from '@emotion/styled'; +import { DropBoxContainer } from '@gdg/pages/team/components/title/TeamTitle'; const DropDown = lazy(() => import('@gdg/components/common/dropdown')); const Text = lazy(() => import('@gdg/components/common/typography/Text')); diff --git a/src/pages/team/components/title/TeamTitle.tsx b/src/pages/team/components/title/TeamTitle.tsx index 9011f28..56ef3e1 100644 --- a/src/pages/team/components/title/TeamTitle.tsx +++ b/src/pages/team/components/title/TeamTitle.tsx @@ -1,6 +1,6 @@ +import styled from '@emotion/styled'; import { lazy } from 'react'; -import styled from '@emotion/styled'; import type { TeamList } from '@gdg/apis/hooks/team/useGetTeamList'; import { TitleLayout, diff --git a/src/pages/team/index.tsx b/src/pages/team/index.tsx index b7d28c1..7ee689d 100644 --- a/src/pages/team/index.tsx +++ b/src/pages/team/index.tsx @@ -1,15 +1,12 @@ +import styled from '@emotion/styled'; import { lazy } from 'react'; +import { useGetTeamList } from '@gdg/apis/hooks/team/useGetTeamList'; import InnerCircle from '@gdg/components/feature/background/InnerCircle'; import CrossShape from '@gdg/components/feature/star/Cross'; import Star from '@gdg/components/feature/star/Star'; - -import { useGetTeamList } from '@gdg/apis/hooks/team/useGetTeamList'; - import { DisplayLayout } from '@gdg/styles/LayoutStyle'; -import styled from '@emotion/styled'; - const TeamContent = lazy(() => import('./components/content/TeamContent')); const TeamLayout = styled(DisplayLayout)` diff --git a/src/pages/tech_blog/Components/MarkdownEditorDark.tsx b/src/pages/tech_blog/Components/MarkdownEditorDark.tsx index 94e54d0..51d451e 100644 --- a/src/pages/tech_blog/Components/MarkdownEditorDark.tsx +++ b/src/pages/tech_blog/Components/MarkdownEditorDark.tsx @@ -1,7 +1,3 @@ -import { useEffect, useState } from 'react'; - -import Prism from 'prismjs'; - import codeSyntaxHighlight from '@toast-ui/editor-plugin-code-syntax-highlight'; import '@toast-ui/editor-plugin-code-syntax-highlight/dist/toastui-editor-plugin-code-syntax-highlight.css'; import colorSyntax from '@toast-ui/editor-plugin-color-syntax'; @@ -9,7 +5,9 @@ import '@toast-ui/editor-plugin-color-syntax/dist/toastui-editor-plugin-color-sy import '@toast-ui/editor/dist/theme/toastui-editor-dark.css'; import '@toast-ui/editor/dist/toastui-editor.css'; import { Editor } from '@toast-ui/react-editor'; +import * as Prism from 'prismjs'; import 'prismjs/themes/prism.css'; +import { useEffect, useState } from 'react'; export type EditorCommonProps = { editorRef: React.RefObject | null; diff --git a/src/pages/tech_blog/Components/MarkdownEditorLight.tsx b/src/pages/tech_blog/Components/MarkdownEditorLight.tsx index 2eb2ea8..98b179c 100644 --- a/src/pages/tech_blog/Components/MarkdownEditorLight.tsx +++ b/src/pages/tech_blog/Components/MarkdownEditorLight.tsx @@ -1,8 +1,3 @@ -import { useEffect, useState } from 'react'; - -import Prism from 'prismjs'; - -import { EditorCommonProps } from './MarkdownEditorDark'; import styled from '@emotion/styled'; import codeSyntaxHighlight from '@toast-ui/editor-plugin-code-syntax-highlight'; import '@toast-ui/editor-plugin-code-syntax-highlight/dist/toastui-editor-plugin-code-syntax-highlight.css'; @@ -10,7 +5,11 @@ import colorSyntax from '@toast-ui/editor-plugin-color-syntax'; import '@toast-ui/editor-plugin-color-syntax/dist/toastui-editor-plugin-color-syntax.css'; import '@toast-ui/editor/dist/toastui-editor.css'; import { Editor } from '@toast-ui/react-editor'; +import * as Prism from 'prismjs'; import 'prismjs/themes/prism.css'; +import { useEffect, useState } from 'react'; + +import { EditorCommonProps } from './MarkdownEditorDark'; const Container = styled.div` width: 100%; diff --git a/src/pages/tech_blog/Components/TechBlogTitle.tsx b/src/pages/tech_blog/Components/TechBlogTitle.tsx index 570bdc2..263db99 100644 --- a/src/pages/tech_blog/Components/TechBlogTitle.tsx +++ b/src/pages/tech_blog/Components/TechBlogTitle.tsx @@ -1,13 +1,12 @@ +import styled from '@emotion/styled'; + import Text from '@gdg/components/common/typography/Text'; import { SubtitleTextContainer, TitleTextContainer, } from '@gdg/components/feature/header/admin/AdminTitle.style'; - import { TitleWrapper } from '@gdg/pages/apply/components/ApplyForm.style'; -import styled from '@emotion/styled'; - const TechBlogTitle = () => { return ( diff --git a/src/pages/tech_blog/TechBlogEditPage.tsx b/src/pages/tech_blog/TechBlogEditPage.tsx index 4c0f941..7d87378 100644 --- a/src/pages/tech_blog/TechBlogEditPage.tsx +++ b/src/pages/tech_blog/TechBlogEditPage.tsx @@ -1,6 +1,8 @@ +import { Editor } from '@toast-ui/react-editor'; import { useState, useRef, useCallback, useEffect } from 'react'; import { useNavigate } from 'react-router-dom'; +import { usePostBlog } from '@gdg/apis/hooks/techblog/usePostBlog'; import { Wrapper, Container, @@ -17,10 +19,6 @@ import MarkdownEditorLight from '@gdg/pages/tech_blog/Components/MarkdownEditorL import { useBlogPost } from '@gdg/pages/tech_blog/context/index'; import useImageHandler from '@gdg/pages/tech_blog/hooks/useImageHandler'; -import { usePostBlog } from '@gdg/apis/hooks/techblog/usePostBlog'; - -import { Editor } from '@toast-ui/react-editor'; - const TechBlogEditPage = () => { const context = useBlogPost(); const { blogPost, setBlogPost } = context; @@ -65,7 +63,7 @@ const TechBlogEditPage = () => { })); navigate('/write/post'); - }, [setBlogPost]); + }, [setBlogPost, navigate]); const handleTempSave = useCallback(() => { if (!editorRef.current) return; @@ -88,7 +86,7 @@ const TechBlogEditPage = () => { thumbnailUrl: null, category: 'ETC', }); - }, [setBlogPost, mutate]); + }, [blogPost.content, blogPost.title, setBlogPost, mutate]); return ( diff --git a/src/pages/tech_blog/TechBlogPage.tsx b/src/pages/tech_blog/TechBlogPage.tsx index 32ce91d..4a11bfe 100644 --- a/src/pages/tech_blog/TechBlogPage.tsx +++ b/src/pages/tech_blog/TechBlogPage.tsx @@ -1,6 +1,7 @@ -import CommingSoonPage from '../CommingSoonPage'; import { TeamBlogMetaData } from '@gdg/router/components/MetaData'; +import CommingSoonPage from '../CommingSoonPage'; + const TechBlogPage = () => { return ( <> diff --git a/src/pages/tech_blog/TechBlogPostPage.tsx b/src/pages/tech_blog/TechBlogPostPage.tsx index fe5c5e9..a134084 100644 --- a/src/pages/tech_blog/TechBlogPostPage.tsx +++ b/src/pages/tech_blog/TechBlogPostPage.tsx @@ -1,7 +1,9 @@ +import styled from '@emotion/styled'; import { useState, useRef, ChangeEvent } from 'react'; +import { usePostBlog } from '@gdg/apis/hooks/techblog/usePostBlog'; +import uploadthumbnail from '@gdg/assets/thumbnail/uploadthumbnail.svg'; import Text from '@gdg/components/common/typography/Text'; - import { StyledSaveBtn, StyledPostBtn, @@ -22,12 +24,6 @@ import { import { useBlogPost } from '@gdg/pages/tech_blog/context/index'; import useImageHandler from '@gdg/pages/tech_blog/hooks/useImageHandler'; -import uploadthumbnail from '@gdg/assets/thumbnail/uploadthumbnail.svg'; - -import { usePostBlog } from '@gdg/apis/hooks/techblog/usePostBlog'; - -import styled from '@emotion/styled'; - const TechBlogPostPage = () => { const context = useBlogPost(); const [thumbnail, setThumbnail] = useState(uploadthumbnail); diff --git a/src/router/Router.tsx b/src/router/Router.tsx index b0401b1..20edc01 100644 --- a/src/router/Router.tsx +++ b/src/router/Router.tsx @@ -8,20 +8,18 @@ import { import { AsyncBoundary } from '@gdg/components/common/AsyncBoundary'; import { LoadingView } from '@gdg/components/common/View/LoadingView'; - -import { BlogPostProvider } from '@gdg/pages/tech_blog/context/index'; - +// import { BlogPostProvider } from '@gdg/pages/tech_blog/context/index'; import { TeamUpdateProvider } from '@gdg/provider/TeamUpdate'; import RouteChangeTracker from '@gdg/router/components/RouteChangeTracker'; import StatusRoute from '@gdg/router/components/StatusRoute'; const TechBlogPage = lazy(() => import('@gdg/pages/tech_blog/TechBlogPage')); -const TechBlogEditPage = lazy( - () => import('@gdg/pages/tech_blog/TechBlogEditPage') -); -const TechBlogPostPage = lazy( - () => import('@gdg/pages/tech_blog/TechBlogPostPage') -); +// const TechBlogEditPage = lazy( +// () => import('@gdg/pages/tech_blog/TechBlogEditPage') +// ); +// const TechBlogPostPage = lazy( +// () => import('@gdg/pages/tech_blog/TechBlogPostPage') +// ); const TechBlogRootPage = lazy( () => import('@gdg/pages/tech_blog/TechBlogRootPage') ); diff --git a/src/styles/ApplyStyle.ts b/src/styles/ApplyStyle.ts index 2047b3d..b550bd8 100644 --- a/src/styles/ApplyStyle.ts +++ b/src/styles/ApplyStyle.ts @@ -1,8 +1,8 @@ +import styled from '@emotion/styled'; + import Text from '@gdg/components/common/typography/Text'; import Title from '@gdg/components/common/typography/Title'; -import styled from '@emotion/styled'; - export const ApplyLayout = styled.div` display: flex; flex-direction: column; diff --git a/src/styles/AuthModalStyle.ts b/src/styles/AuthModalStyle.ts index 68cff2f..31d893c 100644 --- a/src/styles/AuthModalStyle.ts +++ b/src/styles/AuthModalStyle.ts @@ -1,4 +1,5 @@ import styled from '@emotion/styled'; + import { displayCenter } from '@gdg/styles/LayoutStyle'; export const AuthWrapper = styled.section` diff --git a/src/styles/FooterLayoutStyle.ts b/src/styles/FooterLayoutStyle.ts index eb6260a..f41a483 100644 --- a/src/styles/FooterLayoutStyle.ts +++ b/src/styles/FooterLayoutStyle.ts @@ -1,4 +1,5 @@ import styled from '@emotion/styled'; + import { displayCenter } from '@gdg/styles/LayoutStyle'; export const Footer = styled.footer` diff --git a/src/styles/GlobalModal.style.ts b/src/styles/GlobalModal.style.ts index b7dc979..c9ac137 100644 --- a/src/styles/GlobalModal.style.ts +++ b/src/styles/GlobalModal.style.ts @@ -1,6 +1,5 @@ -import { motion } from 'framer-motion'; - import styled from '@emotion/styled'; +import { motion } from 'framer-motion'; export const ModalOverlay = styled(motion.div)` position: fixed;