Commit @6a3fb29aec7cbc1eb6dc1a57a07824ebca75d2c9

6a3fb29

public/contents/afternoon.mp3 (Binary) (added)

+++ public/contents/afternoon.mp3

Binary file is not shown

6a3fb29

public/contents/afternoon.webp (Binary) (added)

+++ public/contents/afternoon.webp

Binary file is not shown

6a3fb29

public/contents/apple.mp3 (Binary) (added)

+++ public/contents/apple.mp3

Binary file is not shown

6a3fb29

public/contents/apple.png (Binary) (added)

+++ public/contents/apple.png

Binary file is not shown

6a3fb29

public/contents/bad.mp3 (Binary) (added)

+++ public/contents/bad.mp3

Binary file is not shown

6a3fb29

public/contents/bad.png (Binary) (added)

+++ public/contents/bad.png

Binary file is not shown

6a3fb29

public/contents/cow.png (Binary) (added)

+++ public/contents/cow.png

Binary file is not shown

6a3fb29

public/contents/cut1.png (Binary) (added)

+++ public/contents/cut1.png

Binary file is not shown

6a3fb29

public/contents/cut2.png (Binary) (added)

+++ public/contents/cut2.png

Binary file is not shown

6a3fb29

public/contents/cut3.png (Binary) (added)

+++ public/contents/cut3.png

Binary file is not shown

6a3fb29

public/contents/cut4.png (Binary) (added)

+++ public/contents/cut4.png

Binary file is not shown

6a3fb29

public/contents/cut5.png (Binary) (added)

+++ public/contents/cut5.png

Binary file is not shown

6a3fb29

public/contents/cut6.png (Binary) (added)

+++ public/contents/cut6.png

Binary file is not shown

6a3fb29

public/contents/cut7.png (Binary) (added)

+++ public/contents/cut7.png

Binary file is not shown

6a3fb29

public/contents/cut8.png (Binary) (added)

+++ public/contents/cut8.png

Binary file is not shown

6a3fb29

public/contents/daddy.png (Binary) (added)

+++ public/contents/daddy.png

Binary file is not shown

6a3fb29

public/contents/evening.mp3 (Binary) (added)

+++ public/contents/evening.mp3

Binary file is not shown

6a3fb29

public/contents/evening.webp (Binary) (added)

+++ public/contents/evening.webp

Binary file is not shown

6a3fb29

public/contents/gingerbreadman.mp3 (Binary) (added)

+++ public/contents/gingerbreadman.mp3

Binary file is not shown

6a3fb29

public/contents/gingerbreadman.png (Binary) (added)

+++ public/contents/gingerbreadman.png

Binary file is not shown

6a3fb29

public/contents/good.mp3 (Binary) (added)

+++ public/contents/good.mp3

Binary file is not shown

6a3fb29

public/contents/good.png (Binary) (added)

+++ public/contents/good.png

Binary file is not shown

6a3fb29

public/contents/goodmorning.mp3 (Binary) (added)

+++ public/contents/goodmorning.mp3

Binary file is not shown

6a3fb29

public/contents/goodmorningmom.mp3 (Binary) (added)

+++ public/contents/goodmorningmom.mp3

Binary file is not shown

6a3fb29

public/contents/grape.mp3 (Binary) (added)

+++ public/contents/grape.mp3

Binary file is not shown

6a3fb29

public/contents/grape.png (Binary) (added)

+++ public/contents/grape.png

Binary file is not shown

6a3fb29

public/contents/iambad.mp3 (Binary) (added)

+++ public/contents/iambad.mp3

Binary file is not shown

6a3fb29

public/contents/iamsogood.mp3 (Binary) (added)

+++ public/contents/iamsogood.mp3

Binary file is not shown

6a3fb29

public/contents/mommy.png (Binary) (added)

+++ public/contents/mommy.png

Binary file is not shown

6a3fb29

public/contents/morning.mp3 (Binary) (added)

+++ public/contents/morning.mp3

Binary file is not shown

6a3fb29

public/contents/morning.webp (Binary) (added)

+++ public/contents/morning.webp

Binary file is not shown

6a3fb29

public/contents/old.png (Binary) (added)

+++ public/contents/old.png

Binary file is not shown

6a3fb29

public/contents/rain.png (Binary) (added)

+++ public/contents/rain.png

Binary file is not shown

6a3fb29

public/contents/rain1.mp3 (Binary) (added)

+++ public/contents/rain1.mp3

Binary file is not shown

6a3fb29

public/contents/rain2.mp3 (Binary) (added)

+++ public/contents/rain2.mp3

Binary file is not shown

6a3fb29

public/contents/rain3.mp3 (Binary) (added)

+++ public/contents/rain3.mp3

Binary file is not shown

6a3fb29

public/contents/rain4.mp3 (Binary) (added)

+++ public/contents/rain4.mp3

Binary file is not shown

6a3fb29

public/contents/song1.mp3 (Binary) (added)

+++ public/contents/song1.mp3

Binary file is not shown

6a3fb29

public/contents/song2.mp3 (Binary) (added)

+++ public/contents/song2.mp3

Binary file is not shown

6a3fb29

public/contents/song3.mp3 (Binary) (added)

+++ public/contents/song3.mp3

Binary file is not shown

6a3fb29

public/contents/song4.mp3 (Binary) (added)

+++ public/contents/song4.mp3

Binary file is not shown

6a3fb29

public/contents/thecow.mp3 (Binary) (added)

+++ public/contents/thecow.mp3

Binary file is not shown

6a3fb29

public/contents/thegingerbreadman.mp3 (Binary) (added)

+++ public/contents/thegingerbreadman.mp3

Binary file is not shown

cbd17f0

6a3fb29

src/components/contents/wordBundle/WordBundleBasicLearning.jsx

--- src/components/contents/wordBundle/WordBundleBasicLearning.jsx

+++ src/components/contents/wordBundle/WordBundleBasicLearning.jsx


-import React, { useEffect } from "react";
+import React, { useState } from "react";
 import "./WordBundleBasicLearning.css";
 
 const WordBundleBasicLearning = ({ contents }) => {
+  const [isPlaying, setIsPlaying] = useState(false);
+
+  const toggleAudio = () => {
+    const audio = document.getElementById("song-audio");
+    if (isPlaying) {
+      audio.pause();
+    } else {
+      audio.play();
+    }
+    setIsPlaying(!isPlaying);
+  };
+
   if (!contents) {
     return <div>Loading...</div>;
   }

         src={contents.image}
         alt="이미지"
         className="wordBundle-basic-learning-img"
+        onClick={toggleAudio}
       />
 
       <div className="wordBundle-basic-learning-word">
         <h1>{contents.word}</h1>
         <h3>{contents.wordMeaning}</h3>
       </div>
+      <audio id="song-audio" controls style={{ display: "none" }}>
+            <source src={contents.file} type="audio/mpeg" />
+          </audio>
     </>
   );
 };

cbd17f0

6a3fb29

src/components/contents/wordBundle/WordBundleDeepLearning.jsx

--- src/components/contents/wordBundle/WordBundleDeepLearning.jsx

+++ src/components/contents/wordBundle/WordBundleDeepLearning.jsx


-import React from "react";
+import React, { useState }  from "react";
 import "./WordBundleDeepLearning.css";
 
 const WordBundleDeepLearning = ({ contents }) => {
+  const [isPlaying, setIsPlaying] = useState(false);
+
+  const toggleAudio = () => {
+    const audio = document.getElementById("song-audio");
+    if (isPlaying) {
+      audio.pause();
+    } else {
+      audio.play();
+    }
+    setIsPlaying(!isPlaying);
+  };
+
+
   if (!contents) {
     return <div>Loading...</div>;
   }

         src={contents.image}
         alt="이미지"
         className="wordBundle-basic-learning-img"
+        onClick={toggleAudio}
       />
 
       <div className="wordBundle-basic-learning-word">
         <h1>{contents.sentence}</h1>
         <h3>{contents.sentence_meaning}</h3>
       </div>
+      <audio id="song-audio" controls style={{ display: "none" }}>
+            <source src={contents.sentence_file} type="audio/mpeg" />
+          </audio>
+
     </>
   );
 };

cbd17f0

6a3fb29

src/components/lessons/lesson1.jsx

--- src/components/lessons/lesson1.jsx

+++ src/components/lessons/lesson1.jsx


   const [planetStep, setPlanetStep] = useState(0);
   const [cookies1, setCookie1] = useCookies(["username"]);
   const [recom, setRecom] = useState([]);
+  const [ment, setMent] = useState([""]);
   const navigate = useNavigate();
   useEffect(() => {
     console.log("mainStep" + mainStep);

           </li>
         </ul>
       </div>
+      <div className="lession">
+        <h2 className="lesson-h2">
+          <mark>{ment}</mark>
+        </h2>
+      </div>
     </div>
   );
 };

cbd17f0

6a3fb29

src/pages/main/mainp.jsx

--- src/pages/main/mainp.jsx

+++ src/pages/main/mainp.jsx


 
   // 사용자 입력을 저장할 state 초기화
   const [comment, setComment] = useState(
-    "어서와~ 꿈 속 우주공간은 처음이지? 여행하고 싶은 행성을 골라봐~"
+    "AI 학습 도우미가 너의 학습 이력을 분석해 추천 컨텐츠를 알아냈어! \n 추천별★를 확인해봐!"
   );
   useEffect(() => {
     const fetchData = async () => {

           withCredentials: true,
         });
         console.log(response);
-        setComment(response.data.data.comment);
+        if(response.data.data.comment){
+          setComment(response.data.data.comment);
+        }
       } catch (error) {
         console.error("Error fetching data:", error);
       }

cbd17f0

6a3fb29

src/pages/signup/SignUpPage.jsx

--- src/pages/signup/SignUpPage.jsx

+++ src/pages/signup/SignUpPage.jsx


           onChange={(e) => setGrade(e.target.value)}
           className="signup-select"
         >
-          <option value="1">1학년</option>
-          <option value="2">2학년</option>
-          <option value="3">3학년</option>
           <option value="4">4학년</option>
-          <option value="5">5학년</option>
-          <option value="6">6학년</option>
         </select>
         <div className="signup-label">성별</div>
         <input

...	...	@@ -8,6 +8,7 @@
8	8	const [planetStep, setPlanetStep] = useState(0);
9	9	const [cookies1, setCookie1] = useCookies(["username"]);
10	10	const [recom, setRecom] = useState([]);
	11	+ const [ment, setMent] = useState([""]);
11	12	const navigate = useNavigate();
12	13	useEffect(() => {
13	14	console.log("mainStep" + mainStep);
...	...	@@ -292,6 +293,11 @@
292	293	</li>
293	294	</ul>
294	295	</div>
	296	+ <div className="lession">
	297	+ <h2 className="lesson-h2">
	298	+ <mark>{ment}</mark>
	299	+ </h2>
	300	+ </div>
295	301	</div>
296	302	);
297	303	};

...	...	@@ -70,12 +70,7 @@
70	70	onChange={(e) => setGrade(e.target.value)}
71	71	className="signup-select"
72	72	>
73		- <option value="1">1학년</option>
74		- <option value="2">2학년</option>
75		- <option value="3">3학년</option>
76	73	<option value="4">4학년</option>
77		- <option value="5">5학년</option>
78		- <option value="6">6학년</option>
79	74	</select>
80	75	<div className="signup-label">성별</div>
81	76	<input

...	...	@@ -1,7 +1,19 @@
1		-import React, { useEffect } from "react";
	1	+import React, { useState } from "react";
2	2	import "./WordBundleBasicLearning.css";
3	3
4	4	const WordBundleBasicLearning = ({ contents }) => {
	5	+ const [isPlaying, setIsPlaying] = useState(false);
	6	+
	7	+ const toggleAudio = () => {
	8	+ const audio = document.getElementById("song-audio");
	9	+ if (isPlaying) {
	10	+ audio.pause();
	11	+ } else {
	12	+ audio.play();
	13	+ }
	14	+ setIsPlaying(!isPlaying);
	15	+ };
	16	+
5	17	if (!contents) {
6	18	return <div>Loading...</div>;
7	19	}
...	...	@@ -11,12 +23,16 @@
11	23	src={contents.image}
12	24	alt="이미지"
13	25	className="wordBundle-basic-learning-img"
	26	+ onClick={toggleAudio}
14	27	/>
15	28
16	29	<div className="wordBundle-basic-learning-word">
17	30	<h1>{contents.word}</h1>
18	31	<h3>{contents.wordMeaning}</h3>
19	32	</div>
	33	+ <audio id="song-audio" controls style={{ display: "none" }}>
	34	+ <source src={contents.file} type="audio/mpeg" />
	35	+ </audio>
20	36	</>
21	37	);
22	38	};

...	...	@@ -1,7 +1,20 @@
1		-import React from "react";
	1	+import React, { useState } from "react";
2	2	import "./WordBundleDeepLearning.css";
3	3
4	4	const WordBundleDeepLearning = ({ contents }) => {
	5	+ const [isPlaying, setIsPlaying] = useState(false);
	6	+
	7	+ const toggleAudio = () => {
	8	+ const audio = document.getElementById("song-audio");
	9	+ if (isPlaying) {
	10	+ audio.pause();
	11	+ } else {
	12	+ audio.play();
	13	+ }
	14	+ setIsPlaying(!isPlaying);
	15	+ };
	16	+
	17	+
5	18	if (!contents) {
6	19	return <div>Loading...</div>;
7	20	}
...	...	@@ -11,12 +24,17 @@
11	24	src={contents.image}
12	25	alt="이미지"
13	26	className="wordBundle-basic-learning-img"
	27	+ onClick={toggleAudio}
14	28	/>
15	29
16	30	<div className="wordBundle-basic-learning-word">
17	31	<h1>{contents.sentence}</h1>
18	32	<h3>{contents.sentence_meaning}</h3>
19	33	</div>
	34	+ <audio id="song-audio" controls style={{ display: "none" }}>
	35	+ <source src={contents.sentence_file} type="audio/mpeg" />
	36	+ </audio>
	37	+
20	38	</>
21	39	);
22	40	};

...	...	@@ -73,7 +73,7 @@
73	73
74	74	// 사용자 입력을 저장할 state 초기화
75	75	const [comment, setComment] = useState(
76		- "어서와~ 꿈 속 우주공간은 처음이지? 여행하고 싶은 행성을 골라봐~"
	76	+ "AI 학습 도우미가 너의 학습 이력을 분석해 추천 컨텐츠를 알아냈어! \n 추천별★를 확인해봐!"
77	77	);
78	78	useEffect(() => {
79	79	const fetchData = async () => {
...	...	@@ -82,7 +82,9 @@
82	82	withCredentials: true,
83	83	});
84	84	console.log(response);
85		- setComment(response.data.data.comment);
	85	+ if(response.data.data.comment){
	86	+ setComment(response.data.data.comment);
	87	+ }
86	88	} catch (error) {
87	89	console.error("Error fetching data:", error);
88	90	}

Delete comment