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

Fix some merge issues

This commit is contained in:
Ramon Wenger 2023-02-07 17:50:02 +01:00
parent 973fef379d
commit 6ecf33d12b
11 changed files with 310 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/components/UserWidget.vue
View File

@ -28,7 +28,6 @@ export default {
emits: ['click'], emits: ['click'],
emits: ['click'],
components: { components: {
Avatar, Avatar,
}, },

4
client/src/components/book-navigation/TopicNavigation.vue
View File

@ -20,13 +20,12 @@
import ALL_TOPICS_QUERY from '@/graphql/gql/queries/allTopicsQuery.gql'; import ALL_TOPICS_QUERY from '@/graphql/gql/queries/allTopicsQuery.gql';
import sidebarMixin from '@/mixins/sidebar'; import sidebarMixin from '@/mixins/sidebar';
export default { export default {
props: { props: {
mobile: { mobile: {
default: false, default: false,
}, },
}, },
},
mixins: [sidebarMixin], mixins: [sidebarMixin],
@ -41,7 +40,6 @@ import sidebarMixin from '@/mixins/sidebar';
return atob(id); return atob(id);
}, },
}, },
},
apollo: { apollo: {
topics: { topics: {

27
client/src/components/content-block-form/EditContentBlockWizard.vue
View File

@ -10,14 +10,14 @@
<script> <script>
import ContentsForm from '@/components/content-block-form/ContentsForm'; import ContentsForm from '@/components/content-block-form/ContentsForm';
import {store} from '@/store'; import { store } from '@/store';
import EDIT_CONTENT_BLOCK_MUTATION from 'gql/mutations/editContentBlock.gql'; import EDIT_CONTENT_BLOCK_MUTATION from 'gql/mutations/editContentBlock.gql';
import MODULE_DETAILS_QUERY from '@/graphql/gql/queries/modules/moduleDetailsQuery.gql'; import MODULE_DETAILS_QUERY from '@/graphql/gql/queries/modules/moduleDetailsQuery.gql';
import CONTENT_BLOCK_QUERY from '@/graphql/gql/queries/contentBlockQuery.gql'; import CONTENT_BLOCK_QUERY from '@/graphql/gql/queries/contentBlockQuery.gql';
import {setUserBlockType} from '@/helpers/content-block'; import { setUserBlockType } from '@/helpers/content-block';
export default { export default {
components: { components: {
ContentsForm, ContentsForm,
}, },
@ -45,24 +45,26 @@ import ContentsForm from '@/components/content-block-form/ContentsForm';
input: { input: {
contentBlock: { contentBlock: {
title: contentBlock.title, title: contentBlock.title,
contents: contentBlock.contents.filter(value => Object.keys(value).length > 0), contents: contentBlock.contents.filter((value) => Object.keys(value).length > 0),
type: setUserBlockType(contentBlock.isAssignment), type: setUserBlockType(contentBlock.isAssignment),
}, },
id: contentBlock.id, id: contentBlock.id,
}, },
}, },
refetchQueries: [{ refetchQueries: [
{
query: MODULE_DETAILS_QUERY, query: MODULE_DETAILS_QUERY,
variables: { variables: {
slug: this.$route.params.slug, slug: this.$route.params.slug,
}, },
}], },
}).then(() => { ],
})
.then(() => {
this.hideModal(); this.hideModal();
}); });
}, },
}, },
},
apollo: { apollo: {
contentBlock() { contentBlock() {
@ -74,6 +76,5 @@ import ContentsForm from '@/components/content-block-form/ContentsForm';
}; };
}, },
}, },
};
};
</script> </script>

3
client/src/components/instruments/FilterGroup.vue
View File

@ -80,7 +80,8 @@ export default defineComponent({
}, },
}); });
}, },
}); },
});
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

5
client/src/components/modules/ModuleTeaser.vue
View File

@ -31,13 +31,12 @@ export default {
return { return {
name: 'module', name: 'module',
params: { params: {
slug: this.slug slug: this.slug,
} },
}; };
} else { } else {
return {}; return {};
} }
}
}, },
}, },
}; };

4
client/src/components/portfolio/ProjectListItem.vue
View File

@ -16,8 +16,8 @@
class="project__owner" class="project__owner"
/> />
<entry-count-widgetclass <entry-count-widget
="project__entry-count" class="project__entry-count"
:verbose="false" :verbose="false"
:entry-count="project.entriesCount" :entry-count="project.entriesCount"
/> />

15
client/src/components/school-class/ClassSelectionWidget.vue
View File

@ -56,12 +56,14 @@
import WidgetPopover from '@/components/ui/WidgetPopover'; import WidgetPopover from '@/components/ui/WidgetPopover';
import CurrentClass from '@/components/school-class/CurrentClass'; import CurrentClass from '@/components/school-class/CurrentClass';
import updateSelectedClassMixin from '@/mixins/update-selected-class'; import updateSelectedClassMixin from '@/mixins/update-selected-class';
import sidebarMixin from '@/mixins/sidebar'; import sidebarMixin from '@/mixins/sidebar';
import meMixin from '@/mixins/me'; import meMixin from '@/mixins/me';
import {defineAsyncComponent} from 'vue'; import { defineAsyncComponent } from 'vue';
const ChevronDown = defineAsyncComponent(() => import(/* webpackChunkName: "icons" */'@/components/icons/ChevronDown')); const ChevronDown = defineAsyncComponent(() =>
const AddIcon = defineAsyncComponent(() => import(/* webpackChunkName: "icons" */'@/components/icons/AddIcon')); import(/* webpackChunkName: "icons" */ '@/components/icons/ChevronDown')
);
const AddIcon = defineAsyncComponent(() => import(/* webpackChunkName: "icons" */ '@/components/icons/AddIcon'));
export default { export default {
props: { props: {
@ -102,7 +104,6 @@ export default {
this.updateSelectedClass(selectedClass); this.updateSelectedClass(selectedClass);
this.showPopover = false; this.showPopover = false;
this.closeSidebar('profile'); this.closeSidebar('profile');
}
}, },
}, },
}; };

9
client/src/pages/createContentBlock.vue
View File

@ -8,7 +8,7 @@
</template> </template>
<script> <script>
import {defineComponent} from 'vue'; import { defineComponent } from 'vue';
import ContentBlockForm from '@/components/content-block-form/ContentBlockForm'; import ContentBlockForm from '@/components/content-block-form/ContentBlockForm';
import { setUserBlockType } from '@/helpers/content-block'; import { setUserBlockType } from '@/helpers/content-block';
@ -16,16 +16,15 @@ import NEW_CONTENT_BLOCK_MUTATION from '@/graphql/gql/mutations/addContentBlock.
import MODULE_DETAILS_QUERY from '@/graphql/gql/queries/modules/moduleDetailsQuery.gql'; import MODULE_DETAILS_QUERY from '@/graphql/gql/queries/modules/moduleDetailsQuery.gql';
import { cleanUpContents } from '@/components/content-block-form/helpers'; import { cleanUpContents } from '@/components/content-block-form/helpers';
export default defineComponent({ export default defineComponent({
props: { props: {
parent: { parent: {
type: String, type: String,
default: '' default: '',
}, },
after: { after: {
type: String, type: String,
default: '' default: '',
}
}, },
}, },

43
client/src/pages/module/module.vue
View File

@ -1,29 +1,24 @@
<template> <template>
<module <module :module="module" @editNote="editNote" @addNote="addNote" @bookmark="bookmark" />
:module="module"
@editNote="editNote"
@addNote="addNote"
@bookmark="bookmark"
/>
</template> </template>
<script> <script>
import Module from '@/components/modules/Module'; import Module from '@/components/modules/Module';
import log from 'loglevel'; import log from 'loglevel';
import UPDATE_LAST_MODULE_MUTATION from '@/graphql/gql/mutations/updateLastModule.gql'; import UPDATE_LAST_MODULE_MUTATION from '@/graphql/gql/mutations/updateLastModule.gql';
import UPDATE_MODULE_BOOKMARK_MUTATION from '@/graphql/gql/mutations/updateModuleBookmark.gql'; import UPDATE_MODULE_BOOKMARK_MUTATION from '@/graphql/gql/mutations/updateModuleBookmark.gql';
// import ME_QUERY from '@/graphql/gql/meQuery.gql'; // import ME_QUERY from '@/graphql/gql/meQuery.gql';
import MODULE_FRAGMENT from '@/graphql/gql/fragments/moduleParts.gql'; import MODULE_FRAGMENT from '@/graphql/gql/fragments/moduleParts.gql';
import SCROLL_POSITION from '@/graphql/gql/local/scrollPosition.gql'; import SCROLL_POSITION from '@/graphql/gql/local/scrollPosition.gql';
import SCROLL_TO_MUTATION from '@/graphql/gql/local/mutations/scrollTo.gql'; import SCROLL_TO_MUTATION from '@/graphql/gql/local/mutations/scrollTo.gql';
import meMixin from '@/mixins/me'; import meMixin from '@/mixins/me';
import MODULE_DETAILS_QUERY from '@/graphql/gql/queries/modules/moduleDetailsQuery.gql'; import MODULE_DETAILS_QUERY from '@/graphql/gql/queries/modules/moduleDetailsQuery.gql';
import ME_QUERY from '@/graphql/gql/queries/meQuery.gql'; import ME_QUERY from '@/graphql/gql/queries/meQuery.gql';
import { setModuleEditMode } from '@/graphql/cache-operations'; import {setModuleEditMode} from '@/graphql/cache-operations';
export default { export default {
mixins: [meMixin], mixins: [meMixin],
components: { components: {
@ -54,7 +49,7 @@ export default {
}, },
result({ result({
data: { data: {
module: { id }, module: {id},
}, },
}) { }) {
if (!this.updateSent) { if (!this.updateSent) {
@ -95,14 +90,14 @@ export default {
store, store,
{ {
data: { data: {
updateLastModule: { lastModule }, updateLastModule: {lastModule},
}, },
} }
) => { ) => {
const { id, slug } = lastModule; const {id, slug} = lastModule;
log.debug('updating last module', id, slug); log.debug('updating last module', id, slug);
const query = ME_QUERY; const query = ME_QUERY;
let { me } = store.readQuery({ let {me} = store.readQuery({
query, query,
}); });
// me.lastModule = { // me.lastModule = {
@ -229,5 +224,5 @@ export default {
} }
}, },
}, },
}; };
</script> </script>

9
client/src/pages/rooms/editRoomEntry.vue
View File

@ -9,7 +9,7 @@
</template> </template>
<script> <script>
import {defineComponent} from 'vue'; import { defineComponent } from 'vue';
import ROOM_ENTRY_QUERY from 'gql/queries/roomEntryQuery.gql'; import ROOM_ENTRY_QUERY from 'gql/queries/roomEntryQuery.gql';
import ROOM_ENTRY_FRAGMENT from 'gql/fragments/roomEntryParts.gql'; import ROOM_ENTRY_FRAGMENT from 'gql/fragments/roomEntryParts.gql';
@ -19,16 +19,15 @@ import ContentBlockForm from '@/components/content-block-form/ContentBlockForm';
import { ROOMS_FEATURE_SET } from '@/consts/features.consts'; import { ROOMS_FEATURE_SET } from '@/consts/features.consts';
import { ROOM_PAGE } from '@/router/room.names'; import { ROOM_PAGE } from '@/router/room.names';
export default defineComponent( { export default defineComponent({
props: { props: {
slug: { slug: {
type: String, type: String,
required: true required: true,
}, },
entrySlug: { entrySlug: {
type: String, type: String,
required: true required: true,
}
}, },
}, },

15
client/src/pages/survey.vue
View File

@ -21,9 +21,10 @@
<script> <script>
import '@/styles/survey.modern.css'; import '@/styles/survey.modern.css';
import '@/styles/survey.reset.css';import { css } from '@/survey.config'; import '@/styles/survey.reset.css';
import { css } from '@/survey.config';
import gql from 'graphql-tag'; import gql from 'graphql-tag';
import { Model , StylesManager } from 'survey-knockout'; import { Model, StylesManager } from 'survey-knockout';
// we are switching to the knockout version because the Vue version only works with Vue 2 (as of July 2022) // we are switching to the knockout version because the Vue version only works with Vue 2 (as of July 2022)
import SURVEY_QUERY from '@/graphql/gql/queries/surveyQuery.gql'; import SURVEY_QUERY from '@/graphql/gql/queries/surveyQuery.gql';
@ -41,8 +42,8 @@ const Solution = defineAsyncComponent(() =>
*/ '@/components/content-blocks/Solution' */ '@/components/content-blocks/Solution'
) )
); );
StylesManager.applyTheme('modern')
); StylesManager.applyTheme('modern');
const MODULE_QUERY = gql` const MODULE_QUERY = gql`
query ModuleSolutions($slug: String) { query ModuleSolutions($slug: String) {
@ -63,7 +64,8 @@ export default {
return { return {
survey: this.initSurvey(), survey: this.initSurvey(),
currentPage: null, currentPage: null,
surveyData: null,title: '', surveyData: null,
title: '',
module: {}, module: {},
completed: false, completed: false,
me: { me: {
@ -121,7 +123,8 @@ export default {
} }
}, },
destroyed() {},methods: { destroyed() {},
methods: {
initSurvey(data, answers) { initSurvey(data, answers) {
let survey = new Model(data); let survey = new Model(data);
const flatAnswers = {}; const flatAnswers = {};