From 04fc69748c6eddd67accf4b6e724892bcf6073ac Mon Sep 17 00:00:00 2001 From: dorimu0 <121004915+dorimu0@users.noreply.github.com> Date: Mon, 1 Jul 2024 19:15:16 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor=20:=20Edit=20?= =?UTF-8?q?text=20in=20code=20to=20Japanese?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changed Korean text in the code to Japanese Related issue: #81 --- .../[cId]/[mId]/components/Attendance.tsx | 16 ++++++------- .../[cId]/[mId]/components/AttendanceCard.tsx | 14 +++++------ .../[mId]/components/AttendanceContainer.tsx | 24 +++++++++---------- .../[cId]/[mId]/components/CalendarModal.tsx | 2 +- .../[mId]/components/FeedbackContainer.tsx | 11 +++++---- .../[mId]/components/FeedbackKeywordList.tsx | 4 +--- .../[cId]/[mId]/components/FeedbackList.tsx | 2 +- .../[mId]/components/ManageContainer.tsx | 10 ++++---- .../[cId]/[mId]/components/QuizList.tsx | 18 +++++++------- .../[cId]/[mId]/components/QuizReport.tsx | 2 +- .../[cId]/[mId]/components/QuizSet.tsx | 10 ++++---- .../[cId]/[mId]/components/UserContainer.tsx | 10 ++++---- .../components/subComponents/SubContainer.tsx | 6 ++--- .../[mId]/quizForm/components/QuizForm.tsx | 10 ++++---- src/app/components/login/Login.tsx | 12 ++++------ src/app/page.tsx | 6 ++--- src/components/navbar/Navbar.tsx | 8 +++---- .../navbar/material/MaterialContainer.tsx | 12 +++++----- .../navbar/material/MaterialForm.tsx | 22 +++++++++-------- src/components/navbar/profile/EditName.tsx | 6 ++--- src/components/navbar/profile/Profile.tsx | 6 ++--- 21 files changed, 106 insertions(+), 105 deletions(-) diff --git a/src/app/classes/[cId]/[mId]/components/Attendance.tsx b/src/app/classes/[cId]/[mId]/components/Attendance.tsx index a205d1e..f7cf57a 100644 --- a/src/app/classes/[cId]/[mId]/components/Attendance.tsx +++ b/src/app/classes/[cId]/[mId]/components/Attendance.tsx @@ -62,7 +62,7 @@ const Attendance = () => {
Attendance
- 출석률 : 100% + 出席率 : 100%
{AttendanceUsers.map((user, index) => ( @@ -92,9 +92,9 @@ const Attendance = () => { onChange={handleSelectChange} value={user.IsAttendance} > - - - + + +
@@ -116,10 +116,10 @@ const Attendance = () => {
{user.IsAttendance === 'ATTENDANCE' - ? '출석' + ? '出席' : user.IsAttendance === 'TARDY' - ? '지각' - : '결석'} + ? '遅刻' + : '欠席'}
{ setIsOpen(true); }} > - 출석부 + 出席簿
{isOpen ? ( @@ -58,7 +58,7 @@ const AttendanceCard = ({cid}: {cid: number; uid: number}) => { className=" bg-white rounded-lg w-[500px] h-[630px] px-4 py-10 box-border" id="modal-container" > -
출석부
+
出席簿
{users.map((user, index) => (
{ className="px-3 hover:bg-gray-200 border-s-2" onClick={() => handleClickStatus(user.uid, 'ATTENDANCE')} > - 출석 + 出席
@@ -98,13 +98,13 @@ const AttendanceCard = ({cid}: {cid: number; uid: number}) => { setIsOpen(false); }} > - 닫기 + 閉じる
diff --git a/src/app/classes/[cId]/[mId]/components/AttendanceContainer.tsx b/src/app/classes/[cId]/[mId]/components/AttendanceContainer.tsx index 240f52c..9b24b3a 100644 --- a/src/app/classes/[cId]/[mId]/components/AttendanceContainer.tsx +++ b/src/app/classes/[cId]/[mId]/components/AttendanceContainer.tsx @@ -208,18 +208,18 @@ const AttendanceContainer = () => { setCurrentMonth(parseInt(e.target.value)) } > - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/app/classes/[cId]/[mId]/components/FeedbackContainer.tsx b/src/app/classes/[cId]/[mId]/components/FeedbackContainer.tsx index cb8762d..f9bf8a1 100644 --- a/src/app/classes/[cId]/[mId]/components/FeedbackContainer.tsx +++ b/src/app/classes/[cId]/[mId]/components/FeedbackContainer.tsx @@ -23,7 +23,7 @@ const FeedbackContainer = (props: {cId: number}) => { return (
-
피드백 요청
+
フィードバックリクエスト
{material ? ( { {feedbacks.length === 0 ? (
- 아직 피드백이 없습니다. + まだフィードバックはありません。
- 피드백이 생성될 때까지 기다리거나
관리자에게 문의하세요. + フィードバックが生成されるまで待ったり
{' '} + 管理者にお問い合わせください。
) : (
- 이 자료에 대한 피드백 + この資料へのフィードバック
@@ -57,7 +58,7 @@ const FeedbackContainer = (props: {cId: number}) => { )}
- ✅ 사용자가 질문한 내용과 가장 관련성이 높은 페이지 + ✅ ユーザーが質問した内容と最も関連性の高いページ
{material ? ( diff --git a/src/app/classes/[cId]/[mId]/components/FeedbackKeywordList.tsx b/src/app/classes/[cId]/[mId]/components/FeedbackKeywordList.tsx index 35dea95..7d75232 100644 --- a/src/app/classes/[cId]/[mId]/components/FeedbackKeywordList.tsx +++ b/src/app/classes/[cId]/[mId]/components/FeedbackKeywordList.tsx @@ -88,9 +88,7 @@ const FeedbackKeywordList = ({cId, mId}: {cId: number; mId: number}) => { )) ) ) : ( -
- 현재 질문 데이터가 존재하지 않습니다. -
+
現在、質問データが存在しません。
)}
); diff --git a/src/app/classes/[cId]/[mId]/components/FeedbackList.tsx b/src/app/classes/[cId]/[mId]/components/FeedbackList.tsx index 1423755..92a8ba6 100644 --- a/src/app/classes/[cId]/[mId]/components/FeedbackList.tsx +++ b/src/app/classes/[cId]/[mId]/components/FeedbackList.tsx @@ -42,7 +42,7 @@ const FeedbackList = ({feedbacks}: {feedbacks: feedback[]}) => { className="bg-red-400 p-2 text-white" onClick={() => handleClickDelete(feedback.id)} > - 삭제 + 削除
diff --git a/src/app/classes/[cId]/[mId]/components/ManageContainer.tsx b/src/app/classes/[cId]/[mId]/components/ManageContainer.tsx index 32a2500..7c4312d 100644 --- a/src/app/classes/[cId]/[mId]/components/ManageContainer.tsx +++ b/src/app/classes/[cId]/[mId]/components/ManageContainer.tsx @@ -8,13 +8,13 @@ import AttendanceContainer from './AttendanceContainer'; import '@/src/styles/variable.css'; const ManageContainer = (props: {cId: string}) => { - const tabs = ['자료', '퀴즈', '피드백', '출석']; + const tabs = ['資料', 'クイズ', 'フィードバック', '出席']; const [activeTab, setActiveTab] = useState(tabs[0]); const tabMapping = { - 자료: , - 퀴즈: , - 피드백: , - 출석: , + 資料: , + クイズ: , + フィードバック: , + 出席: , }; return ( // 퀴즈 diff --git a/src/app/classes/[cId]/[mId]/components/QuizList.tsx b/src/app/classes/[cId]/[mId]/components/QuizList.tsx index 13d2f88..b60483b 100644 --- a/src/app/classes/[cId]/[mId]/components/QuizList.tsx +++ b/src/app/classes/[cId]/[mId]/components/QuizList.tsx @@ -98,7 +98,7 @@ const QuizList = (props: {cId: number; mId: number; mName: string}) => { height={25} alt="icon" /> - 퀴즈 목록 + クイズリスト
{isSubmit ? null : (
@@ -118,7 +118,7 @@ const QuizList = (props: {cId: number; mId: number; mName: string}) => {
- 마감 기한 : + 締め切り : {isSubmit ? (
{moment(deadLine).format('YYYY-MM-DD / HH:mm')} @@ -133,7 +133,7 @@ const QuizList = (props: {cId: number; mId: number; mName: string}) => { > {deadLine ? moment(deadLine).format('YYYY-MM-DD / HH:mm') - : '마감기한을 설정해주세요'} + : '期限を設定してください'} {isOpen ? ( { ) )}
- 정답: {quiz.content.commentary.correctAnswer} + 正解: {quiz.content.commentary.correctAnswer}

- 해설: + 解説: {quiz.content.commentary.content}

@@ -213,14 +213,14 @@ const QuizList = (props: {cId: number; mId: number; mName: string}) => { className="py-2 px-4 bg-red-500 text-white rounded-3xl" onClick={handleDeleteSet} > - 퀴즈 삭제 + クイズの削除 ) : ( )}
@@ -238,7 +238,7 @@ const QuizList = (props: {cId: number; mId: number; mName: string}) => { height={25} alt="icon" /> - 퀴즈 통계 + クイズ統計
@@ -250,7 +250,7 @@ const QuizList = (props: {cId: number; mId: number; mName: string}) => { ) : (
- 아직 퀴즈가 출제되지 않았습니다. + まだクイズは出題されていません。
)} diff --git a/src/app/classes/[cId]/[mId]/components/QuizReport.tsx b/src/app/classes/[cId]/[mId]/components/QuizReport.tsx index 75a8ae6..cd7df51 100644 --- a/src/app/classes/[cId]/[mId]/components/QuizReport.tsx +++ b/src/app/classes/[cId]/[mId]/components/QuizReport.tsx @@ -95,7 +95,7 @@ const QuizReport = ({cId, mId}: {cId: number; mId: number}) => { >
- 응시현황 + 受験状況
diff --git a/src/app/classes/[cId]/[mId]/components/QuizSet.tsx b/src/app/classes/[cId]/[mId]/components/QuizSet.tsx index 46587d7..22a6e7c 100644 --- a/src/app/classes/[cId]/[mId]/components/QuizSet.tsx +++ b/src/app/classes/[cId]/[mId]/components/QuizSet.tsx @@ -130,7 +130,7 @@ const QuizSet = ({cId, mId}: {cId: number; mId: number}) => { className="absolute top-0 left-[-30px] z-20" > ) : null} -
질문
+
質問
{quiz.content.question}
@@ -231,13 +231,13 @@ const QuizSet = ({cId, mId}: {cId: number; mId: number}) => { {isSubmit ? (
- 정답:{' '} + 正解:{' '} {quiz.content.commentary.correctAnswer}
- 해설:{' '} + 解説:{' '} {quiz.content.commentary.content} @@ -253,7 +253,7 @@ const QuizSet = ({cId, mId}: {cId: number; mId: number}) => {
-
교수님의 말 :
+
教授の言葉 :
{feedback}
@@ -266,7 +266,7 @@ const QuizSet = ({cId, mId}: {cId: number; mId: number}) => { className="px-2 py-2 bg-blue-400 text-white rounded-lg" onClick={handleSubmitAnswer} > - 제출하기 + 提出する
)} diff --git a/src/app/classes/[cId]/[mId]/components/UserContainer.tsx b/src/app/classes/[cId]/[mId]/components/UserContainer.tsx index 8c86b56..10c12d7 100644 --- a/src/app/classes/[cId]/[mId]/components/UserContainer.tsx +++ b/src/app/classes/[cId]/[mId]/components/UserContainer.tsx @@ -11,12 +11,14 @@ import LiveClassViewer from './subComponents/LiveClassViewer'; const UserContainer = ({cId}: {cId: string}) => { const material = useRecoilValue(materialState); const user = useRecoilValue(userState); - const TABS = ['학습자료', '퀴즈', '온라인수업']; + const TABS = ['学習資料', 'クイズ', 'オンライン授業']; const [activeTab, setActiveTab] = useState(TABS[0]); const tabMapping = { - 학습자료: , - 퀴즈: , - 온라인수업: , + 学習資料: , + クイズ: , + オンライン授業: ( + + ), }; return ( diff --git a/src/app/classes/[cId]/[mId]/components/subComponents/SubContainer.tsx b/src/app/classes/[cId]/[mId]/components/subComponents/SubContainer.tsx index e0b6c1a..1139046 100644 --- a/src/app/classes/[cId]/[mId]/components/subComponents/SubContainer.tsx +++ b/src/app/classes/[cId]/[mId]/components/subComponents/SubContainer.tsx @@ -10,20 +10,20 @@ import '@/src/styles/variable.css'; import ShowMain from '../chatComponents/page'; const SubContainer: React.FC = () => { - const TABS = ['프롬프트창', '저장목록']; + const TABS = ['プロンプト', 'セーブリスト']; const [activeTab, setActiveTab] = useState(TABS[0]); const [showMain, setShowMain] = useState(false); const params = useParams<{cId: string}>(); const material = useRecoilValue(materialState); const tabMapping = { - 프롬프트창: ( + プロンプト: ( ), - 저장목록: ( + セーブリスト: (
- 이런 퀴즈는 어떠신가요? + こんなクイズはいかがですか?
{!loading && recommendQuiz ? ( @@ -207,13 +207,13 @@ const QuizForm = (props: { className="p-2 bg-blue-400 text-white rounded-lg" onClick={handleAcceptQuiz} > - 적용하기 + 適用する
@@ -225,13 +225,13 @@ const QuizForm = (props: { href={`/classes/${params.cId}/${params.mId}`} className="py-2 px-4 border border-black rounded-3xl" > - {'< '}뒤로가기 + {'< '}戻る diff --git a/src/app/components/login/Login.tsx b/src/app/components/login/Login.tsx index b352f03..37810f4 100644 --- a/src/app/components/login/Login.tsx +++ b/src/app/components/login/Login.tsx @@ -25,11 +25,11 @@ const Login = () => {
- 미노리에서 학습을 -
시작하세요! + ミノリで学びを +
始めましょう!
- 소셜 로그인으로 간편하게 즐길 수 있습니다. + ソーシャルログインで簡単に楽しめます。
@@ -66,14 +66,12 @@ const Login = () => { height={25} />
- 구글 계정으로 로그인 + Googleでログイン
diff --git a/src/app/page.tsx b/src/app/page.tsx index 2cae9c8..2ba06b0 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -37,10 +37,10 @@ const Page = () => {
- 미노리에서,

학습을 더욱 즐겁고 편리하게

+ ミノリで,

学習をより楽しく、より便利に

- 학습의 편의성을 향상시키고 즐겁게 학습하는 경험을 만끽해 보세요! + 学習の利便性を向上させ、楽しい学習体験を満喫してください!
{ onClick={openModal} className="bg-indigo-600 text-white py-2 px-7 rounded-3xl" > - 시작하기 + ログインする {isOpen && }
diff --git a/src/components/navbar/Navbar.tsx b/src/components/navbar/Navbar.tsx index f7cac47..ff5216c 100644 --- a/src/components/navbar/Navbar.tsx +++ b/src/components/navbar/Navbar.tsx @@ -7,8 +7,8 @@ import '@/src/styles/variable.css'; const Navbar = () => { const pages = [ - {name: '클래스', icon: icons.group, url: '/classes'}, - {name: '내정보', icon: icons.myPage, url: '/info'}, + {name: 'クラス', icon: icons.group, url: '/classes'}, + {name: 'マイページ', icon: icons.myPage, url: '/info'}, // {name: '문제은행', icon: icons.bank, url: '/bank'}, /* Billing Page - 保留 */ ]; @@ -23,12 +23,12 @@ const Navbar = () => { {/* Pages */}
-

페이지

+

ページ

    {pages.map((page, index) => { return (
  • - + icon { <>
    -

    자료

    -
    資料

    + {/*
    setIsOpen(true)} > plus -
    +
    */}
    {isOpen && } {/* prompt - search */} @@ -104,7 +104,7 @@ const MaterialContainer = () => {
    @@ -138,9 +138,9 @@ const MaterialContainer = () => { className="w-6 h-6 mr-2" > {param.mId ? ( - 프롬프트 떠나기 + フロンプトを出る ) : ( - 클래스 떠나기 + クラスを出る )}
diff --git a/src/components/navbar/material/MaterialForm.tsx b/src/components/navbar/material/MaterialForm.tsx index 431164e..bdd98f1 100644 --- a/src/components/navbar/material/MaterialForm.tsx +++ b/src/components/navbar/material/MaterialForm.tsx @@ -63,23 +63,23 @@ const MaterialForm = ({setIsOpen, editData, cId}: FormProps) => {
-
프롬프트 생성
+
プロンプト生成
- 원하는 파일을 추가해주세요. + ご希望のファイルを追加してください。
-
프롬프트명
+
プロンプト名
-
파일 추가
+
ファイルの追加
{ @@ -96,9 +96,11 @@ const MaterialForm = ({setIsOpen, editData, cId}: FormProps) => { className="m-auto " />
-
PDF 파일을 추가해주세요
+
+ PDFファイルを追加してください +
- 지원하는 파일 형식: PDF + 対応ファイル形式: PDF
{ className="bg-gray-100 py-2 px-4 rounded" onClick={() => setIsOpen(false)} > - {'< '}뒤로가기 + {'< '}戻る {editData ? ( ) : ( )}
diff --git a/src/components/navbar/profile/EditName.tsx b/src/components/navbar/profile/EditName.tsx index 38c2f53..f73169c 100644 --- a/src/components/navbar/profile/EditName.tsx +++ b/src/components/navbar/profile/EditName.tsx @@ -21,7 +21,7 @@ const EditName = ({setIsOpen, func}: editProps) => { >
- 이름 변경 + 名前変更
{ className="bg-blue-500 text-white py-2 px-3 rounded text-sm font-medium mx-2" onClick={handleClickSave} > - 저장 + セーブ
diff --git a/src/components/navbar/profile/Profile.tsx b/src/components/navbar/profile/Profile.tsx index a470ece..541120b 100644 --- a/src/components/navbar/profile/Profile.tsx +++ b/src/components/navbar/profile/Profile.tsx @@ -98,7 +98,7 @@ const Profile = () => { setDropdownOpen(false); }} > - 이름 변경 + 名前変更 , user.role_id === 'ADMIN' ? (
  • { setDropdownOpen(false); }} > - 클래스 수정 + クラス修正
  • ) : null,
  • { ] : null}
  • - 로그아웃 + ログアウト
  • )} From 0f64f61fb4014b82c8649b2cd5d9804160fbc91c Mon Sep 17 00:00:00 2001 From: dorimu0 <121004915+dorimu0@users.noreply.github.com> Date: Mon, 1 Jul 2024 19:38:08 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=92=84=20style=20:=20Apply=20Japanese?= =?UTF-8?q?=20font?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apply fonts to change text Japanese Related issue: #171 --- src/app/globals.css | 17 +++++++++++++---- src/app/layout.tsx | 7 ++++--- src/components/navbar/profile/Profile.tsx | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/app/globals.css b/src/app/globals.css index 6a8d32d..f281c95 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -8,6 +8,14 @@ --background-end-rgb: 255, 255, 255; } +@font-face { + font-family: 'Pretendard-Regular'; + src: url('https://fastly.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Regular.woff') + format('woff'); + font-weight: 400; + font-style: normal; +} + /* @media (prefers-color-scheme: dark) { :root { --foreground-rgb: 255, 255, 255; @@ -17,6 +25,7 @@ } */ body { + font-family: 'Pretendard-Regular'; color: rgb(var(--foreground-rgb)); background: linear-gradient( to bottom, @@ -31,13 +40,13 @@ body { scrollbar-width: none; } -.scrollbar-visible::-webkit-scrollbar{ +.scrollbar-visible::-webkit-scrollbar { width: 8px; } .scrollbar-visible::-webkit-scrollbar-thumb { - background-color: rgba(0,0,255,.5); + background-color: rgba(0, 0, 255, 0.5); } .scrollbar-visible { scrollbar-width: thin; - scrollbar-color: rgba(0,0,255,.1) rgba(0,0,255,0); -} \ No newline at end of file + scrollbar-color: rgba(0, 0, 255, 0.1) rgba(0, 0, 255, 0); +} diff --git a/src/app/layout.tsx b/src/app/layout.tsx index e0a1e19..541abd2 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,11 +1,11 @@ import type {Metadata} from 'next'; -import {Inter} from 'next/font/google'; +// import {Inter} from 'next/font/google'; // import {Footer} from '../components/footer'; import RecoilRootContainer from '../components/RecoilRootContainer'; import './globals.css'; import '@/src/styles/variable.css'; -const inter = Inter({subsets: ['latin']}); +// const inter = Inter({subsets: ['latin']}); export const metadata: Metadata = { title: 'Minori', @@ -15,7 +15,8 @@ export const metadata: Metadata = { const RootLayout = ({children}: {children: React.ReactNode}) => { return ( - + {/* */} +
    {/* */} diff --git a/src/components/navbar/profile/Profile.tsx b/src/components/navbar/profile/Profile.tsx index 541120b..89560fa 100644 --- a/src/components/navbar/profile/Profile.tsx +++ b/src/components/navbar/profile/Profile.tsx @@ -120,7 +120,7 @@ const Profile = () => { setDropdownOpen(false); }} > - {user.role_id === 'ADMIN' ? '클래스 삭제' : '클래스 탈퇴'} + {user.role_id === 'ADMIN' ? 'クラス削除' : 'クラス退会'} , ] : null}