Merge branch 'main' of https://www.onasys.co.kr:3000/ONAANDALL/frontend

apps/cs/src/entities/auth/api/login-service.ts

@@ -32,11 +32,22 @@ export class LoginApiService implements LoginService {
       });
 
       const data = await response.json();
+      console.log('data ', data)
       const accessToken = data[ACCESS_TOKEN];
       const tokenId = data[AUTH_USER_ID];
 
       if (!accessToken || !tokenId) {
-        throw new Error("Missing required authentication tokens");
+        if (data.message == 'Invalid Credentials' ) {
+          throw new Error('아이디와 비밀번호가 일치하지 않습니다.');
+        } else if (data.message == 'User not found') {
+          throw new Error('존재하지 않는 아이디입니다.');
+        } else if (data.message == 'User is not active') {
+          throw new Error('활성화되지 않은 계정입니다.');
+        } else if (data.message == 'User is not verified') {
+          throw new Error('이메일 인증이 필요합니다.');
+        } else {
+          throw new Error(data.message);
+        } 
       }
 
       tokenManager.setToken(CLAIM_NAME, accessToken);
@@ -47,9 +58,9 @@ export class LoginApiService implements LoginService {
       );
     } catch (error) {
       if (error instanceof AxiosError) {
-        throw new Error(`Login failed: ${error.response?.data?.message}`);
+        throw new Error(`Login 실패 ${error.response?.data?.message}`);
       }
-      throw new Error(`Login failed: ${error}`);
+      throw new Error(`Login 실패 ${error}`);
     }
   }
 

apps/cs/src/entities/editor/model/editor-base-config.ts

@@ -6,7 +6,8 @@ export const editorBaseConfig = {
   // 자체 호스팅 모드 설정 - GPL 라이선스
   licenseKey: "gpl",
   init: {
-    language: "ko-KR",
+    language: "ko_KR",
+    language_url: '/tinymce/langs/ko_KR.js', // 직접 호스팅한 경우 경로 지정
     height: 500,
     // 폐쇄망 환경을 위한 설정
     base_url: "/tinymce",

apps/cs/src/pages/auth/login/ui/login-page.tsx

@@ -1,20 +1,30 @@
 "use client";
 
+import { useState } from "react";
 import Image from "next/image";
 import { images } from "@common/assets";
 import { LoginApi } from "@/entities/auth";
 import "./login.css";
 
 function LoginPage() {
+  const [errorMessage, setErrorMessage] = useState<string>("");
+
   const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
+    setErrorMessage(""); // 에러 메시지 초기화
 
     const formData = new FormData(e.target as HTMLFormElement);
     const userId = formData.get("id") as string;
     const password = formData.get("password") as string;
 
-    await LoginApi.login({ userId, password });
-    window.location.href = "/dashboard";
+    try {
+      await LoginApi.login({ userId, password });
+      window.location.href = "/dashboard";
+    } catch (error) {
+      const message =
+        error instanceof Error ? error.message : "로그인에 실패했습니다.";
+      setErrorMessage(message);
+    }
   };
 
   return (
@@ -81,6 +91,11 @@ function LoginPage() {
             </div>
             {/* <a href="javascript:fnUserSearch();" className=" pw_message fx"><i className="xi-external-link"></i>비밀번호 또는 아이디를 잃어버리셨나요?</a> */}
           </div>
+          {errorMessage && (
+            <div className="error_message">
+              <span>{errorMessage}</span>
+            </div>
+          )}
           <button type="submit" className="login_btn fx">
             <span>LOGIN</span>
           </button>

apps/cs/src/pages/auth/login/ui/login.css

@@ -118,6 +118,20 @@ body {
   color: #327af5;
   font-size: 20px;
 }
+.login .login_box .error_message {
+  margin: 20px 0;
+  padding: 12px 20px;
+  background: #fee;
+  border: 1px solid #fcc;
+  border-radius: 5px;
+  color: #c33;
+  font-size: 14px;
+  text-align: center;
+}
+.login .login_box .error_message span {
+  display: block;
+  font-weight: 500;
+}
 .login .login_box .login_btn {
   position: relative;
   border-radius: 5px;

package.json

@@ -12,6 +12,8 @@
     "build": "turbo run build",
     "build:common": "turbo run build --filter=@common/*",
     "dev": "turbo run dev",
+    "build:cm": "turbo run build --filter=cm",
+    "build:cs": "turbo run build --filter=cs",
     "build:sn": "turbo run build --filter=sn",
     "build:wr": "turbo run build --filter=wr",
     "build:fo": "turbo run build --filter=fo",
@@ -26,24 +28,24 @@
     "preinstall": "npx only-allow pnpm"
   },
   "dependencies": {
-    "chart.js": "^4.4.8",
-    "react": "^18.3.1",
+    "chart.js": "^4.5.1",
+    "react": "^18.3.6",
     "react-chartjs-2": "^5.3.0",
-    "react-dom": "^18.3.1",
+    "react-dom": "^18.3.6",
     "zustand": "^5.0.3"
   },
   "devDependencies": {
-    "@types/node": "^22.13.9",
-    "@types/react": "^18.3.18",
-    "@types/react-dom": "^18.3.5",
+    "@types/node": "^22.19.2",
+    "@types/react": "^18.3.27",
+    "@types/react-dom": "^18.3.7",
     "turbo": "2.4.2"
   },
   "pnpm": {
     "overrides": {
-      "@types/react": "^18.3.18",
+      "@types/react": "^18.3.20",
       "@types/react-dom": "^18.3.5",
-      "react": "^18.3.1",
-      "react-dom": "^18.3.1"
+      "react": "^18.3.6",
+      "react-dom": "^18.3.6"
     }
   },
   "license": "ISC",