Merge pull request #355 from themoment-team/develop

Release v240423.0
themoment-team · Apr 22, 2024 · faa33ad · faa33ad
2 parents e9bef82 + 8ae0203
commit faa33ad
Show file tree

Hide file tree

Showing 285 changed files with 5,009 additions and 7,602 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,5 +1,3 @@
-const path = require('path');
-
 module.exports = {
   env: {
     browser: true,
@@ -21,32 +19,135 @@ module.exports = {
     ecmaVersion: 'latest',
     sourceType: 'module',
   },
-  plugins: ['react', '@typescript-eslint'],
-  rules: {},
-  overrides: [
-    {
-      files: ['packages/hello-gsm/**/*.ts?(x)'],
-      settings: {
-        'import/resolver': {
-          typescript: {
-            project: path.resolve(
-              `${__dirname}/packages/hello-gsm/tsconfig.json`,
-            ),
-          },
-        },
+  plugins: ['react', '@typescript-eslint', 'import', 'unused-imports'],
+  rules: {
+    '@typescript-eslint/no-var-requires': 'off',
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-unused-vars': ['error'],
+    'unused-imports/no-unused-imports-ts': ['error'],
+    'sort-imports': [
+      'error',
+      {
+        ignoreCase: true,
+        ignoreDeclarationSort: true,
+        ignoreMemberSort: false,
+        allowSeparatedGroups: true,
       },
-    },
-    {
-      files: ['packages/hello-gsm-admin/**/*.ts?(x)'],
-      settings: {
-        'import/resolver': {
-          typescript: {
-            project: path.resolve(
-              `${__dirname}/packages/hello-gsm-admin/tsconfig.json`,
-            ),
+    ],
+    'import/order': [
+      'error',
+      {
+        'newlines-between': 'always',
+        groups: ['builtin', ['external', 'type'], 'internal'],
+
+        pathGroups: [
+          {
+            pattern: 'next',
+            group: 'external',
+            position: 'before',
+          },
+          {
+            pattern: 'next/**',
+            group: 'external',
+            position: 'before',
+          },
+          {
+            pattern: 'react',
+            group: 'external',
+            position: 'before',
+          },
+          {
+            pattern: 'react-daum-postcode',
+            group: 'external',
+            position: 'before',
+          },
+          {
+            pattern: 'axios',
+            group: 'external',
+            position: 'before',
+          },
+          {
+            pattern: '@emotion/**',
+            group: 'external',
+            position: 'before',
+          },
+          {
+            pattern: 'react-toastify',
+            group: 'external',
+            position: 'before',
+          },
+          {
+            pattern: 'react-hook-form',
+            group: 'external',
+            position: 'before',
+          },
+          {
+            pattern: 'dayjs',
+            group: 'external',
+            position: 'before',
+          },
+          {
+            pattern: 'components',
+            group: 'internal',
+            position: 'after',
           },
+          {
+            pattern: 'pageContainer',
+            group: 'internal',
+            position: 'after',
+          },
+          {
+            pattern: 'shared/**',
+            group: 'internal',
+            position: 'after',
+          },
+          {
+            pattern: 'utils/**',
+            group: 'internal',
+            position: 'after',
+          },
+          {
+            pattern: 'types/**',
+            group: 'internal',
+            position: 'after',
+          },
+          {
+            pattern: 'styles/**',
+            group: 'internal',
+            position: 'after',
+          },
+          {
+            pattern: 'stores/**',
+            group: 'internal',
+            position: 'after',
+          },
+          {
+            pattern: 'hooks/**',
+            group: 'internal',
+            position: 'after',
+          },
+          {
+            pattern: 'apis/**',
+            group: 'internal',
+            position: 'after',
+          },
+          {
+            pattern: 'assets/**',
+            group: 'internal',
+            position: 'after',
+          },
+          {
+            pattern: '@/**',
+            group: 'internal',
+            position: 'after',
+          },
+        ],
+        pathGroupsExcludedImportTypes: ['extanal'],
+
+        alphabetize: {
+          order: 'asc',
         },
       },
-    },
-  ],
+    ],
+  },
 };
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 /node_modules
 /.pnp
 .pnp.js
+/packages/**/node_modules/
 
 # yarn berry
 .yarn/*

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,5 +6,8 @@
   "eslint.nodePath": ".yarn/sdks",
   "prettier.prettierPath": ".yarn/sdks/prettier/index.js",
   "typescript.tsdk": ".yarn/sdks/typescript/lib",
-  "typescript.enablePromptUseWorkspaceTsdk": true
+  "typescript.enablePromptUseWorkspaceTsdk": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit"
+  }
 }
diff --git a/package.json b/package.json
@@ -16,21 +16,16 @@
     "@emotion/styled": "^11.8.1",
     "axios": "^0.26.1",
     "emotion-reset": "^3.0.1",
-    "next": "12.1.0",
-    "react": "17.0.2",
     "react-daum-postcode": "^3.0.1",
-    "react-dom": "17.0.2",
     "react-hook-form": "^7.29.0",
-    "victory": "^36.3.2",
-    "victory-bar": "^36.3.2",
     "zustand": "^3.7.2"
   },
   "devDependencies": {
     "@babel/core": "^7.17.7",
     "@babel/preset-react": "^7.16.7",
     "@emotion/babel-plugin": "^11.7.2",
     "@emotion/babel-preset-css-prop": "^11.2.0",
-    "@types/node": "17.0.21",
+    "@types/node": "^20.11.24",
     "@types/react": "17.0.40",
     "@typescript-eslint/eslint-plugin": "^5.15.0",
     "@typescript-eslint/parser": "^5.15.0",
@@ -39,6 +34,7 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.29.4",
+    "eslint-plugin-unused-imports": "^3.1.0",
     "prettier": "^2.6.0",
     "typescript": "4.6.2"
   },

diff --git a/packages/hello-gsm-admin/package.json b/packages/hello-gsm-admin/package.json
@@ -14,10 +14,10 @@
     "axios": "^0.26.1",
     "dayjs": "^1.11.5",
     "emotion-reset": "^3.0.1",
-    "next": "latest",
-    "react": "17.0.2",
+    "next": "13",
+    "react": "^18.2.0",
     "react-daum-postcode": "^3.1.3",
-    "react-dom": "17.0.2",
+    "react-dom": "^18.2.0",
     "react-hook-form": "^7.31.1",
     "react-toastify": "^9.0.8",
     "zustand": "^3.7.2"
@@ -27,7 +27,7 @@
     "@babel/preset-react": "^7.16.7",
     "@emotion/babel-plugin": "^11.7.2",
     "@emotion/babel-preset-css-prop": "^11.2.0",
-    "@types/node": "17.0.21",
+    "@types/node": "^20.11.24",
     "@types/react": "17.0.40",
     "@typescript-eslint/eslint-plugin": "^5.15.0",
     "@typescript-eslint/parser": "^5.15.0",
@@ -36,6 +36,7 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-react": "^7.29.4",
+    "eslint-plugin-unused-imports": "^3.1.0",
     "prettier": "^2.6.0",
     "typescript": "4.6.2"
   },

diff --git a/packages/hello-gsm-admin/src/Api/application.ts b/packages/hello-gsm-admin/src/Api/application.ts
@@ -1,6 +1,7 @@
-import { ApplicationFormType } from 'type/application';
 import RequestApi from 'Utils/Libs/requestApi';
 import { ApplicationController } from 'Utils/Libs/requestUrls';
+import { ApplicationFormType } from 'type/application';
+
 import BASE_URL from 'shared/baseURL';
 class Application {
   /**

diff --git a/packages/hello-gsm-admin/src/Api/auth.ts b/packages/hello-gsm-admin/src/Api/auth.ts
@@ -1,6 +1,7 @@
-import BASE_URL from 'shared/baseURL';
 import { AuthController } from 'Utils/Libs/requestUrls';
 
+import BASE_URL from 'shared/baseURL';
+
 class Auth {
   /**
    * @returns 각 oauth 로그인 URL을 반환합니다.

diff --git a/packages/hello-gsm-admin/src/PageContainer/ApplicationPage/index.tsx b/packages/hello-gsm-admin/src/PageContainer/ApplicationPage/index.tsx
@@ -1,15 +1,21 @@
 import type { NextPage } from 'next';
-import * as S from './style';
+
 import { useEffect, useState } from 'react';
+
+import { css, Global } from '@emotion/react';
+
 import dayjs from 'dayjs';
-import { ApplicantsStatus } from 'components';
+
 import * as I from 'Assets/svg';
-import { LocalScoreType } from 'type/score';
 import toStringArray from 'Utils/Array/toStringArray';
 import { formatGender } from 'Utils/Format';
 import { ApplicationResponseType } from 'type/application';
 import { isGED } from 'type/ged';
-import { css, Global } from '@emotion/react';
+import { LocalScoreType } from 'type/score';
+
+import { ApplicantsStatus } from 'components';
+
+import * as S from './style';
 
 const ApplicationPage: NextPage<{
   data: ApplicationResponseType | undefined;
@@ -28,8 +34,7 @@ const ApplicationPage: NextPage<{
   const [newSubjects, setNewSubjects] = useState<string[]>([]);
   const [nonSubjects, setNonSubjects] = useState<string[]>([]);
 
-  const { admissionGrade, middleSchoolGrade, admissionInfo, admissionStatus } =
-    data || {};
+  const { admissionGrade, middleSchoolGrade, admissionInfo } = data || {};
 
   useEffect(() => {
     const scoreData: LocalScoreType | null = middleSchoolGrade

diff --git a/packages/hello-gsm-admin/src/PageContainer/ApplyPage/index.tsx b/packages/hello-gsm-admin/src/PageContainer/ApplyPage/index.tsx
@@ -1,21 +1,28 @@
-import React, { useEffect, useRef, useState } from 'react';
 import type { NextPage } from 'next';
-import * as S from './style';
-import * as I from 'Assets/svg';
+
+import React, { useEffect, useRef, useState } from 'react';
+
 import { css } from '@emotion/react';
+
+import { toast } from 'react-toastify';
+
+import { useForm } from 'react-hook-form';
+
+import * as I from 'Assets/svg';
+import useApplyStore from 'Stores/ApplyStoreContainer';
+import formatMajor from 'Utils/Format/formatMajor';
+import { ApplyFormType } from 'type/application';
+import { ApplicationIdentityType } from 'type/data';
+
 import {
+  ApplyBarBox,
+  ApplyPostModal,
   DepartmentModal,
   FindAddressModal,
   FindSchoolModal,
-  ApplyBarBox,
-  ApplyPostModal,
 } from 'components';
-import { useForm } from 'react-hook-form';
-import { ApplyFormType } from 'type/application';
-import { toast } from 'react-toastify';
-import formatMajor from 'Utils/Format/formatMajor';
-import { ApplicationIdentityType } from 'type/data';
-import useApplyStore from 'Stores/ApplyStoreContainer';
+
+import * as S from './style';
 
 const ApplyPage: NextPage<
   ApplicationIdentityType & {

diff --git a/packages/hello-gsm-admin/src/PageContainer/BrowserPage/index.tsx b/packages/hello-gsm-admin/src/PageContainer/BrowserPage/index.tsx
@@ -1,7 +1,9 @@
 import type { NextPage } from 'next';
-import * as S from './style';
+
 import * as I from 'Assets/svg';
 
+import * as S from './style';
+
 const BrowserPage: NextPage = () => {
   return (
     <>

diff --git a/packages/hello-gsm-admin/src/PageContainer/CalculatorPage/index.tsx b/packages/hello-gsm-admin/src/PageContainer/CalculatorPage/index.tsx
@@ -1,21 +1,28 @@
 import type { NextPage } from 'next';
-import { ScoreSelect, ScoreResultModal, FreeSemesterBtn } from 'components';
-import * as S from 'styles/Calculate';
-import * as I from 'Assets/svg';
-import { FieldErrors, useForm } from 'react-hook-form';
+
 import { useEffect, useState } from 'react';
+
+import { toast } from 'react-toastify';
+
+import { FieldErrors, useForm } from 'react-hook-form';
+
+import application from 'Api/application';
+import * as I from 'Assets/svg';
+import useApplyStore from 'Stores/ApplyStoreContainer';
 import {
+  ArtSport,
+  Attendance,
   Calculate,
-  Volunteer,
   Rounds,
-  Attendance,
-  ArtSport,
+  Volunteer,
 } from 'Utils/Calculate';
 import { LocalScoreType } from 'type/score';
-import { toast } from 'react-toastify';
+
+import { FreeSemesterBtn, ScoreResultModal, ScoreSelect } from 'components';
+
+import * as S from 'styles/Calculate';
+
 import useScrollToTop from 'hooks/useScrollToTop';
-import useApplyStore from 'Stores/ApplyStoreContainer';
-import application from 'Api/application';
 
 interface ScoreForm {
   // 과목/점수 배열