Merge branch 'v3' of https://github.com/uzh-bf/klicker-uzh into v3-ne…

…w-live-quiz

.github/workflows/check-types.yml

@@ -83,20 +83,6 @@ jobs:
         run: |
           pnpm run check
 
-      - name: Check v2 export function typescript types
-        if: always()
-        shell: bash
-        working-directory: apps/func-migration-v2-export
-        run: |
-          pnpm run check
-
-      - name: Check v3 import function typescript types
-        if: always()
-        shell: bash
-        working-directory: apps/func-migration-v3-import
-        run: |
-          pnpm run check
-
       - name: Check backend-docker typescript types
         if: always()
         shell: bash

.versionrc.js

@@ -12,8 +12,6 @@ module.exports = {
     'apps/backend-docker/',
     'apps/func-incoming-responses/',
     'apps/func-response-processor/',
-    'apps/func-migration-v2-export/',
-    'apps/func-migration-v3-import/',
     'apps/frontend-manage/',
     'apps/frontend-pwa/',
     'apps/frontend-control/',

.vscode/settings.json

@@ -1,12 +1,10 @@
 {
-  "azureFunctions.deploySubpath": "apps/func-migration-v2-export",
   "azureFunctions.postDeployTask": "npm install (serverless)",
   "azureFunctions.projectLanguage": "TypeScript",
   "azureFunctions.projectLanguageModel": 4,
   "azureFunctions.projectRuntime": "~4",
   "debug.internalConsoleOptions": "neverOpen",
   "azureFunctions.preDeployTask": "npm prune (serverless)",
-  "azureFunctions.projectSubpath": "apps/func-migration-v2-export",
   "githubPullRequests.ignoredPullRequestBranches": ["v3"],
   "editor.formatOnSave": true,
   "sonarlint.connectedMode.project": {

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [3.3.0-alpha.7](https://github.com/uzh-bf/klicker-uzh/compare/v3.3.0-alpha.6...v3.3.0-alpha.7) (2024-11-05)
+
+
+### Enhancements
+
+* **apps/frontend-manage:** display QR code on evaluation page for live quizzes ([#4356](https://github.com/uzh-bf/klicker-uzh/issues/4356)) ([7a734d1](https://github.com/uzh-bf/klicker-uzh/commit/7a734d11aae77ae306c951388b8a22360a1162b9))
+
+## [3.3.0-alpha.6](https://github.com/uzh-bf/klicker-uzh/compare/v3.3.0-alpha.5...v3.3.0-alpha.6) (2024-11-03)
+
+
+### Bug Fixes
+
+* **packages/graphql:** ensure that repetition interval remains below maximum value ([#4348](https://github.com/uzh-bf/klicker-uzh/issues/4348)) ([30f4953](https://github.com/uzh-bf/klicker-uzh/commit/30f495306567711e237b7a3ddc950473aa82343e))
+
+## [3.3.0-alpha.5](https://github.com/uzh-bf/klicker-uzh/compare/v3.3.0-alpha.4...v3.3.0-alpha.5) (2024-10-31)
+
+
+### Bug Fixes
+
+* ensure that re-ordered answer options on choices questions are displayed consistently ([#4339](https://github.com/uzh-bf/klicker-uzh/issues/4339)) ([e139988](https://github.com/uzh-bf/klicker-uzh/commit/e1399888081f3389f7d0437be1c2e7b2041b3243))
+* make sure that participants on group leaderboard are always in correct order ([7fb55ed](https://github.com/uzh-bf/klicker-uzh/commit/7fb55ed2031d26e6c8855f468b60fa9315f6960f))
+
 ## [3.3.0-alpha.4](https://github.com/uzh-bf/klicker-uzh/compare/v3.3.0-alpha.3...v3.3.0-alpha.4) (2024-10-24)
 
 

README.md

@@ -2,7 +2,7 @@
 
 > Please note that this is the repository branch for KlickerUZH v3.0 released in August 2023. If you would like to have more information on the new concept of v3.0, have a look at our [public discussion](https://community.klicker.uzh.ch/t/klickeruzh-v3-0-concept-and-request-for-feedback/79).
 >
-> Please navigate to the [dev branch](https://github.com/uzh-bf/klicker-uzh/tree/dev) for the older [KlickerUZH v2.0](https://app.klicker.uzh.ch/), which will be available until the end of 2023. To migrate to KlickerUZH v3.0, start the [migration process](https://manage.klicker.uzh.ch/migration).
+> Please navigate to the [dev branch](https://github.com/uzh-bf/klicker-uzh/tree/dev) for the older [KlickerUZH v2.0](https://app.klicker.uzh.ch/), which is not publically available anymore.
 
 `klicker-uzh` is the code repository of the [KlickerUZH](https://www.klicker.uzh.ch/) open-source audience interaction platform. KlickerUZH is developed by the Teaching Center of the Department of Finance at the University of Zurich, Switzerland.
 
@@ -17,7 +17,6 @@ KlickerUZH v3.0 uses multiple different web applications and services, which com
 - [Backend Docker](https://github.com/uzh-bf/klicker-uzh/tree/v3/apps/backend-docker) is the main backend service of KlickerUZH.
 - [Backend Responses](https://github.com/uzh-bf/klicker-uzh/tree/v3/apps/func-incoming-responses) is a service that handles incoming student responses during a live quizzes and puts them into an Azure queue for improved load handling.
 - [Backend Response Processor](https://github.com/uzh-bf/klicker-uzh/tree/v3/apps/func-response-processor) accesses queued elements from the aforementioned service and processes them by computing scores and experience points, updating the cache, etc.
-- The [v2.0 Export](https://github.com/uzh-bf/klicker-uzh/tree/v3/apps/func-migration-v2-export) and [v3.0 Import](https://github.com/uzh-bf/klicker-uzh/tree/v3/apps/func-migration-v3-import) folders contain serverless Azure Functions related to the migration from KlickerUZH v2.0 to v3.0.
 
 In addition to the key application components, this repository also includes the codebases for our landing page and documentation at [www.klicker.uzh.ch](https://www.klicker.uzh.ch/), as well as deployment scripts for Helm/Kubernetes. An updated deployment documentation for self-hosting KlickerUZH v3.0 will be added until the end of the year.
 

apps/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@klicker-uzh/auth",
-  "version": "3.3.0-alpha.4",
+  "version": "3.3.0-alpha.7",
   "license": "AGPL-3.0",
   "dependencies": {
     "@klicker-uzh/i18n": "workspace:*",

apps/backend-docker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@klicker-uzh/backend-docker",
-  "version": "3.3.0-alpha.4",
+  "version": "3.3.0-alpha.7",
   "license": "AGPL-3.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

apps/docs/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@klicker-uzh/docs",
-  "version": "3.3.0-alpha.4",
+  "version": "3.3.0-alpha.7",
   "license": "AGPL-3.0",
   "devDependencies": {
     "@docusaurus/core": "~3.5.2",

apps/docs/sidebars.js

@@ -3,7 +3,6 @@ module.exports = {
     'Getting Started': [
       'getting_started/welcome',
       'getting_started/core_concepts',
-      'getting_started/migration',
     ],
     'Lecturer Application': [
       'tutorials/supported_element_types',

apps/frontend-control/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@klicker-uzh/frontend-control",
-  "version": "3.3.0-alpha.4",
+  "version": "3.3.0-alpha.7",
   "license": "AGPL-3.0",
   "dependencies": {
     "@apollo/client": "3.11.8",

apps/frontend-manage/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "@klicker-uzh/frontend-manage",
-  "version": "3.3.0-alpha.4",
+  "version": "3.3.0-alpha.7",
   "license": "AGPL-3.0",
   "dependencies": {
     "@apollo/client": "3.11.8",
@@ -19,6 +19,8 @@
     "@klicker-uzh/prisma": "workspace:*",
     "@klicker-uzh/shared-components": "workspace:*",
     "@socialgouv/matomo-next": "1.9.1",
+    "@tanstack/react-table": "8.20.5",
+    "@uidotdev/usehooks": "2.4.1",
     "@uzh-bf/design-system": "3.0.0-alpha.32",
     "dayjs": "1.11.13",
     "deepmerge": "4.3.1",
@@ -30,6 +32,7 @@
     "is-hotkey": "0.2.0",
     "js-search": "2.0.1",
     "lodash": "4.17.21",
+    "nanoid": "5.0.8",
     "next": "15.0.0",
     "next-intl": "3.21.1",
     "react": "18.3.1",

apps/frontend-manage/src/components/common/Header.tsx

@@ -75,18 +75,6 @@ function Header({ user }: HeaderProps): React.ReactElement {
         ))}
       </Navigation>
       <Navigation className={{ root: 'bg-slate-800 !p-0' }}>
-        <Navigation.ButtonItem
-          onClick={() => router.push('/migration')}
-          label={t('manage.general.migration')}
-          className={{
-            label: twMerge(
-              'bg-gradient-to-r from-white to-white bg-[length:0%_2px] bg-left-bottom bg-no-repeat text-base font-bold transition-all duration-500 ease-out group-hover:bg-[length:100%_2px]',
-              router.pathname === '/migration' &&
-                'text-red underline decoration-2 underline-offset-[0.3rem]'
-            ),
-            root: 'group text-white transition-all duration-300 ease-in-out hover:bg-inherit',
-          }}
-        />
         <div className="hidden md:block">
           <Navigation.TriggerItem
             icon={

apps/frontend-manage/src/components/evaluation/ActivityEvaluation.tsx

@@ -63,7 +63,7 @@ function ActivityEvaluation({
   // update the chart type as soon as the active instance changes
   useChartTypeUpdate({
     activeInstance,
-    activeElementType: instanceResults[activeInstance].type,
+    activeElementType: instanceResults[activeInstance]?.type,
     chartType,
     setChartType,
   })
@@ -110,6 +110,7 @@ function ActivityEvaluation({
                 ? showSolution
                 : false
             }
+            type={type}
           />
         )}