🔀 Merged slides into master

This commit is contained in:
Mawoka
2022-12-26 11:13:04 +01:00
6 changed files with 81 additions and 19 deletions
-6
View File
@@ -11,8 +11,6 @@
import SettingsCard from '$lib/editor/settings-card.svelte';
import QuizCard from '$lib/editor/card.svelte';
import Spinner from './Spinner.svelte';
import { elementSelection } from '$lib/stores.js';
import ElementSelection from '$lib/editor/slides/element_selection.svelte';
let schemaInvalid = false;
let yupErrorMessage = '';
@@ -191,7 +189,3 @@
</div>
</form>
{/await}
{#if $elementSelection.data === null}
<ElementSelection />
{/if}
+4 -10
View File
@@ -12,7 +12,7 @@
import Spinner from '../Spinner.svelte';
import { createTippy } from 'svelte-tippy';
import { getLocalization } from '$lib/i18n';
// import Slide from './slide.svelte';
import Slide from './slide.svelte';
const { t } = getLocalization();
@@ -50,8 +50,6 @@
data.questions[selected_question].type = QuizQuestionType.ABCD;
}
*/
$: console.log();
</script>
<div class="w-full max-h-full pb-20 px-20 h-full">
@@ -69,13 +67,7 @@
/>
</div>
</div>
{#if data.questions[selected_question].type === QuizQuestionType.SLIDE}
{#await import('./slide.svelte')}
<Spinner my_20={false} />
{:then c}
<svelte:component this={c.default} bind:data={data.questions[selected_question]} />
{/await}
{:else}
{#if data.questions[selected_question].time}
<div class="flex flex-col">
<div class="flex justify-center pt-10 w-full">
{#await import('$lib/inline-editor.svelte')}
@@ -187,6 +179,8 @@
{$t('editor_page.right_click_to_delete')}
</p>
</div>
{:else}
<Slide bind:data={data.questions[selected_question]} />
{/if}
</div>
</div>
+1 -1
View File
@@ -62,7 +62,7 @@ export interface EditorData {
public: boolean;
title: string;
description: string;
questions: (Question | object)[];
questions: Question[];
cover_image?: string;
background_color?: string;
}
-1
View File
@@ -11,7 +11,6 @@ export const signedIn = writable(false);
export const pathname = writable('/');
export const alertModal = writable({ open: false, title: '', body: '' });
export const elementSelection = writable({ data: undefined });
import { goto } from '$app/navigation';
import { page } from '$app/stores';