Merge branch 'dev' into #601-add-unread-num-chatting

sparcs-kaist · Jan 2, 2024 · 66bcf6d · 66bcf6d
2 parents 9c51bcb + 8f8f0e0
commit 66bcf6d
Show file tree

Hide file tree

Showing 201 changed files with 13,529 additions and 12,757 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -10,7 +10,8 @@
     "plugin:cypress/recommended",
     "eslint:recommended",
     "plugin:react/recommended",
-    "prettier"
+    "prettier",
+    "plugin:storybook/recommended"
   ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
@@ -24,7 +25,12 @@
   "rules": {
     "no-unused-vars": 1,
     "react/react-in-jsx-scope": "off",
-    "react/no-unknown-property": ["error", { "ignore": ["css"] }]
+    "react/no-unknown-property": [
+      "error",
+      {
+        "ignore": ["css"]
+      }
+    ]
   },
   "overrides": [
     {

diff --git a/.prettierrc.json b/.prettierrc.json
@@ -15,13 +15,13 @@
   "plugins": ["@trivago/prettier-plugin-sort-imports"],
   "importOrder": [
     "<THIRD_PARTY_MODULES>",
-    "^types/",
-    "^hooks/",
-    "^components/|^pages/",
+    "^@/types/",
+    "^@/hooks/",
+    "^@/components/|^@/pages/",
     "^[./]",
-    "^atoms/|^recoil$",
-    "^tools/",
-    "^static/|^@mui|^@material-ui"
+    "^@/atoms/|^recoil$",
+    "^@/tools/",
+    "^@/static/|^@mui|^@material-ui"
   ],
   "importOrderSeparation": true,
   "importOrderSortSpecifiers": true,

diff --git a/.storybook/main.ts b/.storybook/main.ts
@@ -0,0 +1,19 @@
+import type { StorybookConfig } from "@storybook/react-vite";
+
+const config: StorybookConfig = {
+  stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
+  addons: [
+    "@storybook/addon-links",
+    "@storybook/addon-essentials",
+    "@storybook/addon-onboarding",
+    "@storybook/addon-interactions",
+  ],
+  framework: {
+    name: "@storybook/react-vite",
+    options: {},
+  },
+  docs: {
+    autodocs: "tag",
+  },
+};
+export default config;
diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
@@ -0,0 +1,30 @@
+import type { Preview } from "@storybook/react";
+import React from "react";
+import { BrowserRouter as Router } from "react-router-dom";
+
+import "../src/index.css";
+
+import { RecoilRoot } from "recoil";
+
+const preview: Preview = {
+  parameters: {
+    actions: { argTypesRegex: "^on[A-Z].*" },
+    controls: {
+      matchers: {
+        color: /(background|color)$/i,
+        date: /Date$/i,
+      },
+    },
+  },
+  decorators: [
+    (Story) => (
+      <RecoilRoot>
+        <Router>
+          <Story />
+        </Router>
+      </RecoilRoot>
+    ),
+  ],
+};
+
+export default preview;
diff --git a/craco.config.js b/craco.config.js
diff --git a/cypress.config.ts b/cypress.config.ts
@@ -1,7 +1,4 @@
 import { defineConfig } from "cypress";
-import dotenv from "dotenv";
-
-dotenv.config();
 
 export default defineConfig({
   env: {

diff --git a/public/index.html → index.html b/public/index.html → index.html
@@ -59,7 +59,6 @@
       async
       src="https://t1.kakaocdn.net/kakao_js_sdk/2.1.0/kakao.min.js"
     ></script>
-    <script src="/env.js"></script>
     <script>
       document.documentElement.addEventListener(
         "touchstart",
@@ -85,6 +84,8 @@
         false
       );
     </script>
+    <script src="/env.js"></script>
+    <script type="module" src="/src/index.tsx"></script>
   </head>
   <body>
     <div id="root"></div>

diff --git a/package.json b/package.json
@@ -3,22 +3,15 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@babel/preset-react": "7.12.5",
-    "@craco/craco": "^6.4.3",
-    "@emotion/babel-plugin": "^11.10.6",
     "@emotion/css": "^11.10.6",
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
-    "@material-ui/icons": "^4.11.2",
     "@mui/icons-material": "^5.14.1",
     "@mui/material": "^5.4.1",
-    "@svgr/webpack": "5.5.0",
     "antd": "^5.4.6",
     "axios": "^0.21.1",
     "browser-image-compression": "^2.0.0",
-    "cross-env": "^7.0.3",
     "dayjs": "^1.11.7",
-    "dotenv": "^16.0.0",
     "firebase": "^9.15.0",
     "heic2any": "^0.0.4",
     "i18next": "^22.0.2",
@@ -39,10 +32,12 @@
     "use-state-with-callback": "^3.0.2"
   },
   "scripts": {
+    "start": "vite",
+    "build": "tsc && vite build",
     "preinstall": "npx only-allow pnpm",
-    "start": "craco start",
-    "build": "cross-env GENERATE_SOURCEMAP=false craco build",
-    "test": "cypress open"
+    "test": "cypress open",
+    "storybook": "storybook dev -p 6006",
+    "build-storybook": "storybook build"
   },
   "eslintConfig": {
     "extends": [
@@ -63,8 +58,15 @@
     ]
   },
   "devDependencies": {
+    "@storybook/addon-essentials": "^7.5.2",
+    "@storybook/addon-interactions": "^7.5.2",
+    "@storybook/addon-links": "^7.5.2",
+    "@storybook/addon-onboarding": "^1.0.8",
+    "@storybook/blocks": "^7.5.2",
+    "@storybook/react": "^7.5.2",
+    "@storybook/react-vite": "^7.5.2",
+    "@storybook/testing-library": "^0.2.2",
     "@trivago/prettier-plugin-sort-imports": "^4.1.1",
-    "@types/craco__craco": "^6.4.0",
     "@types/eslint": "^8.44.0",
     "@types/eslint-config-prettier": "^6.11.0",
     "@types/prop-types": "^15.7.5",
@@ -74,6 +76,7 @@
     "@types/react-router-dom": "^5.3.3",
     "@typescript-eslint/eslint-plugin": "^5.37.0",
     "@typescript-eslint/parser": "^5.37.0",
+    "@vitejs/plugin-react-swc": "^3.4.1",
     "cypress": "^10.3.1",
     "cypress-react-selector": "^3.0.0",
     "eslint": "^7.32.0",
@@ -84,7 +87,11 @@
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-react": "^7.26.1",
     "eslint-plugin-react-hooks": "^4.2.0",
-    "typescript": "^5.1.6"
+    "eslint-plugin-storybook": "^0.6.15",
+    "storybook": "^7.5.2",
+    "typescript": "^5.1.6",
+    "vite": "^4.5.0",
+    "vite-plugin-svgr": "^3.2.0"
   },
   "resolutions": {
     "@types/react": "^17.0.2",