ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Compare commits

base: ramon:master
Branches Tags
ramon:develop
ramon:feature/django-redis-cache
ramon:master
ramon:v2024-05-17
..
compare: ramon:v2024-05-17
Branches Tags
ramon:feature/django-redis-cache
ramon:develop
ramon:master
ramon:v2024-05-17

No commits in common. "master" and "v2024-05-17" have entirely different histories.
master ... v2024-05-1

3 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

1
client/cypress/e2e/frontend/instruments/module-page.spec.js
View File

@ -38,7 +38,6 @@ describe('Instruments on Module page', () => {
value: { value: {
description: description:
'<p>Ein Interview dient dazu, durch Befragung Informationen zu ermitteln. Bei journalistischen Interviews werden oft Expertinnen und Experten befragt, aber auch Personen.</p>', '<p>Ein Interview dient dazu, durch Befragung Informationen zu ermitteln. Bei journalistischen Interviews werden oft Expertinnen und Experten befragt, aber auch Personen.</p>',
slug: 'interview',
}, },
}, },
], ],

5
client/src/components/ContentBlock.vue
View File

@ -100,7 +100,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { inject, onMounted, ref, computed, onUnmounted } from 'vue'; import { defineAsyncComponent, inject, onMounted, ref, computed, onUnmounted } from 'vue';
import { useMutation } from '@vue/apollo-composable'; import { useMutation } from '@vue/apollo-composable';
import AddContentButton from '@/components/AddContentButton.vue'; import AddContentButton from '@/components/AddContentButton.vue';
@ -109,7 +109,6 @@ import UserWidget from '@/components/UserWidget.vue';
import VisibilityAction from '@/components/visibility/VisibilityAction.vue'; import VisibilityAction from '@/components/visibility/VisibilityAction.vue';
import PopoverLink from '@/components/ui/PopoverLink.vue'; import PopoverLink from '@/components/ui/PopoverLink.vue';
import CopyLink from '@/components/CopyLink.vue'; import CopyLink from '@/components/CopyLink.vue';
import ContentComponent from '@/components/content-blocks/ContentComponent.vue';
import { useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import { hidden } from '@/helpers/visibility'; import { hidden } from '@/helpers/visibility';
import { insertAtIndex, removeAtIndex } from '@/graphql/immutable-operations'; import { insertAtIndex, removeAtIndex } from '@/graphql/immutable-operations';
@ -145,6 +144,8 @@ export interface Props {
editMode?: boolean; editMode?: boolean;
} }
const ContentComponent = defineAsyncComponent(() => import('@/components/content-blocks/ContentComponent.vue'));
const { me, schoolClass } = getMe(); const { me, schoolClass } = getMe();
const contentBlockDiv = ref<HTMLElement | null>(null); const contentBlockDiv = ref<HTMLElement | null>(null);

6
client/src/components/content-blocks/assignment/SubmissionForm.vue
View File

@ -58,9 +58,9 @@ export interface Props {
saved: boolean; saved: boolean;
placeholder: string; placeholder: string;
action: string; action: string;
readOnly?: boolean; readOnly: boolean;
spellcheck?: boolean; spellcheck: boolean;
spellcheckLoading?: boolean; spellcheckLoading: boolean;
sharedMsg: string; sharedMsg: string;
} }