From b2b2b1f9c598fa99c537492b904e68f32cab0dc5 Mon Sep 17 00:00:00 2001
From: Kakabay <2kakabayashyrberdyew@gmail.com>
Date: Thu, 5 Sep 2024 16:36:55 +0500
Subject: [PATCH] merge

---
 app/(main)/quiz/active/page.tsx      |  8 ------
 app/(main)/socket/app.tsx            | 40 ----------------------------
 app/(main)/vote/active/page.tsx      |  1 -
 components/quiz/QuizQuestionList.tsx |  6 +++--
 4 files changed, 4 insertions(+), 51 deletions(-)
 delete mode 100644 app/(main)/socket/app.tsx

diff --git a/app/(main)/quiz/active/page.tsx b/app/(main)/quiz/active/page.tsx
index fc1dd76..d707a28 100644
--- a/app/(main)/quiz/active/page.tsx
+++ b/app/(main)/quiz/active/page.tsx
@@ -17,14 +17,6 @@ const page = () => {
   const [quizFinished, setQuizFinished] = useState<boolean>(false);
   const [data, setData] = useState<IQuizQuestions>();
 
-  // const { data, error, isFetching } = useQuery(
-  //   ['quiz_questions'],
-  //   () => Queries.getQuizQuestions(),
-  //   {
-  //     keepPreviousData: true,
-  //   },
-  // );
-
   useEffect(() => {
     Queries.getQuizQuestions().then((res) => {
       setData(res);
diff --git a/app/(main)/socket/app.tsx b/app/(main)/socket/app.tsx
deleted file mode 100644
index a5cbf8d..0000000
--- a/app/(main)/socket/app.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { useEffect, useState } from 'react';
-
-interface Message {
-  data: string;
-}
-
-const WebSocketComponent: React.FC = () => {
-  const [message, setMessage] = useState();
-  const [socket, setSocket] = useState<WebSocket | null>(null);
-
-  useEffect(() => {
-    // Initialize WebSocket connection
-    const ws = new WebSocket('ws://localhost:8080/ws');
-    setSocket(ws);
-
-    // Event listener for messages received from server
-    ws.onmessage = (event: MessageEvent) => {
-      console.log('Received from server:', event.data);
-      setMessage(event.data);
-    };
-
-    // Handle WebSocket errors
-    ws.onerror = (error: Event) => {
-      console.error('WebSocket error:', error);
-    };
-
-    // Cleanup the WebSocket connection on component unmount
-    return () => {
-      ws.close();
-    };
-  }, []);
-
-  return (
-    <div>
-      <h1>TypeScript WebSocket Example</h1>
-    </div>
-  );
-};
-
-export default WebSocketComponent;
diff --git a/app/(main)/vote/active/page.tsx b/app/(main)/vote/active/page.tsx
index 77b5f24..1cac8dc 100644
--- a/app/(main)/vote/active/page.tsx
+++ b/app/(main)/vote/active/page.tsx
@@ -1,4 +1,3 @@
-import PageBage from '@/components/vote/PageBage';
 import ParticipantsList from '@/components/vote/ParticipantsList';
 import VoteProvider from '@/providers/VoteProvider';
 
diff --git a/components/quiz/QuizQuestionList.tsx b/components/quiz/QuizQuestionList.tsx
index 268f910..0af3b1a 100644
--- a/components/quiz/QuizQuestionList.tsx
+++ b/components/quiz/QuizQuestionList.tsx
@@ -96,11 +96,13 @@ const QuizQuestionList = ({
     }
   }, [quizFinished]);
 
+  console.log(data);
+
   return (
     <div className="flex flex-col gap-[40px] md:gap-[160px]">
       {data && !quizSearchData ? (
         data.data.questions.map((question, id) =>
-          question.status != 'new' ? (
+          question.status !== 'new' ? (
             <QuizQuestion
               score={question.score}
               questionId={question.id}
@@ -119,7 +121,7 @@ const QuizQuestionList = ({
         </h2>
       ) : data ? (
         data.data.questions.map((question, id) =>
-          question.status != 'new' ? (
+          question.status !== 'new' ? (
             <QuizQuestion
               score={question.score}
               questionId={question.id}