Merge pull request #476 from Gwasuwon-shot/develop

release 1.2.2
Gwasuwon-shot · Jun 28, 2024 · 530e5c2 · 530e5c2
2 parents 281fb57 + 78da40d
commit 530e5c2
Show file tree

Hide file tree

Showing 139 changed files with 1,605 additions and 649 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -1,13 +1,23 @@
 module.exports = {
   parser: "@typescript-eslint/parser",
-  plugins: ["@typescript-eslint", "prettier"],
+  parserOptions: {
+    ecmaVersion: 2020,
+    sourceType: "module",
+  },
+  settings: {
+    react: {
+      version: "detect",
+    },
+  },
+  plugins: ["@typescript-eslint", "prettier", "react", "simple-import-sort"],
   extends: [
     "airbnb",
     "plugin:import/errors",
     "plugin:import/warnings",
     "plugin:prettier/recommended",
     "plugin:@typescript-eslint/recommended",
-    "prettier/@typescript-eslint",
+    "plugin:react/recommended",
+    "prettier",
   ],
   rules: {
     "linebreak-style": 0,
@@ -22,6 +32,7 @@ module.exports = {
     "eol-last": ["error", "always"], // line의 가장 마지막 줄에는 개행 넣기
     "react/react-in-jsx-scope": "off",
     "no-multi-spaces": "error", // 스페이스 여러개 금지
-    "simple-import-sort/imports": "error"
+    "simple-import-sort/imports": "error",
+    "no-use-before-define": ["error", false],
   },
 };
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v18.19.0
+v18.20.3
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
-    "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+    "lint": "eslint",
     "stylelint": "stylelint './src/**/*.tsx' --fix",
     "preview": "vite preview"
   },
@@ -31,6 +31,7 @@
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^4.0.11",
+    "react-ga4": "^2.1.0",
     "react-konva": "^18.2.10",
     "react-query": "^3.39.3",
     "react-router-dom": "^6.23.0",
@@ -58,13 +59,20 @@
     "@typescript-eslint/parser": "^5.59.0",
     "@vitejs/plugin-react": "^4.0.0",
     "eslint": "^8.44.0",
-    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-jsx-a11y": "^6.8.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-react": "^7.34.2",
+    "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-react-refresh": "^0.3.4",
+    "eslint-plugin-simple-import-sort": "^12.1.0",
     "postcss": "^8.4.25",
     "postcss-styled-syntax": "^0.4.0",
     "prettier": "^3.0.0",
     "slick-carousel": "^1.8.1",
-    "typescript": "^5.0.2",
+    "typescript": "5.1.6",
     "vite": "^4.3.9"
   }
 }
diff --git a/src/App.tsx b/src/App.tsx
@@ -4,8 +4,11 @@ import Router from "./Router";
 import "./core/notification/settingFCM";
 import { GlobalStyle } from "./style/globalStyle";
 import { theme } from "./style/theme";
+import REACTGA from "react-ga4";
 
 export default function App() {
+  REACTGA.initialize(import.meta.env.VITE_APP_GOOGLE_ANALYTICS);
+
   return (
     <RecoilRoot>
       <ThemeProvider theme={theme}>

diff --git a/src/Router.tsx b/src/Router.tsx
@@ -1,8 +1,9 @@
 import * as Sentry from "@sentry/react";
-import { BrowserRouter, Route, Routes } from "react-router-dom";
+import { BrowserRouter, Navigate, Route, Routes } from "react-router-dom";
 
+import { AxiosError } from "axios";
 import { Suspense } from "react";
-import { ErrorBoundary } from "react-error-boundary";
+import { removeCookie } from "./api/cookie";
 import ConnectParentsAndTeacher from "./components/RegularLesson/ConnectParentsAndTeacher";
 import AfterSignup from "./components/welcomeSignup/AfterSignup";
 import AllowAlert from "./components/welcomeSignup/AllowAlert";
@@ -38,12 +39,17 @@ import TimePickerPage from "./pages/TimePickerPage";
 import TuitionPayment from "./pages/TuitionPayment";
 import WelcomeSignup from "./pages/WelcomeSignup";
 import PrivateRoute from "./utils/common/privateRoute";
+  interface fallbackProps {
+    error: Error;
+    resetError: () => void;
+  }
 
 export default function Router() {
+
   return (
     <BrowserRouter>
       <Sentry.ErrorBoundary fallback={fallbackRender}>
-        <ErrorBoundary FallbackComponent={fallbackRender}>
+        {/* <ErrorBoundary FallbackComponent={fallbackRender}> */}
           <Suspense fallback={<Loading />}>
             <Routes>
               <Route path="/" element={<OnBoarding />} />
@@ -85,20 +91,18 @@ export default function Router() {
               </Route>
             </Routes>
           </Suspense>
-        </ErrorBoundary>
+        {/* </ErrorBoundary> */}
       </Sentry.ErrorBoundary>
     </BrowserRouter>
   );
 }
 
-function fallbackRender({ error, resetErrorBoundary }: any) {
-  // if (error.response) {
-  //   if (error.response.data.code === 401) {
-  //     resetErrorBoundary();
-  //     removeCookie("accessToken");
-  //     return <Navigate to="/" />;
-  //   }
-  // } else {
-  return <ErrorPage resetErrorBoundary={resetErrorBoundary} />;
-  // }
+function fallbackRender({ error, resetError }:fallbackProps) {
+  if ( error instanceof AxiosError && error.response?.status === 401) {
+      resetError();
+      removeCookie("accessToken");
+      return <Navigate to="/" />;
+  } else {
+  return <ErrorPage resetErrorBoundary={resetError} />;
+  }
 }
diff --git a/src/api/createLesson.ts b/src/api/createLesson.ts
@@ -33,18 +33,18 @@ export async function createLesson(props: createLessonProps) {
     `/api/lesson`,
     {
       lesson: {
-        studentName: studentName,
-        subject: subject,
-        payment: payment,
-        amount: amount,
-        count: count,
-        startDate: startDate,
-        regularScheduleList: regularScheduleList,
+        studentName,
+        subject,
+        payment,
+        amount,
+        count,
+        startDate,
+        regularScheduleList,
       },
       account: {
         // name: name,
-        bank: bank,
-        number: number,
+        bank,
+        number,
       },
     },
     {

diff --git a/src/api/createLessonMaintenance.ts b/src/api/createLessonMaintenance.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 interface createLessonMaintenanceProps {
@@ -12,8 +13,8 @@ export async function createLessonMaintenance(props: createLessonMaintenanceProp
   const data = await axios.post(
     `${import.meta.env.VITE_APP_BASE_URL}/api/lesson/maintenance`,
     {
-      lessonIdx: lessonIdx,
-      isLessonMaintenance: isLessonMaintenance,
+      lessonIdx,
+      isLessonMaintenance,
     },
     {
       headers: {

diff --git a/src/api/deleteLesson.ts b/src/api/deleteLesson.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function deleteLesson(lessonIdx: number) {

diff --git a/src/api/getAttendanceExist.ts b/src/api/getAttendanceExist.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getAttendanceExist(scheduleIdx: number) {

diff --git a/src/api/getDepositRecord.ts b/src/api/getDepositRecord.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getDepositRecord(lessonId: number) {

diff --git a/src/api/getLatestScheduleByTeacher.ts b/src/api/getLatestScheduleByTeacher.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getLatestScheduleByTeacher() {

diff --git a/src/api/getLessonAccount.ts b/src/api/getLessonAccount.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getLessonAccount(lessonIdx: number) {

diff --git a/src/api/getLessonByParents.ts b/src/api/getLessonByParents.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getLessonByParents() {

diff --git a/src/api/getLessonByTeacher.ts b/src/api/getLessonByTeacher.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getLessonByTeacher() {

diff --git a/src/api/getLessonByUser.ts b/src/api/getLessonByUser.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getLessonByUser() {

diff --git a/src/api/getLessonDetail.ts b/src/api/getLessonDetail.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getLessonDetail(lessonIdx: number) {

diff --git a/src/api/getLessonPaymentRecordByTeacher.ts b/src/api/getLessonPaymentRecordByTeacher.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getLessonPaymentRecordByTeacher(lessonIdx: number) {

diff --git a/src/api/getLessonProgress.ts b/src/api/getLessonProgress.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getLessonProgress(lessonIdx: number) {

diff --git a/src/api/getLessonRegularSchedule.ts b/src/api/getLessonRegularSchedule.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getLessonRegularSchedule(lessonIdx: number) {

diff --git a/src/api/getLessonSchedule.ts b/src/api/getLessonSchedule.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getLessonSchedule(lessonIdx: number) {

diff --git a/src/api/getLessonScheduleByParents.ts b/src/api/getLessonScheduleByParents.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getLessonScheduleByParents(lessonIdx: number) {

diff --git a/src/api/getLessonScheduleByTeacher.ts b/src/api/getLessonScheduleByTeacher.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getLessonScheduleByTeacher(lessonIdx: number) {

diff --git a/src/api/getMissingAttendanceByLessonExist.ts b/src/api/getMissingAttendanceByLessonExist.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getMissingAttendanceByLessonExist(lessonIdx: number) {

diff --git a/src/api/getMissingAttendanceExist.ts b/src/api/getMissingAttendanceExist.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getMissingAttendanceExist() {

diff --git a/src/api/getMissingAttendanceSchedule.ts b/src/api/getMissingAttendanceSchedule.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getMissingAttendanceSchedule() {

diff --git a/src/api/getMissingMaintenanceExist.ts b/src/api/getMissingMaintenanceExist.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getMissingMaintenanceExist() {

diff --git a/src/api/getMissingMaintenanceLesson.ts b/src/api/getMissingMaintenanceLesson.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getMissingMaintenanceLesson() {

diff --git a/src/api/getPastLessonRecord.ts b/src/api/getPastLessonRecord.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getPastLessonRecord(lessonId: number) {

diff --git a/src/api/getPaymentRecordByLesson.ts b/src/api/getPaymentRecordByLesson.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getPaymentRecordByLesson(lessonIdx: number) {

diff --git a/src/api/getPaymentRecordCycle.ts b/src/api/getPaymentRecordCycle.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getPaymentRecordCycle(paymentRecordIdx: number) {

diff --git a/src/api/getPaymentRecordView.ts b/src/api/getPaymentRecordView.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getPaymentRecordView(paymentRecordIdx: number) {

diff --git a/src/api/getScheduleByUser.ts b/src/api/getScheduleByUser.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getScheduleByUser(date: string) {

diff --git a/src/api/getTemporarySchedule.ts b/src/api/getTemporarySchedule.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 interface Day {
@@ -21,11 +22,11 @@ export async function getTemporarySchedule(props: temporaryProp) {
   const data = await axios.post(
     `${import.meta.env.VITE_APP_BASE_URL}/api/schedule/temporary`,
     {
-      studentName: studentName,
-      subject: subject,
-      count: count,
-      startDate: startDate,
-      regularScheduleList: regularScheduleList,
+      studentName,
+      subject,
+      count,
+      startDate,
+      regularScheduleList,
     },
     {
       headers: {

diff --git a/src/api/getTodayDate.ts b/src/api/getTodayDate.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getTodayDate() {

diff --git a/src/api/getTodayScheduleByParents.ts b/src/api/getTodayScheduleByParents.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getTodayScheduleByParents() {

diff --git a/src/api/getTodayScheduleByTeacher.ts b/src/api/getTodayScheduleByTeacher.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getTodayScheduleByTeacher() {

diff --git a/src/api/getTodayScheduleExist.ts b/src/api/getTodayScheduleExist.ts
@@ -1,4 +1,5 @@
 import axios from "axios";
+
 import { getCookie } from "./cookie";
 
 export async function getTodayScheduleExist() {