Updates

app.py

@@ -41,7 +41,7 @@ def generate_pdf_report():
     pdf.set_fill_color(211, 211, 211)  # Light gray
     pdf.cell(0, 10, txt="Magic Math Quiz!", ln=True, align="C", fill=True)
     pdf.ln(5)
-    pdf.set_font("Arial", size=10)
+    pdf.set_font("Arial", size=8)
     pdf.cell(0, 10, txt="by Ghassem Tofighi", ln=True, align="C", link="https://ghassem.com")
     pdf.ln(10)
 
@@ -86,23 +86,36 @@ def generate_pdf_report():
 
 def load_modules():
     modules = {}
-    module_dir = "modules"
-    for filename in os.listdir(module_dir):
-        if filename.endswith(".py") and filename != "__init__.py":
-            module_name = filename[:-3]
-            # Dynamically import the module only when needed
-            module = __import__(f"{module_dir}.{module_name}", fromlist=[''])
-            modules[module_name] = {
-                "title": getattr(module, "title", module_name.replace("_", " ").title()),
-                "description": getattr(module, "description", "No description available."),
-                "generate_question": module.generate_question  # Access the generate_question function
-            }
+    base_dir = "modules"
+    for category in os.listdir(base_dir):
+        category_dir = os.path.join(base_dir, category)
+        if os.path.isdir(category_dir):
+            config_path = os.path.join(category_dir, "config.py")
+            if os.path.exists(config_path):
+                config = {}
+                with open(config_path) as f:
+                    exec(f.read(), config)
+                category_title = config.get("title", category.title().replace("_", " "))
+            else:
+                category_title = category.title().replace("_", " ")
+
+            modules[category_title] = {}
+            for filename in os.listdir(category_dir):
+                if filename.endswith(".py") and filename != "__init__.py" and filename != "config.py":
+                    module_name = filename[:-3]
+                    module = __import__(f"{category_dir.replace('/', '.')}.{module_name}", fromlist=[''])
+                    modules[category_title][module_name] = {
+                        "title": getattr(module, "title", module_name.replace("_", " ").title()),
+                        "description": getattr(module, "description", "No description available."),
+                        "generate_question": module.generate_question  # Access the generate_question function
+                    }
     return modules
 
-def generate_new_question(module_name, module):
+def generate_new_question(category_name, module_name, module):
     question_data = module['generate_question']()
     # Ensure 'answered' is initialized to False and add the 'module' and 'selected' keys
     question_data['answered'] = False
+    question_data['category'] = category_name  # Add the category name to the question data
     question_data['module'] = module_name  # Add the module name to the question data
     question_data['module_title'] = module['title']  # Add the module title to the question data
     question_data['selected'] = None  # Initialize 'selected' to None
@@ -116,59 +129,65 @@ def generate_new_question(module_name, module):
 modules = load_modules()
 
 # Streamlit interface
-st.sidebar.title("Quiz Modules")
-module_name = st.sidebar.radio("Choose a module:", [modules[module]["title"] for module in modules], index=0)
-
-selected_module = None
-for module in modules:
-    if modules[module]["title"] == module_name:
-        selected_module = module
-        break
-
-if selected_module != st.session_state.current_module:
-    st.session_state.current_module = selected_module
-    st.session_state.current_index = len(st.session_state.questions)  # Continue numbering from previous questions
-    st.session_state.selected_answer = None
-    st.session_state.button_label = "Submit/New"
-    st.session_state.start_time = time.time()  # Start the timer for the new question
-    # Initialize question count and correct count if not already done
-    if selected_module not in st.session_state.module_question_count:
-        st.session_state.module_question_count[selected_module] = 0
-    if selected_module not in st.session_state.module_correct_count:
-        st.session_state.module_correct_count[selected_module] = 0
-    # Generate a new question without adding it to the answered list yet
-    st.session_state.current_question = generate_new_question(selected_module, modules[selected_module])
+st.sidebar.title("Quiz Categories")
+selected_category = st.sidebar.selectbox("Choose a category:", list(modules.keys()))
+
+if selected_category:
+    selected_module = st.sidebar.radio("Choose a module:", [modules[selected_category][module]["title"] for module in modules[selected_category]])
+
+    for module_name, module_data in modules[selected_category].items():
+        if module_data["title"] == selected_module:
+            selected_module_data = module_data
+            break
+
+    if selected_module != st.session_state.current_module:
+        st.session_state.current_module = selected_module
+        st.session_state.current_index = len(st.session_state.questions)  # Continue numbering from previous questions
+        st.session_state.selected_answer = None
+        st.session_state.button_label = "Submit/New"
+        st.session_state.start_time = time.time()  # Start the timer for the new question
+        # Initialize question count and correct count if not already done
+        if selected_module not in st.session_state.module_question_count:
+            st.session_state.module_question_count[selected_module] = 0
+        if selected_module not in st.session_state.module_correct_count:
+            st.session_state.module_correct_count[selected_module] = 0
+        # Generate a new question without adding it to the answered list yet
+        st.session_state.current_question = generate_new_question(selected_category, selected_module, selected_module_data)
 
 current_question = st.session_state.current_question
 
 # Title header with rounded corners and margin
 st.markdown(
     """
-    <div style='background-color: #D3D3D3; padding: 10px; border-radius: 10px; text-align: center; color: black; margin-top: 20px;'>
+    <div style='background-color: #D3D3D3; padding: 10px; border-radius: 10px; text-align: center; color: black; margin-top: 20px; position: relative;'>
     <h3 style='margin: 0;'>Magic Math Quiz!</h3>
-    <h6 style='margin: 0;'><a href="https://ghassem.com" target="_blank" style="color: black; text-decoration: none;">By Ghassem Tofighi</a></h6>
+    <h6 style='margin: 0; font-size: 10px;'><a href="https://ghassem.com" target="_blank" style="color: black; text-decoration: none;'>By Ghassem Tofighi</a></h6>
+    <div style='position: absolute; right: 10px; top: 10px;'>
+        <button id="pdf-button" style='font-size: 10px;'>
+            Download PDF Report 📄
+        </button>
+    </div>
     </div>
     """, unsafe_allow_html=True)
 
-# Display the PDF report button next to the title header if at least one question is answered
-if any(q['answered'] for q in st.session_state.questions):
+# Disable PDF download button initially if no questions have been answered
+pdf_button_disabled = not any(q['answered'] for q in st.session_state.questions)
+st.write('<script>document.getElementById("pdf-button").disabled = {};</script>'.format(pdf_button_disabled), unsafe_allow_html=True)
+
+if not pdf_button_disabled:
     pdf = generate_pdf_report()
     st.session_state.pdf_data = pdf  # Reset PDF cache
-    st.markdown(
-        """
-        <div style='text-align: right; margin-top: -30px;'>
-        """, unsafe_allow_html=True)
     st.download_button(
         label="Download PDF Report 📄",
         data=st.session_state.pdf_data,
         file_name="quiz_report.pdf",
-        mime="application/pdf"
+        mime="application/pdf",
+        disabled=pdf_button_disabled
     )
-    st.markdown("</div>", unsafe_allow_html=True)
 
 # Display module title and description with a larger font for description
-st.markdown(f"### {modules[selected_module]['title']}")
-st.markdown(f"<span style='font-size: 14px;'>{modules[selected_module]['description']}</span>", unsafe_allow_html=True)
+st.markdown(f"### {selected_module_data['title']}")
+st.markdown(f"<span style='font-size: 14px;'>{selected_module_data['description']}</span>", unsafe_allow_html=True)
 
 # Display the current question with larger font
 st.markdown(f"<span style='font-size: 18px;'><b>Q{st.session_state.current_index + 1}: {current_question['question']}</b></span>", unsafe_allow_html=True)
@@ -204,24 +223,27 @@ if submit_button:
             st.session_state.module_correct_count[selected_module] += 1
 
         # Show correct/incorrect feedback, explanation, and step-by-step solution
-        for i, option in enumerate(current_question['options']):
-            option_text = f"{options[i]}. {option}"
-            if option == current_question['correct_answer']:
-                st.markdown(f"<span style='color:green;'>{option_text} ✅</span>", unsafe_allow_html=True)
-            elif option == selected_answer_text:
-                st.markdown(f"<span style='color:red;'>{option_text} ❌</span>", unsafe_allow_html=True)
-            else:
-                st.markdown(f"{option_text}", unsafe_allow_html=True)
+        col1, col2 = st.columns(2)
+        with col1:
+            for i, option in enumerate(current_question['options']):
+                option_text = f"{options[i]}. {option}"
+                if option == current_question['correct_answer']:
+                    st.markdown(f"<span style='color:green;'>{option_text} ✅</span>", unsafe_allow_html=True)
+                elif option == selected_answer_text:
+                    st.markdown(f"<span style='color:red;'>{option_text} ❌</span>", unsafe_allow_html=True)
+                else:
+                    st.markdown(f"{option_text}", unsafe_allow_html=True)
         
-        st.markdown(f"<span style='font-size: 14px;'><b>Explanation:</b> {current_question['explanation']}</span>", unsafe_allow_html=True)
-        st.markdown(f"<span style='font-size: 14px;'><b>Step-by-Step Solution:</b></span>", unsafe_allow_html=True)
-        for step in current_question['step_by_step_solution']:
-            st.markdown(f"<span style='font-size: 14px;'>{step}</span>", unsafe_allow_html=True)
+        with col2:
+            st.markdown(f"<span style='font-size: 14px;'><b>Explanation:</b> {current_question['explanation']}</span>", unsafe_allow_html=True)
+            st.markdown(f"<span style='font-size: 14px;'><b>Step-by-Step Solution:</b></span>", unsafe_allow_html=True)
+            for step in current_question['step_by_step_solution']:
+                st.markdown(f"<span style='font-size: 14px;'>{step}</span>", unsafe_allow_html=True)
 
         # Add the question to the answered list only after submission
         st.session_state.questions.append(current_question)
         st.session_state.current_index = len(st.session_state.questions)
 
         # Generate a new question after submission
-        st.session_state.current_question = generate_new_question(selected_module, modules[selected_module])
+        st.session_state.current_question = generate_new_question(selected_category, selected_module, selected_module_data)
         st.session_state.start_time = time.time()  # Reset the timer for the new question

modules/{addition_bases.py → numbering_system/addition_bases.py}

@@ -1,4 +1,4 @@
-# modules/addition_bases.py
+# modules/numbering_system/addition_bases.py
 
 title = "Addition in Various Bases"
 description = "This module covers addition operations in bases like binary, octal, and hexadecimal."

modules/numbering_system/config.py

@@ -0,0 +1,2 @@
+title = "Numbering System"
+description = "This category covers various operations and concepts in different numbering systems, including binary, octal, decimal, and hexadecimal."