Merge pull request #176 from softeerbootcamp4th/fix/#154/code

fix/#154/code
softeerbootcamp4th · Aug 25, 2024 · b1c90d7 · b1c90d7
2 parents 2384dbe + 89a3500
commit b1c90d7
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 15 deletions.
diff --git a/.github/workflows/service-cicd.yml b/.github/workflows/service-cicd.yml
@@ -1,4 +1,4 @@
-name: admin Deploy to S3 and CloudFront
+name: service Deploy to S3 and CloudFront
 
 on:
   push:

diff --git a/admin/src/pages/miniQuiz/MiniQuizContent.jsx b/admin/src/pages/miniQuiz/MiniQuizContent.jsx
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import InputForm from '@/components/form/InputForm';
 
 function MiniQuizContent({ response, onChange }) {
-  // console.log(response);
   return (
     <>
       <InputForm

diff --git a/admin/src/pages/reward/Reward.jsx b/admin/src/pages/reward/Reward.jsx
@@ -51,7 +51,6 @@ function Reward() {
   };
 
   const handleSubmit = async () => {
-    console.log(rewardData);
     const formData = createFormData(rewardData);
     try {
       const response = await putAdminReward(formData);

diff --git a/service/src/pages/eventIntro/EventIntroRewards.jsx b/service/src/pages/eventIntro/EventIntroRewards.jsx
@@ -8,7 +8,6 @@ function EventIntroRewards() {
     const fetchInfo = async () => {
       try {
         const data = await getPrizeInfo();
-        console.log(data);
         if (Array.isArray(data)) {
           setInfo(data);
         } else {

diff --git a/service/src/pages/miniquiz/LoadingQuiz.jsx b/service/src/pages/miniquiz/LoadingQuiz.jsx
@@ -33,11 +33,7 @@ function LoadingQuiz() {
     '퀴즈 정보를 가져오는 중..!',
   ];
 
-  const loadingText = useLoadingText(
-    '퀴즈 정보를 가져오는 중..!',
-    loadingTexts,
-    500,
-  );
+  const loadingText = useLoadingText(loadingTexts[3], loadingTexts, 500);
 
   return (
     <div className="flex flex-col items-center h-screen bg-miniquiz-paper pt-4000">

diff --git a/service/src/pages/miniquiz/MiniQuizMain.jsx b/service/src/pages/miniquiz/MiniQuizMain.jsx
@@ -11,7 +11,7 @@ const QuizDescription = ({ description }) => (
 );
 
 QuizDescription.propTypes = {
-  description: PropTypes.string.isRequired,
+  description: PropTypes.string,
 };
 
 const QuizQuestions = ({ questions, selectedId, onSelect }) => (

diff --git a/service/src/pages/miniquiz/SubmitButton.jsx b/service/src/pages/miniquiz/SubmitButton.jsx
@@ -51,7 +51,7 @@ function SubmitButton({ quizId, isChosen, disabled, setDisabled }) {
 }
 
 SubmitButton.propTypes = {
-  quizId: PropTypes.number.isRequired,
+  quizId: PropTypes.number,
   isChosen: PropTypes.number.isRequired,
   disabled: PropTypes.bool.isRequired,
   setDisabled: PropTypes.func.isRequired,

diff --git a/service/src/pages/miniquiz/miniquizhooks/useMiniQuiz.js b/service/src/pages/miniquiz/miniquizhooks/useMiniQuiz.js
@@ -18,10 +18,9 @@ const useMiniQuiz = () => {
           getMiniQuiz(),
           new Promise(resolve => setTimeout(resolve, 300)), // 사용자의 경험을 방해하지 않는 선에서 로딩 화면을 보여주기 위한 0.3초
         ]);
-
-        const { quizCode, quizQuestions } = quizData;
-        if (quizCode === 'NO_QUIZ_CONTENT') {
-          setCode(quizCode);
+        const { code, quizQuestions } = quizData;
+        if (code === 'NO_QUIZ_CONTENT') {
+          setCode(code);
           return;
         }
         setData(quizData);