Fix some merge issues

client/src/components/UserWidget.vue

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

client/src/components/book-navigation/TopicNavigation.vue

@@ -26,7 +26,6 @@ import sidebarMixin from '@/mixins/sidebar';
       default: false,
     },
   },
-  },
 
   mixins: [sidebarMixin],
 
@@ -41,7 +40,6 @@ import sidebarMixin from '@/mixins/sidebar';
       return atob(id);
     },
   },
-  },
 
   apollo: {
     topics: {

client/src/components/content-block-form/EditContentBlockWizard.vue

@@ -45,24 +45,26 @@ import ContentsForm from '@/components/content-block-form/ContentsForm';
             input: {
               contentBlock: {
                 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),
               },
               id: contentBlock.id,
             },
           },
-          refetchQueries: [{
+          refetchQueries: [
+            {
               query: MODULE_DETAILS_QUERY,
               variables: {
                 slug: this.$route.params.slug,
               },
-          }],
-        }).then(() => {
+            },
+          ],
+        })
+        .then(() => {
           this.hideModal();
         });
     },
   },
-  },
 
   apollo: {
     contentBlock() {
@@ -74,6 +76,5 @@ import ContentsForm from '@/components/content-block-form/ContentsForm';
       };
     },
   },
-
 };
 </script>

client/src/components/instruments/FilterGroup.vue

@@ -80,6 +80,7 @@ export default defineComponent({
         },
       });
     },
+  },
 });
 </script>
 

client/src/components/modules/ModuleTeaser.vue

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

client/src/components/portfolio/ProjectListItem.vue

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

client/src/components/school-class/ClassSelectionWidget.vue

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

client/src/pages/createContentBlock.vue

@@ -20,12 +20,11 @@ import { cleanUpContents } from '@/components/content-block-form/helpers';
   props: {
     parent: {
       type: String,
-        default: ''
+      default: '',
     },
     after: {
       type: String,
-        default: ''
-      }
+      default: '',
     },
   },
 

client/src/pages/module/module.vue

@@ -1,10 +1,5 @@
 <template>
-  <module
-    :module="module"
-    @editNote="editNote"
-    @addNote="addNote"
-    @bookmark="bookmark"
-  />
+  <module :module="module" @editNote="editNote" @addNote="addNote" @bookmark="bookmark" />
 </template>
 
 <script>

client/src/pages/rooms/editRoomEntry.vue

@@ -23,12 +23,11 @@ import { ROOM_PAGE } from '@/router/room.names';
   props: {
     slug: {
       type: String,
-        required: true
+      required: true,
     },
     entrySlug: {
       type: String,
-        required: true
-      }
+      required: true,
     },
   },
 

client/src/pages/survey.vue

@@ -21,7 +21,8 @@
 
 <script>
 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 { 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)
@@ -41,8 +42,8 @@ const Solution = defineAsyncComponent(() =>
      */ '@/components/content-blocks/Solution'
   )
 );
-StylesManager.applyTheme('modern')
-);
+
+StylesManager.applyTheme('modern');
 
 const MODULE_QUERY = gql`
   query ModuleSolutions($slug: String) {
@@ -63,7 +64,8 @@ export default {
     return {
       survey: this.initSurvey(),
       currentPage: null,
-      surveyData: null,title: '',
+      surveyData: null,
+      title: '',
       module: {},
       completed: false,
       me: {
@@ -121,7 +123,8 @@ export default {
     }
   },
 
-  destroyed() {},methods: {
+  destroyed() {},
+  methods: {
     initSurvey(data, answers) {
       let survey = new Model(data);
       const flatAnswers = {};