Placeholder
+{:then data} + {#if type === 'img'} +Unknown media type
+ {/if} +{/await} diff --git a/frontend/src/lib/editor/card.svelte b/frontend/src/lib/editor/card.svelte index 5540a81..d4c6b4d 100644 --- a/frontend/src/lib/editor/card.svelte +++ b/frontend/src/lib/editor/card.svelte @@ -10,22 +10,21 @@ import { reach } from 'yup'; import { dataSchema } from '$lib/yupSchemas'; import Spinner from '../Spinner.svelte'; - import { createTippy } from 'svelte-tippy'; + // import { createTippy } from 'svelte-tippy'; import { getLocalization } from '$lib/i18n'; + // import MediaComponent from "$lib/editor/MediaComponent.svelte"; const { t } = getLocalization(); - const tippy = createTippy({ - arrow: true, - animation: 'perspective-subtle', - placement: 'top' - }); + /* const tippy = createTippy({ + arrow: true, + animation: 'perspective-subtle', + placement: 'top' + });*/ export let data: EditorData; export let selected_question: number; export let edit_id: string; - export let pow_data; - export let pow_salt: string; let uppyOpen = false; let unique = {}; @@ -51,6 +50,17 @@ selected_question; set_unique(); } + let image_url = ''; + + const update_image_url = () => { + image_url = data.questions[selected_question].image; + console.log('updated!'); + }; + $: { + update_image_url(); + selected_question; + data.questions; + } /* if (typeof data.questions[selected_question].type !== QuizQuestionType) { console.log(data.questions[selected_question].type !== QuizQuestionType.ABCD || data.questions[selected_question].type !== QuizQuestionType.RANGE) @@ -60,7 +70,7 @@+ {$t('uploader.upload_video_popup_notice')} +
+ {:else} +{image.filename ?? 'No name available'}
+caddy runarq classquiz.worker.WorkerSettingsIf you're done developing: ./run_tests.sh -
If you want to run all the tests: ./run_tests.sh a
You'll have to set up a storage provider for some pictures (these getting imported from
- KAHOOT!). For now, you can use Deta or the local filesystem.
- Please note that I would NOT use the local file system because of
- Path Traversals. I tried to
- prevent these attacks, but I really wouldn't trust it, because it's a regex! You'll have to
- set the
- STORAGE_BACKEND-environment-variable to either deta or
- local.
+ Kahoot!). For now, you can use Minio (S3) or
+ the local filesystem. Please not that I'd recommend Minio for larger instances, since it can
+ be scaled and the media doesn't have to streamed through the (comparatively) slow ClassQuiz
+ server. Now, that you've decided on a storage backend, you can set the
+ STORAGE_BACKEND-environment-variable to either s3 or
+ local. If you ask yourself what happened with deta, I've decided to remove it,
+ since the went all-in with their spaces and I think that hardly anyone used it anyway.
- ...you'll also have to set the DETA_PROJECT_KEY and the
- DETA_PROJECT_ID.
+ ...you'll also have to set the S3_ACCESS_KEY, S3_SECRET_KEY and
+ the
+ S3_BASE_URL. The S3_BUCKET_NAME can also be set, but defaults to
+ classquiz.
@@ -165,15 +167,15 @@ services: REDIS_URL: redis://redis:6379/0?decode_responses=True # don't change API_URL: http://api:80 # don't change api: - build: + build: &build_cfg context: . dockerfile: Dockerfile - restart: always - depends_on: + restart: &restart always + depends_on: &depends - db - redis - environment: + environment: &env_vars ROOT_ADDRESS: "https://classquiz.de" # Base-URL (change it) DB_URL: "postgresql://postgres:classquiz@db:5432/classquiz" # don't change MAIL_ADDRESS: "classquiz@mawoka.eu" # Email-Address (change it) @@ -188,11 +190,13 @@ services: MEILISEARCH_URL: "http://meilisearch:7700" # don't change ACCESS_TOKEN_EXPIRE_MINUTES: 30 # don't change HCAPTCHA_KEY: "" # Private hCaptcha key for verification (change it) - STORAGE_BACKEND: "deta" # MUST BE EITHER "deta" OR "local" + STORAGE_BACKEND: "local" # MUST BE EITHER "s3" OR "local" + FREE_STORAGE_LIMIT: "1074000000" # Free storage limit in bytes (default: 1GB) - # If STORAGE_BACKEND is "deta" - DETA_PROJECT_KEY: "YOUR_DETA_PROJECT_KEY" - DETA_PROJECT_ID: "YOUR_DETA_PROJECT_ID" + # If STORAGE_BACKEND is "s3" + S3_ACCESS_KEY=YOUR_ACCESS_KEY + S3_SECRET_KEY=YOUR_SECRET_KEY + S3_BASE_URL=YOUR_S3_BASE_URL # If STORAGE_BACKEND is "local" STORAGE_PATH: "/var/storage" @@ -205,6 +209,8 @@ services: GITHUB_CLIENT_ID: # Your GitHub-Client ID, or leave it unset if you don't want it. GITHUB_CLIENT_SECRET: # Your GitHub-Client Secret, or leave it unset if you don't want it. + volumes: # Only needed if you chose the "local" storage-backend + - ./uploads:/var/storage redis: image: redis:alpine @@ -241,6 +247,14 @@ services: MEILI_NO_ANALYTICS: true volumes: - meilisearch-data:/data.ms + worker: + build: *build_cfg + environment: *env_vars + restart: *restart + depends_on: *depends + command: arq classquiz.worker.WorkerSettings + + volumes: data: meilisearch-data: diff --git a/frontend/src/routes/edit/files/+page.svelte b/frontend/src/routes/edit/files/+page.svelte new file mode 100644 index 0000000..8aa7ea2 --- /dev/null +++ b/frontend/src/routes/edit/files/+page.svelte @@ -0,0 +1,157 @@ + + + + +
+ {$t('file_dashboard.size', { + size: (image.size / (1024 * 1024)).toFixed(2) + })} +
++ {$t('file_dashboard.caption', { + caption: image.alt_text ?? $t('file_dashboard.missing') + })} +
++ {$t('file_dashboard.filename', { + filename: image.filename ?? $t('file_dashboard.missing') + })} +
++ {$t('file_dashboard.uploaded', { + date: new Date(image.uploaded_at).toLocaleString() + })} +
++ {$t('file_dashboard.imported', { + yes_or_no: image.imported ? $t('words.yes') : $t('words.no') + })} +
+| {$t('words.speed')} | +{$t('words.progress')} | +{$t('video_uploader.time_elapsed')} | +{$t('video_uploader.time_remaining')} | +
|---|---|---|---|
| {stats.speed} | +{Math.round(stats.progress * 100)}% | +{upload_stats.time_elapsed.toFixed(2)}s | +{(stats.time_elapsed / stats.progress - upload_stats.time_elapsed).toFixed( + 2 + )}s | +
| {$t('words.progress')} | +{$t('video_uploader.time_elapsed')} | +{$t('video_uploader.time_remaining')} | +
|---|---|---|
| {Math.round(upload_stats.progress * 100)}% | +{stats.time_elapsed.toFixed(2)}s | +{(stats.time_elapsed / stats.progress - stats.time_elapsed).toFixed(2)}s | +