Skip to content

Commit

Permalink
Merge branch 'v3' into resizable-activity-evaluation
Browse files Browse the repository at this point in the history
  • Loading branch information
sjschlapbach authored Nov 6, 2024
2 parents 7f24499 + 6f80d78 commit 09c947b
Show file tree
Hide file tree
Showing 92 changed files with 22 additions and 10,034 deletions.
14 changes: 0 additions & 14 deletions .github/workflows/check-types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
50 changes: 0 additions & 50 deletions .github/workflows/v3_klickeruzhprod-migration-export.yml

This file was deleted.

52 changes: 0 additions & 52 deletions .github/workflows/v3_klickeruzhprod-migration-import.yml

This file was deleted.

2 changes: 0 additions & 2 deletions .versionrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/',
Expand Down
2 changes: 0 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

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)


Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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 session 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.

Expand Down
3 changes: 0 additions & 3 deletions _run_migration_services.sh

This file was deleted.

2 changes: 1 addition & 1 deletion apps/auth/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@klicker-uzh/auth",
"version": "3.3.0-alpha.6",
"version": "3.3.0-alpha.7",
"license": "AGPL-3.0",
"dependencies": {
"@klicker-uzh/i18n": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion apps/backend-docker/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@klicker-uzh/backend-docker",
"version": "3.3.0-alpha.6",
"version": "3.3.0-alpha.7",
"license": "AGPL-3.0",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
14 changes: 0 additions & 14 deletions apps/docs/docs/getting_started/migration.mdx

This file was deleted.

2 changes: 1 addition & 1 deletion apps/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@klicker-uzh/docs",
"version": "3.3.0-alpha.6",
"version": "3.3.0-alpha.7",
"license": "AGPL-3.0",
"devDependencies": {
"@docusaurus/core": "~3.5.2",
Expand Down
1 change: 0 additions & 1 deletion apps/docs/sidebars.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module.exports = {
'Getting Started': [
'getting_started/welcome',
'getting_started/core_concepts',
'getting_started/migration',
],
'Lecturer Application': [
'tutorials/supported_element_types',
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend-control/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@klicker-uzh/frontend-control",
"version": "3.3.0-alpha.6",
"version": "3.3.0-alpha.7",
"license": "AGPL-3.0",
"dependencies": {
"@apollo/client": "3.11.8",
Expand Down
2 changes: 1 addition & 1 deletion apps/frontend-manage/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@klicker-uzh/frontend-manage",
"version": "3.3.0-alpha.6",
"version": "3.3.0-alpha.7",
"license": "AGPL-3.0",
"dependencies": {
"@apollo/client": "3.11.8",
Expand Down
12 changes: 0 additions & 12 deletions apps/frontend-manage/src/components/common/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,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={
Expand Down
Loading

0 comments on commit 09c947b

Please sign in to comment.