From 240111b5d876e9ecfdbd571f5fd6f5b096fd40f6 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 09:22:51 +0000 Subject: [PATCH 01/74] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/mirrors-prettier: v3.0.1 → v3.0.2](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.1...v3.0.2) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 61b064e..a73ef41 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: hooks: - id: black - repo: https://github.com/pre-commit/mirrors-prettier - rev: 'v3.0.1' # Use the sha / tag you want to point at + rev: 'v3.0.2' # Use the sha / tag you want to point at hooks: - id: prettier files: "^frontend/" From e819adcb4c46f32fd20b0e9f8cd621f5baa98797 Mon Sep 17 00:00:00 2001 From: Mawoka Date: Wed, 23 Aug 2023 18:13:25 +0200 Subject: [PATCH 02/74] :sparkles: Closes #273 --- classquiz/config.py | 1 + classquiz/routers/users/__init__.py | 2 + frontend/src/env.d.ts | 14 ++ frontend/src/lib/navbar.svelte | 240 ++++++++++++++-------------- 4 files changed, 138 insertions(+), 119 deletions(-) create mode 100644 frontend/src/env.d.ts diff --git a/classquiz/config.py b/classquiz/config.py index 2b44b65..2065e10 100644 --- a/classquiz/config.py +++ b/classquiz/config.py @@ -54,6 +54,7 @@ class Settings(BaseSettings): free_storage_limit: int = 1074000000 pixabay_api_key: str | None = None mods: list[str] = [] + registration_disabled: bool = False # storage_backend storage_backend: str | None = "local" diff --git a/classquiz/routers/users/__init__.py b/classquiz/routers/users/__init__.py index 6fc6344..7821620 100644 --- a/classquiz/routers/users/__init__.py +++ b/classquiz/routers/users/__init__.py @@ -65,6 +65,8 @@ router.include_router(oauth.router, tags=["users", "oauth"], prefix="/oauth") response_model_include={"id": ..., "verified": ..., "email": ...}, ) async def create_user(user: RouteUser, background_task: BackgroundTasks) -> User | JSONResponse: + if settings.registration_disabled: + raise HTTPException(status_code=423) user = User(**user.dict(), id=uuid.uuid4(), avatar=gzipped_user_avatar(), created_at=datetime.now()) try: validate_email(user.email) diff --git a/frontend/src/env.d.ts b/frontend/src/env.d.ts new file mode 100644 index 0000000..9aae2b3 --- /dev/null +++ b/frontend/src/env.d.ts @@ -0,0 +1,14 @@ +// SPDX-FileCopyrightText: 2023 Marlon W (Mawoka) +// +// SPDX-License-Identifier: MPL-2.0 + +/// + +interface ImportMetaEnv { + readonly VITE_APP_TITLE: string; + // more env variables... +} + +interface ImportMeta { + readonly env: ImportMetaEnv; +} diff --git a/frontend/src/lib/navbar.svelte b/frontend/src/lib/navbar.svelte index 0543b28..1c3b7cf 100644 --- a/frontend/src/lib/navbar.svelte +++ b/frontend/src/lib/navbar.svelte @@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2023 Marlon W (Mawoka) SPDX-License-Identifier: MPL-2.0 --> - From 743782fb424d896e86a5c6a12ae29f6cb81259a2 Mon Sep 17 00:00:00 2001 From: Mawoka Date: Wed, 23 Aug 2023 18:17:20 +0200 Subject: [PATCH 03/74] Fixed formatting --- frontend/Dockerfile | 1 + frontend/src/lib/navbar.svelte | 232 ++++++++++++++++----------------- 2 files changed, 117 insertions(+), 116 deletions(-) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 6b372f1..f1f6eef 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -16,6 +16,7 @@ ENV VITE_HCAPTCHA=ee81b2a1-acf3-4d20-b2a4-a7ea94c7eba5 ENV VITE_GOOGLE_AUTH_ENABLED=true ENV VITE_GITHUB_AUTH_ENABLED=true ENV VITE_CAPTCHA_ENABLED=true +ENV VITE_REGISTRATION_DISABLED=True #ENV VITE_PLAUSIBLE_DATA_URL= # change working directory WORKDIR /usr/src/app diff --git a/frontend/src/lib/navbar.svelte b/frontend/src/lib/navbar.svelte index 1c3b7cf..f3d3f81 100644 --- a/frontend/src/lib/navbar.svelte +++ b/frontend/src/lib/navbar.svelte @@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2023 Marlon W (Mawoka) SPDX-License-Identifier: MPL-2.0 --> - From 622721927b3649d7352b0b02223b16dc3c140cf8 Mon Sep 17 00:00:00 2001 From: Mawoka Date: Wed, 30 Aug 2023 18:23:28 +0200 Subject: [PATCH 04/74] :sparkles: Resolves #250 --- .../popover/commandpalettenotice.svelte | 27 ++++++++++ .../lib/components/popover/smalltop.svelte | 52 +++++++++++-------- .../src/lib/components/popover/smalltop.ts | 3 +- frontend/src/lib/i18n/locales/de.json | 3 +- frontend/src/lib/i18n/locales/en.json | 3 +- frontend/src/routes/dashboard/+page.svelte | 2 + 6 files changed, 65 insertions(+), 25 deletions(-) create mode 100644 frontend/src/lib/components/popover/commandpalettenotice.svelte diff --git a/frontend/src/lib/components/popover/commandpalettenotice.svelte b/frontend/src/lib/components/popover/commandpalettenotice.svelte new file mode 100644 index 0000000..d0b6b3d --- /dev/null +++ b/frontend/src/lib/components/popover/commandpalettenotice.svelte @@ -0,0 +1,27 @@ + + + + + diff --git a/frontend/src/lib/components/popover/smalltop.svelte b/frontend/src/lib/components/popover/smalltop.svelte index 32979b5..0f96737 100644 --- a/frontend/src/lib/components/popover/smalltop.svelte +++ b/frontend/src/lib/components/popover/smalltop.svelte @@ -4,56 +4,64 @@ SPDX-FileCopyrightText: 2023 Marlon W (Mawoka) SPDX-License-Identifier: MPL-2.0 --> - {#if open} -
+