Create quiz 5

.gitignore

@@ -10,6 +10,7 @@ docs/
 !docs/*.md
 *.dcf
 *.html
+*.png
 
 # renv - using DESCRIPTION for dependencies instead
 renv/
@@ -20,4 +21,6 @@ rsconnect/
 
 venv/
 
-legacy/
+legacy/
+
+CLAUDE.md

DESCRIPTION

@@ -12,6 +12,7 @@ URL: https://github.com/ds4owd-dev/quiz,
     https://ds4owd-dev.github.io/quiz/
 BugReports: https://github.com/ds4owd-dev/quiz/issues
 Imports:
+    remotes,
     learnr,
     dplyr,
     gapminder,
@@ -24,9 +25,18 @@ Imports:
     shiny,
     bslib,
     rsconnect,
-    yaml
+    yaml,
+    countrycode,
+    ggplot2,
+    here,
+    palmerpenguins,
+    readr,
+    rnaturalearth,
+    rnaturalearthdata,
+    sf
 Suggests:
     pkgdown
 Remotes:
     rstudio/gradethis,
-    rundel/learnrhash
+    rundel/learnrhash,
+    ropensci/rnaturalearthdata

README.md

@@ -2,19 +2,23 @@
 
 This directory contains interactive learnr quizzes for the openwashdata course and a landing page to access them.
 
-**Live Demo**: https://hjj91u-nicolo-massari.shinyapps.io/openwashdata-quiz-hub/
+**Live Demo**: https://u4x6xe-lars-sch0bitz.shinyapps.io/ds4owd-002-quiz/
 
 ## Structure
 
 - `app.R` - Quiz landing page that automatically displays all configured quizzes
 - `build.R` - Deployment script with helper functions for automated deployment
 - `config.R` - Shared configuration file defining all available quizzes
-- `modules/` - Directory containing all quiz files
-  - `md-01-quiz.Rmd` - Module 1 quiz on Quarto basics (learnr tutorial)
-  - `_github_username.Rmd` - Reusable component for GitHub username input with CSV data
-  - `_submission.Rmd` - Reusable component for quiz submission
-  - `github_usernames.csv` - Student GitHub username database
-  - Additional quiz files can be added as `md-XX-quiz.Rmd`
+- `modules/` - Directory containing individual quiz directories
+  - `md-01-quiz/` - Module 1 quiz directory with all required files
+  - `md-02-quiz/` - Module 2 quiz directory with all required files
+  - Each quiz directory contains:
+    - `md-XX-quiz.Rmd` - Main quiz file (learnr tutorial)
+    - `_github_username.Rmd` - Reusable component for GitHub username input
+    - `_participation.Rmd` - Reusable component for participation tracking
+    - `_submission.Rmd` - Reusable component for quiz submission
+    - `github_usernames.csv` - Student GitHub username database
+    - `data/` - Quiz-specific data files (if needed)
 
 ## Required Packages
 
@@ -49,6 +53,7 @@ Replace `your-account-name`, `YOUR-TOKEN-HERE`, and `YOUR-SECRET-HERE` with your
 The quizzes now include automatic submission to Google Forms for tracking student progress:
 
 ### Features
+
 - **GitHub username collection**: Students enter their GitHub username at the start
 - **Learnrhash generation**: Quiz responses are encoded using learnrhash
 - **Automatic submission**: Results are submitted to Google Form via POST request
@@ -61,6 +66,7 @@ To connect quizzes to your own Google Form, update the configuration in `modules
 #### 0. Google Form Structure
 
 Your Google Form should have exactly 3 questions:
+
 1. **Tutorial/Module ID** (text field)
 2. **GitHub username** (text field)
 3. **Learnrhash** (long text field for quiz results)
@@ -91,6 +97,7 @@ learnrhash_entry_id <- "entry.YOUR-LEARNRHASH-ID"      # For quiz results
 ```
 
 #### Example Current Setup
+
 - **Form URL**: https://docs.google.com/forms/d/e/1FAIpQLScnw9R8wMU5SfFqNVXGeEkiIygLTB_Dc6jWBmbwEeHuekBDzg/formResponse
 - **Entry IDs**: 
   - `entry.1169139257` - Module name (1st question)
@@ -129,6 +136,7 @@ Quizzes are automatically deployed to shinyapps.io via GitHub Actions when chang
 #### How the CI/CD Workflow Works
 
 The GitHub Action (`.github/workflows/deploy-quiz.yml`):
+s
 - **Triggers**: On pushes to `main`/`dev` branches or manual workflow dispatch
 - **Environment**: Sets up R 4.3.2 with required packages from DESCRIPTION
 - **Authentication**: Uses repository secrets to authenticate with shinyapps.io
@@ -145,44 +153,55 @@ source("build.R")
 ```
 
 The deployment system features:
-- **Automatic file bundling**: CSV files and dependencies are automatically included
+- **Direct module deployment**: Deploys directly from module directories (no temp files)
+- **Self-contained modules**: Each quiz directory contains all required files
 - **Streamlined process**: One script deploys everything configured in `config.R`
 
 ## Adding New Quizzes
 
-The system now uses automatic configuration - adding a new quiz is simple:
+The system uses a modular directory structure - adding a new quiz requires creating a complete directory:
+
+### 1. Create the Quiz Directory
 
-### 1. Create the Quiz File
+Create a new directory `modules/md-XX-quiz/` and add all required files:
 
-Create `modules/md-02-quiz.Rmd` with the standardized YAML header:
+```bash
+mkdir modules/md-03-quiz
+cp modules/md-01-quiz/_*.Rmd modules/md-01-quiz/github_usernames.csv modules/md-03-quiz/
+```
+
+### 2. Create the Quiz File
+
+Create `modules/md-XX-quiz/md-XX-quiz.Rmd` with the standardized YAML header:
 
 ```yaml
 ---
-title: "Module 2: Your Title"
+title: "Module 3: Your Title"
 output: learnr::tutorial
 runtime: shiny_prerendered
 description: "Your quiz description"
 tutorial:
-  id: "module2-your-id"
+  id: "md-03-quiz"
 ---
 ```
 
 Add your quiz content following the existing pattern, including:
 - GitHub username collection: `{r github-username, child='_github_username.Rmd'}`
 - Quiz submission: `{r submission-section, child='_submission.Rmd'}`
 
-### 2. Update Configuration
+### 3. Update Configuration
 
 Edit `config.R` to include your new quiz:
 
 ```r
 quiz_names <- c(
   "md-01-quiz",
-  "md-02-quiz"  # Add new quiz here
+  "md-02-quiz",
+  "md-03-quiz"  # Add new quiz here
 )
 ```
 
-### 3. Deploy
+### 4. Deploy
 
 Run the build script to deploy everything:
 
@@ -199,8 +218,11 @@ This will:
 ### Test Individual Quizzes
 
 ```r
-# Test a quiz locally
-rmarkdown::run("modules/md-01-quiz.Rmd")
+source("local_build.R")
+
+# Run a specific quiz interactively
+run_quiz("md-01-quiz")
+run_quiz("md-02-quiz")
 ```
 
 ### Test Landing Page

app.R

@@ -9,7 +9,7 @@ source("config.R")
 
 # Function to extract quiz metadata from Rmd files
 extract_quiz_metadata <- function(quiz_name) {
-  rmd_path <- file.path("modules", paste0(quiz_name, ".Rmd"))
+  rmd_path <- file.path("modules", quiz_name, paste0(quiz_name, ".Rmd"))
 
   if (!file.exists(rmd_path)) {
     return(NULL)
@@ -60,7 +60,7 @@ quizzes <- generate_quiz_list(quiz_names)
 
 # UI
 ui <- page_navbar(
-  title = "openwashdata Quizzes",
+  title = "ds4owd-002 quiz",
   theme = bs_theme(bootswatch = "cosmo"),
 
   nav_panel(
@@ -69,8 +69,9 @@ ui <- page_navbar(
       class = "container mt-5",
       div(
         class = "text-center mb-5",
-        h1("openwashdata Course Quizzes"),
-        p(class = "lead", "Interactive tutorials to test your knowledge")
+        h1("data science for openwashdata - quiz"),
+        p(class = "lead", "Interactive tutorials to test your knowledge."),
+        p(class = "lead text-warning fw-bold", "For successful completion of the course, you need to complete the quizzes for each module."),
       ),
 
       div(
@@ -118,15 +119,15 @@ ui <- page_navbar(
         div(
           class = "col-md-8",
           h2("About These Quizzes"),
-          p("These interactive quizzes are designed to help you learn and practice concepts from the openwashdata course."),
+          p("These interactive quizzes are designed to help you learn and practice concepts from the ds4owd course. They are required to be completed for each module of the course."),
 
           h3("Features"),
           tags$ul(
             tags$li("Interactive R code exercises"),
             tags$li("Immediate feedback on your answers"),
             tags$li("Hints and solutions available"),
             tags$li("Progress tracking within each quiz"),
-            tags$li("Automatic grading with gradethis")
+            tags$li("Automatic grading")
           ),
 
           h3("How to Use"),
@@ -136,7 +137,8 @@ ui <- page_navbar(
             tags$li("Work through the questions at your own pace"),
             tags$li("Run code in the interactive exercises"),
             tags$li("Use hints if you get stuck"),
-            tags$li("Check your solutions for immediate feedback")
+            tags$li("Check your solutions for immediate feedback"),
+            tags$li("Ensure to submit the Quiz with your GitHub username")
           ),
 
           h3("Technical Requirements"),

build.R

@@ -4,13 +4,43 @@ source("config.R")
 # HELPER
 
 deploy_quiz <- function(module_name) {
-  module_path <- paste0(file.path("modules", module_name), ".Rmd")
+  module_dir <- file.path("modules", module_name)
+  rmd_file <- file.path(module_dir, paste0(module_name, ".Rmd"))
+
+  if (!file.exists(rmd_file)) {
+    stop("Quiz file not found: ", rmd_file)
+  }
+
+  # Copy all common files to module directory
+  common_files <- list.files(
+    "modules/common",
+    full.names = TRUE,
+    recursive = TRUE
+  )
+  copied_files <- character(0)
+  for (file in common_files) {
+    if (file.info(file)$isdir == FALSE) {
+      dest_file <- file.path(module_dir, basename(file))
+      file.copy(file, dest_file, overwrite = TRUE)
+      copied_files <- c(copied_files, dest_file)
+    }
+  }
+
+  # Deploy directly from module directory
   rsconnect::deployDoc(
-    doc = module_path,
+    doc = rmd_file,
     appName = module_name,
     forceUpdate = TRUE,
     logLevel = "verbose"
   )
+  rsconnect::showLogs()
+
+  # Clean up: delete copied common files after deployment
+  for (file in copied_files) {
+    if (file.exists(file)) {
+      file.remove(file)
+    }
+  }
 }
 
 

config.R

@@ -3,17 +3,19 @@
 
 # List of quiz modules to deploy and display
 quiz_names <- c(
-  "md-01-quiz"
+  "md-01-quiz",
+  "md-02-quiz",
+  "md-03-quiz",
+  "md-04-quiz",
+  "md-05-quiz"
   # Add new quizzes here:
-  # "md-02-quiz",
-  # "md-03-quiz"
 )
 
 # Base URL for deployed quizzes
-base_url <- "https://hjj91u-nicolo-massari.shinyapps.io/"
+base_url <- "https://u4x6xe-lars-sch0bitz.shinyapps.io/"
 
 # Main app configuration
-main_app_name <- "openwashdata-quiz-hub"
+main_app_name <- "ds4owd-002-quiz"
 
 # in modules/_submission.Rmd
 #

local_build.R

@@ -0,0 +1,56 @@
+# Load configuration
+source("config.R")
+
+# HELPER FUNCTIONS
+
+run_quiz <- function(module_name) {
+  module_dir <- file.path("modules", module_name)
+  rmd_file <- file.path(module_dir, paste0(module_name, ".Rmd"))
+
+  if (!file.exists(rmd_file)) {
+    stop("Quiz file not found: ", rmd_file)
+  }
+
+  # Copy all common files to module directory
+  common_files <- list.files(
+    "modules/common",
+    full.names = TRUE,
+    recursive = TRUE
+  )
+  copied_files <- character(0)
+  for (file in common_files) {
+    if (file.info(file)$isdir == FALSE) {
+      dest_file <- file.path(module_dir, basename(file))
+      file.copy(file, dest_file, overwrite = TRUE)
+      copied_files <- c(copied_files, dest_file)
+    }
+  }
+
+  # Set working directory to module directory for running
+  current_dir <- getwd()
+  on.exit({
+    setwd(current_dir)
+    # Clean up: delete copied common files after running
+    for (file in copied_files) {
+      if (file.exists(file)) {
+        file.remove(file)
+      }
+    }
+  })
+  setwd(module_dir)
+
+  # Run the quiz interactively
+  cat("Running", module_name, "interactively...\n")
+  rmarkdown::run(paste0(module_name, ".Rmd"))
+}
+
+# QUIZ RUNNING
+
+cat("Available quizzes to run:\n")
+for (i in seq_along(quiz_names)) {
+  cat(i, ":", quiz_names[i], "\n")
+}
+
+cat("\nTo run a specific quiz, use:\n")
+cat("run_quiz('quiz-name')\n")
+cat("\nExample: run_quiz('md-01-quiz')\n")