pr #7 (#7)

- Update (08639308a0fb993ace9b475cf0dbf7932d87357b)
- Update (d3bd760cf8e5a6dea636613545d72dd9c183d6ca)


Co-authored-by: Dongwook Chang <[email protected]>

Dockerfile

@@ -16,6 +16,8 @@ RUN mkdir -p /.cache && chmod -R 777 /.cache
 # Create the flask_session directory and set the appropriate permissions
 RUN mkdir -p /app/flask_session && chmod 777 /app/flask_session
 
+RUN chmod -R 777 token.json
+
 # Install any needed packages specified in requirements.txt
 RUN pip install --no-cache-dir -r requirements.txt
 

ice_breaking_challenge/background_task.py

@@ -25,20 +25,27 @@ def background_task(sid, qna: pd.DataFrame, team_size: int):
 
 
 def sample_quizzes(data: pd.DataFrame, team_size: int):
-    questions_size = min(10 // team_size + 1, 5)
+    questions_size = min(10 // team_size + (1 if 10 % team_size else 0), 5)
     sample_indices: dict[str, list[str]] = dict()
     for row in data.itertuples():
         sample_indices[row.Index] = random.sample(['Q1', 'Q2', 'Q3', 'Q4', 'Q5'], questions_size)
 
-    sample_quizzes = []
+    mandatory_quizzes = []
+    option_quizzes = []
     for key, value in sample_indices.items():
-        for question_number in value:
+        question_number = value[0]
+        question = QUESTIONS.iloc[0][question_number]
+        answer = data.iloc[key][question_number]
+        name = data.iloc[key]['name']
+        mandatory_quizzes.append([question, answer, name])
+        for question_number in value[1:]:
             question = QUESTIONS.iloc[0][question_number]
             answer = data.iloc[key][question_number]
             name = data.iloc[key]['name']
-            sample_quizzes.append([question, answer, name])
+            option_quizzes.append([question, answer, name])
 
-    return sample_quizzes[:2]  # TODO
+    random.shuffle(option_quizzes)
+    return (mandatory_quizzes + option_quizzes)[:10]  # TODO
 
 
 def generate_quiz(data: pd.DataFrame, team_size: int):

ice_breaking_challenge/quiz.py

@@ -14,7 +14,7 @@ def quiz():
     else:
         session['question_number'] += 1
 
-    if session['question_number'] == 2: # TODO:
+    if session['question_number'] == 10: # TODO:
         return redirect(url_for("quiz.finish"))
 
     print(session['question_number'])

ice_breaking_challenge/static/style.css

@@ -302,3 +302,8 @@ input[type=submit]:active {
   margin-top: 10px;
   text-align: center;
 }
+
+.character-container {
+    flex-shrink: 0;  /* Prevents shrinking of the image container */
+    text-align: right;  /* Align the image to the right */
+}

ice_breaking_challenge/templates/introduction.html

@@ -4,10 +4,14 @@
     <div class="quiz-container" style="text-align: center; margin-top: 20px;">
     <h2 style="font-family: 'Montserrat', sans-serif; font-weight: 700; color: #2c3e50;">자기소개 하는 시간을 가져 보세요</h2>
     <p style="font-family: 'Montserrat', sans-serif; color: #7f8c8d;">팀원들과 함께 간단한 자기소개를 해보세요!</p>
+
     <form method="post" style="margin-top: 20px;">
       <input type="submit" value="다음" style="padding: 10px 20px; font-size: 16px; cursor: pointer; border-radius: 5px; border: none; background-color: #2980b9; color: white;">
     </form>
   </div>
+<div class="character-container" style="margin-top: 30px; text-align: right;">
+        <img src="{{ url_for('static', filename='character.png') }}" alt="character" width="200">
+        </div>
   <!-- Google Fonts 추가 -->
   <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&display=swap" rel="stylesheet">
 {% endblock %}

ice_breaking_challenge/templates/topic.html

@@ -5,7 +5,12 @@
     <h1 id=>다음을 주제로 생각을 공유해보세요!</h1>
 
   <p id="instruction" style="color: #262a2a;">{{ topic }}</p>  <!-- 서버에서 전달한 주제를 바로 표시 -->
+
+    <br>
     </div>
+    <div class="character-container" style="margin-top: 30px; text-align: right;">
+    <img src="{{ url_for('static', filename='character.png') }}" alt="character" width="200">
+        </div>
   <script>
     // 20초마다 페이지 새로고침
     setInterval(function() {