Merge pull request #119 from SW13-Monstera/dev

Merge into main
SW13-Monstera · Jan 21, 2024 · 26373cd · 26373cd · github-actions · Jan 21, 2024
2 parents e699f92 + 839e7d6
commit 26373cd
Show file tree

Hide file tree

Showing 58 changed files with 3,114 additions and 135 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,8 @@
     "build": "npm run build --workspace=service",
     "build:admin": "npm run build --workspace=admin",
     "lint": "eslint 'packages/**/src/**/*.{ts,tsx,js,jsx}'",
-    "lint-diff": "eslint $(git diff --name-only --diff-filter=duxb origin/$BASE origin/$HEAD | grep -E '\\.((j|t)sx?)$' | xargs)"
+    "lint-diff": "eslint $(git diff --name-only --diff-filter=duxb origin/$BASE origin/$HEAD | grep -E '\\.((j|t)sx?)$' | xargs)",
+    "test": "npm run test --workspace=service"
   },
   "workspaces": [
     "packages/service",

diff --git a/packages/admin/src/api/apiClient.ts b/packages/admin/src/api/apiClient.ts
@@ -1,7 +1,7 @@
 import axios from 'axios';
 import { getUserInfo } from 'auth/utils/userInfo';
 import { parseJwt } from 'auth/utils/parseJwt';
-import { AUTHORIZTION, BEARER_TOKEN } from 'auth/constants';
+import { AUTHORIZATION, BEARER_TOKEN } from 'auth/constants';
 import { authApiWrapper } from './wrapper/auth/authApiWrapper';
 
 const apiClient = axios.create({
@@ -13,7 +13,7 @@ const userInfo = getUserInfo();
 if (userInfo) {
   const token: string | null | undefined = userInfo.accessToken;
   if (typeof token === 'string') {
-    apiClient.defaults.headers.common[AUTHORIZTION] = BEARER_TOKEN(token);
+    apiClient.defaults.headers.common[AUTHORIZATION] = BEARER_TOKEN(token);
   }
 }
 
@@ -30,7 +30,7 @@ apiClient.interceptors.response.use(
         const jwt = parseJwt(userInfo.accessToken);
         if (jwt?.exp && Date.now() >= jwt.exp * 1000) {
           authApiWrapper.refresh()?.then((newAccessToken) => {
-            originalRequest.headers[AUTHORIZTION] = BEARER_TOKEN(newAccessToken);
+            originalRequest.headers[AUTHORIZATION] = BEARER_TOKEN(newAccessToken);
             return apiClient(originalRequest);
           });
         }

diff --git a/packages/admin/src/api/wrapper/auth/authApiWrapper.ts b/packages/admin/src/api/wrapper/auth/authApiWrapper.ts
@@ -3,7 +3,7 @@ import { setLogout } from './../../../utils/index';
 import { getUserInfo, setUserInfo } from 'auth/utils/userInfo';
 import apiClient from '../../apiClient';
 import { API_URL } from '../../../constants/apiUrl';
-import { AUTHORIZTION, BEARER_TOKEN, ROLES } from 'auth/constants';
+import { AUTHORIZATION, BEARER_TOKEN, ROLES } from 'auth/constants';
 
 interface ILoginRequest {
   email: string;
@@ -18,7 +18,7 @@ export const authApiWrapper = {
           alert('권한 없음');
           throw new Error('권한 없음');
         }
-        apiClient.defaults.headers.common[AUTHORIZTION] = BEARER_TOKEN(res.data.accessToken);
+        apiClient.defaults.headers.common[AUTHORIZATION] = BEARER_TOKEN(res.data.accessToken);
         return res.data;
       },
       (err) => {
@@ -40,7 +40,7 @@ export const authApiWrapper = {
       .then(
         (res: { data: { accessToken: string } }) => {
           const newAccessToken = res.data.accessToken;
-          apiClient.defaults.headers.common[AUTHORIZTION] = BEARER_TOKEN(newAccessToken);
+          apiClient.defaults.headers.common[AUTHORIZATION] = BEARER_TOKEN(newAccessToken);
           setUserInfo({ ...userInfo, accessToken: newAccessToken });
           return res.data.accessToken;
         },

diff --git a/packages/admin/src/pages/problem/long/LongProblemEditPage.tsx b/packages/admin/src/pages/problem/long/LongProblemEditPage.tsx
@@ -87,7 +87,9 @@ export const LongProblemEditPage = () => {
       standardAnswers:
         Array.from(
           document.getElementsByClassName('standard-answer') as HTMLCollectionOf<HTMLInputElement>,
-        ).map((e) => e.value) || [],
+        )
+          .filter((e) => !e.ariaHidden)
+          .map((e) => e.value) || [],
       tags: tagState.filter((tag) => tag.isChecked).map((e) => e.id),
       gradingStandards: [
         ...keywordStandardState.map(({ content, score, type }) => {

diff --git a/packages/admin/src/utils/index.ts b/packages/admin/src/utils/index.ts
@@ -1,5 +1,5 @@
 import apiClient from '../api/apiClient';
-import { AUTHORIZTION, BEARER_TOKEN, USER_INFO } from 'auth/constants';
+import { AUTHORIZATION, BEARER_TOKEN, USER_INFO } from 'auth/constants';
 
 export const roundToSecondDigit = (num: number) => Math.round(num * 100) / 100;
 
@@ -19,7 +19,7 @@ export const isNumeric = (value: any) => {
 
 export function setLogout() {
   localStorage.removeItem(USER_INFO);
-  delete apiClient.defaults.headers.common[AUTHORIZTION];
+  delete apiClient.defaults.headers.common[AUTHORIZATION];
 }
 
 export const setTokenHeader = () => {
@@ -29,7 +29,7 @@ export const setTokenHeader = () => {
       const userInfo = JSON.parse(userInfoString);
       const token: string | null | undefined = userInfo.accessToken;
       if (typeof token === 'string') {
-        apiClient.defaults.headers.common[AUTHORIZTION] = BEARER_TOKEN(token);
+        apiClient.defaults.headers.common[AUTHORIZATION] = BEARER_TOKEN(token);
       }
     }
   } catch (e) {

diff --git a/packages/auth/constants/index.ts b/packages/auth/constants/index.ts
@@ -1,7 +1,7 @@
-export const USER_INFO = "userInfo";
-export const AUTHORIZTION = "Authorization";
+export const USER_INFO = 'userInfo';
+export const AUTHORIZATION = 'Authorization';
 export const BEARER_TOKEN = (token: string) => `Bearer ${token}`;
 export const ROLES = {
-  ROLE_ADMIN: "ROLE_ADMIN",
-  ROLE_USER: "ROLE_USER",
+  ROLE_ADMIN: 'ROLE_ADMIN',
+  ROLE_USER: 'ROLE_USER',
 } as const;
diff --git a/packages/auth/utils/userInfo.ts b/packages/auth/utils/userInfo.ts
@@ -26,3 +26,5 @@ export const getUserInfo = (): IUserInfo | null => {
 export const removeUserInfo = () => {
   localStorage.removeItem(USER_INFO);
 };
+
+export const isLogin = () => !!getUserInfo()?.id;
diff --git a/packages/service/package.json b/packages/service/package.json
@@ -6,7 +6,8 @@
   "scripts": {
     "dev": "vite --mode development --port 3123",
     "build": "tsc && vite build --mode production",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "test": "vitest"
   },
   "repository": {
     "type": "git",
@@ -44,6 +45,7 @@
     "rehype-highlight": "^5.0.2",
     "remark-gfm": "^3.0.1",
     "vite-plugin-svgr": "^2.2.0",
+    "vitest": "^1.2.0",
     "zustand": "^4.0.0-rc.1"
   },
   "devDependencies": {

diff --git a/packages/service/src/Component/Button/FloatingButton/index.tsx b/packages/service/src/Component/Button/FloatingButton/index.tsx
@@ -0,0 +1,17 @@
+import { IButton } from '../../../types/button';
+import { floatingButtonStyle } from './style.css';
+
+const FloatingButton = (props: IButton) => {
+  return (
+    <button
+      type='button'
+      className={floatingButtonStyle}
+      onClick={props.onClick}
+      onMouseOver={props.onMouseOver}
+      onMouseOut={props.onMouseOut}
+    >
+      {props.children}
+    </button>
+  );
+};
+export default FloatingButton;
diff --git a/packages/service/src/Component/Button/FloatingButton/style.css.ts b/packages/service/src/Component/Button/FloatingButton/style.css.ts
@@ -0,0 +1,27 @@
+import { style } from '@vanilla-extract/css';
+import { COLOR } from '../../../constants/color';
+import { spreadBoxShadow } from '../../../styles/keyframe.css';
+import { themeColors } from '../../../styles/theme.css';
+
+export const floatingButtonStyle = style({
+  position: 'fixed',
+  bottom: '20px',
+  right: '20px',
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'center',
+  width: '56px',
+  height: '56px',
+  cursor: 'pointer',
+  borderRadius: '24px',
+  background: `linear-gradient(${COLOR.PRIMARY} 0%, rgba(42,90,243) 100%)`,
+  color: COLOR.BACKGROUND.ALICE_BLUE,
+  fontSize: '2rem',
+  boxShadow: `0px 0px 4px ${themeColors.shadow[1]}`,
+  animation: spreadBoxShadow,
+  zIndex: '10',
+
+  ':hover': {
+    boxShadow: `4px 8px 24px  ${themeColors.shadow[1]}`,
+  },
+});
diff --git a/packages/service/src/Component/Button/TextButton/style.css.ts b/packages/service/src/Component/Button/TextButton/style.css.ts
@@ -65,6 +65,16 @@ export const textButtonSizeStyle = styleVariants({
       borderRadius: '8px',
     },
   ],
+  xsmall: [
+    {
+      width: '3.5rem',
+      height: '1.5rem',
+      fontWeight: '500',
+      fontSize: '0.75rem',
+      lineHeight: '1rem',
+      borderRadius: '4px',
+    },
+  ],
 });
 
 export const unactivatedStyle = style({

diff --git a/packages/service/src/Component/Utils/DefaultSelect/index.tsx b/packages/service/src/Component/Utils/DefaultSelect/index.tsx
@@ -56,7 +56,7 @@ export const DefaultSelect = ({
           },
         })}
         defaultValue={defaultValue}
-        onChange={(e: MultiValue<IOption> | SingleValue<IOption>) => {
+        onChange={(e) => {
           onChange(e);
           if (isMulti) setSelectedOptions(e);
         }}
@@ -85,7 +85,7 @@ export const DefaultSelect = ({
             neutral90: themeColors.text[5],
           },
         })}
-        onChange={(e: MultiValue<IOption> | SingleValue<IOption>) => {
+        onChange={(e) => {
           onChange(e);
           if (isMulti) setSelectedOptions(e);
         }}