Merge pull request #211 from connect-foundation/develop

Merge develop into master
connect-foundation · Dec 13, 2019 · add5eea · add5eea
2 parents 43bdd6b + be41840
commit add5eea
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 36 deletions.
diff --git a/client/src/components/common/ScoreChart.js b/client/src/components/common/ScoreChart.js
@@ -119,21 +119,24 @@ function ScoreChart({ itemDatas }) {
   }, []);
   return (
     <Container>
-      {items.map((item, index) => (
-        <GraphWrapper key={item.title} width={graphWidth}>
-          <GraphBottom index={index}>
-            <ItemTitle>{item.title}</ItemTitle>
-          </GraphBottom>
-          <GraphTopWrapper>
-            <GraphTop index={index} animationName={item.animationName}>
-              <GraphCount index={index} isAnswer={item.isAnswer}>
-                {item.playerCount}
-              </GraphCount>
-            </GraphTop>
-          </GraphTopWrapper>
-          <GraphTopLimiter />
-        </GraphWrapper>
-      ))}
+      {items.map((item, index) => {
+        if (!item.title) return null;
+        return (
+          <GraphWrapper key={item.title} width={graphWidth}>
+            <GraphBottom index={index}>
+              <ItemTitle>{item.title}</ItemTitle>
+            </GraphBottom>
+            <GraphTopWrapper>
+              <GraphTop index={index} animationName={item.animationName}>
+                <GraphCount index={index} isAnswer={item.isAnswer}>
+                  {item.playerCount}
+                </GraphCount>
+              </GraphTop>
+            </GraphTopWrapper>
+            <GraphTopLimiter />
+          </GraphWrapper>
+        );
+      })}
     </Container>
   );
 }

diff --git a/client/src/components/edit/Section.js b/client/src/components/edit/Section.js
@@ -56,6 +56,7 @@ function Section({ roomId, quizsetId }) {
       const { quizset } = result.data;
       dispatch({ type: actionTypes.READ_QUIZSET, quizset });
     }
+    dispatch({ type: actionTypes.RESET_DELETE_QUIZZES });
 
     dispatch({ type: actionTypes.UPDATE_IDS, roomId, quizsetId });
 

diff --git a/client/src/components/edit/SideBar.js b/client/src/components/edit/SideBar.js
@@ -144,9 +144,14 @@ function SideBar() {
   }
 
   useEffect(() => {
-    window.addEventListener('resize', () =>
-      setWindowSize({ width: window.innerWidth, height: window.innerHeight }),
-    );
+    function changeWindowSize() {
+      setWindowSize({ width: window.innerWidth, height: window.innerHeight });
+    }
+
+    window.addEventListener('resize', changeWindowSize);
+    return () => {
+      window.removeEventListener('resize', changeWindowSize);
+    };
   }, []);
 
   useEffect(() => {

diff --git a/client/src/components/inGame/HostQuizPlayingRoom.js b/client/src/components/inGame/HostQuizPlayingRoom.js
@@ -70,13 +70,16 @@ function HostQuizPlayingRoom() {
       </layout.Center>
       <layout.Bottom>
         <layout.ItemContainer>
-          {roomState.currentQuiz.items.map((item, index) => (
-            <layout.Item key={item.title}>
-              <ItemList key={item.title} fontColor={colors.ITEM_COLOR[index]}>
-                <p>{item.title}</p>
-              </ItemList>
-            </layout.Item>
-          ))}
+          {roomState.currentQuiz.items.map((item, index) => {
+            if (!item.title) return null;
+            return (
+              <layout.Item key={item.title}>
+                <ItemList key={item.title} fontColor={colors.ITEM_COLOR[index]}>
+                  <p>{item.title}</p>
+                </ItemList>
+              </layout.Item>
+            );
+          })}
         </layout.ItemContainer>
       </layout.Bottom>
     </layout.Background>

diff --git a/client/src/components/inGame/PlayerQuiz.js b/client/src/components/inGame/PlayerQuiz.js
@@ -40,17 +40,20 @@ function Selection({ currentQuiz, chooseAnswer, setIsAnswer }) {
       </layout.Center>
       <layout.Bottom>
         <layout.ItemContainer>
-          {currentQuiz.items.map((item, index) => (
-            <layout.Item key={item.title}>
-              <Button
-                backgroundColor={colors.ITEM_COLOR[index]}
-                fontColor={colors.TEXT_WHITE}
-                onClick={e => chooseAnswer(index, e)}
-              >
-                {item.title}
-              </Button>
-            </layout.Item>
-          ))}
+          {currentQuiz.items.map((item, index) => {
+            if (!item.title) return null;
+            return (
+              <layout.Item key={item.title}>
+                <Button
+                  backgroundColor={colors.ITEM_COLOR[index]}
+                  fontColor={colors.TEXT_WHITE}
+                  onClick={e => chooseAnswer(index, e)}
+                >
+                  {item.title}
+                </Button>
+              </layout.Item>
+            );
+          })}
         </layout.ItemContainer>
       </layout.Bottom>
     </>

diff --git a/client/src/reducer/hostEditReducer.js b/client/src/reducer/hostEditReducer.js
@@ -35,6 +35,7 @@ const actionTypes = {
   DELETE_QUIZ: 10,
   UPDATE_IDS: 11,
   CHANGE_LOADING: 12,
+  RESET_DELETE_QUIZZES: 13,
 };
 
 const loadingTypes = {
@@ -168,6 +169,9 @@ const quizsetReducer = (quizsetState, action) => {
     case actionTypes.CHANGE_LOADING: {
       return { ...quizsetState, loadingType: action.loadingType };
     }
+    case actionTypes.RESET_DELETE_QUIZZES: {
+      return { ...quizsetState, deletedQuizzes: [] };
+    }
     default:
       return quizsetState;
   }