Resolve some merge issues

client/package-lock.json

@@ -46,6 +46,7 @@
         "cypress": "^10",
         "dayjs": "^1.10.7",
         "eslint": "^7.32.0",
+        "eslint-config-prettier": "^8.6.0",
         "eslint-formatter-friendly": "^7.0.0",
         "eslint-plugin-cypress": "^2.12.1",
         "eslint-plugin-vue": "^9.6.0",
@@ -63,6 +64,7 @@
         "jest-transform-stub": "^2.0.0",
         "jest-watch-typeahead": "^2.1.2",
         "lodash": "^4.17.10",
+        "loglevel": "^1.8.0",
         "mini-css-extract-plugin": "^2.4.5",
         "mock-apollo-client": "^1.2.0",
         "node-sass": "^7.0.3",
@@ -71,6 +73,7 @@
         "postcss-import": "^15.0.0",
         "postcss-loader": "^7.0.1",
         "postcss-url": "^10.1.3",
+        "prettier": "2.8.2",
         "rimraf": "^2.6.0",
         "sass-loader": "^12.6.0",
         "semver": "^5.3.0",
@@ -7209,6 +7212,17 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint-config-prettier": {
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz",
+      "integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==",
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
     "node_modules/eslint-formatter-friendly": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/eslint-formatter-friendly/-/eslint-formatter-friendly-7.0.0.tgz",
@@ -11965,6 +11979,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/loglevel": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz",
+      "integrity": "sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==",
+      "engines": {
+        "node": ">= 0.6.0"
+      },
+      "funding": {
+        "type": "tidelift",
+        "url": "https://tidelift.com/funding/github/npm/loglevel"
+      }
+    },
     "node_modules/loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -14113,6 +14139,20 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/prettier": {
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.2.tgz",
+      "integrity": "sha512-BtRV9BcncDyI2tsuS19zzhzoxD8Dh8LiCx7j7tHzrkz8GFXAexeWFdi22mjE1d16dftH2qNaytVxqiRTGlMfpw==",
+      "bin": {
+        "prettier": "bin-prettier.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
     "node_modules/pretty": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/pretty/-/pretty-2.0.0.tgz",
@@ -23182,6 +23222,12 @@
         }
       }
     },
+    "eslint-config-prettier": {
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz",
+      "integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==",
+      "requires": {}
+    },
     "eslint-formatter-friendly": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/eslint-formatter-friendly/-/eslint-formatter-friendly-7.0.0.tgz",
@@ -26491,6 +26537,11 @@
         }
       }
     },
+    "loglevel": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz",
+      "integrity": "sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg=="
+    },
     "loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -28009,6 +28060,11 @@
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
     },
+    "prettier": {
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.2.tgz",
+      "integrity": "sha512-BtRV9BcncDyI2tsuS19zzhzoxD8Dh8LiCx7j7tHzrkz8GFXAexeWFdi22mjE1d16dftH2qNaytVxqiRTGlMfpw=="
+    },
     "pretty": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/pretty/-/pretty-2.0.0.tgz",

client/package.json

@@ -4,6 +4,9 @@
   "description": "skillbox vue client",
   "author": "ramon / chrigu",
   "private": true,
+  "prettier": {
+    "singleQuote": true
+  },
   "scripts": {
     "dev": "webpack serve --progress --config build/webpack.dev.conf.js",
     "analyze": "webpack --profile --json --config build/webpack.dev.conf.js > dist/stats.json && webpack-bundle-analyzer dist/stats.json",
@@ -22,7 +25,9 @@
     "install:cypress": "cypress install",
     "test:unit": "jest",
     "cypress:parallel": "CYPRESS_API_URL=\"https://iterativ-cypress-director.herokuapp.com/\" cy2 run --parallel --record --key somekey --config-file cypress.frontend.json --ci-build-id some-id",
-    "cypress:parallel:run": "cy2 run --parallel --record  --config-file cypress.frontend.json --ci-build-id "
+    "cypress:parallel:run": "cy2 run --parallel --record  --config-file cypress.frontend.json --ci-build-id ",
+    "prettier": "prettier . --write",
+    "prettier:check": "prettier . --check"
   },
   "dependencies": {
     "@apollo/client": "^3.5.10",
@@ -63,6 +68,7 @@
     "cypress": "^10",
     "dayjs": "^1.10.7",
     "eslint": "^7.32.0",
+    "eslint-config-prettier": "^8.6.0",
     "eslint-formatter-friendly": "^7.0.0",
     "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-vue": "^9.6.0",
@@ -80,6 +86,7 @@
     "jest-transform-stub": "^2.0.0",
     "jest-watch-typeahead": "^2.1.2",
     "lodash": "^4.17.10",
+    "loglevel": "^1.8.0",
     "mini-css-extract-plugin": "^2.4.5",
     "mock-apollo-client": "^1.2.0",
     "node-sass": "^7.0.3",
@@ -88,6 +95,7 @@
     "postcss-import": "^15.0.0",
     "postcss-loader": "^7.0.1",
     "postcss-url": "^10.1.3",
+    "prettier": "2.8.2",
     "rimraf": "^2.6.0",
     "sass-loader": "^12.6.0",
     "semver": "^5.3.0",

client/src/components/modules/ModuleNavigation.vue

@@ -7,72 +7,6 @@
       type="topic"
       v-if="module.topic"
     />
-<<<<<<< HEAD
-    <div class="module-navigation__module-content" v-if="false">
-      <!-- Do not display this for now, might be used later again though -->
-      <router-link :to="moduleContentLink" tag="h3" class="module-navigation__heading">
-        Inhalte: {{ module.metaTitle }}
-      </router-link>
-      <div class="module-navigation__anchors" v-if="onModulePage">
-        <a href="#" class="module-navigation__anchor" v-scroll-to="'#meta-title'">Einleitung</a>
-        <a href="#" class="module-navigation__anchor" v-scroll-to="'#objectives'">Lernziele</a>
-
-        <a
-          href="#"
-          class="module-navigation__anchor"
-          v-for="(chapter, index) in module.chapters"
-          :key="chapter.id"
-          v-scroll-to="chapterId(index)"
-          >{{ chapter.title }}</a
-        >
-        <a href="#" class="module-navigation__anchor" v-scroll-to="'#objectives-confirm'">Lernzielkontrolle</a>
-      </div>
-    </div>
-||||||| parent of c96f9b5b (Remove obsolete tag attributes)
-    <div
-      class="module-navigation__module-content"
-      v-if="false"
-    >
-      <!-- Do not display this for now, might be used later again though -->
-      <router-link
-        :to="moduleContentLink"
-        tag="h3"
-        class="module-navigation__heading"
-      >
-        Inhalte: {{ module.metaTitle }}
-      </router-link>
-      <div
-        class="module-navigation__anchors"
-        v-if="onModulePage"
-      >
-        <a
-          href="#"
-          class="module-navigation__anchor"
-          v-scroll-to="'#meta-title'"
-        >Einleitung</a>
-        <a
-          href="#"
-          class="module-navigation__anchor"
-          v-scroll-to="'#objectives'"
-        >Lernziele</a>
-
-        <a
-          href="#"
-          class="module-navigation__anchor"
-          v-for="(chapter, index) in module.chapters"
-          :key="chapter.id"
-          v-scroll-to="chapterId(index)"
-        >{{ chapter.title }}</a>
-        <a
-          href="#"
-          class="module-navigation__anchor"
-          v-scroll-to="'#objectives-confirm'"
-        >Lernzielkontrolle</a>
-      </div>
-    </div>
-=======
->>>>>>> c96f9b5b (Remove obsolete tag attributes)
-
     <div
       class="module-navigation__toggle-menu"
       data-cy="module-teacher-menu"

client/src/components/portfolio/ProjectForm.vue

@@ -1,25 +1,4 @@
 <template>
-<<<<<<< HEAD
-  <page-form :title="title" @save="$emit('save', localProject)">
-    <page-form-input label="Titel" v-model="localProject.title" />
-    <page-form-input label="Beschreibung" type="textarea" v-model="localProject.description" />
-    <template slot="footer">
-||||||| parent of a423cfde (Apply code changes from migration guide for Vue 3)
-  <page-form
-    :title="title"
-    @save="$emit('save', localProject)"
-  >
-    <page-form-input
-      label="Titel"
-      v-model="localProject.title"
-    />
-    <page-form-input
-      label="Beschreibung"
-      type="textarea"
-      v-model="localProject.description"
-    />
-    <template slot="footer">
-=======
   <page-form
     :title="title"
     @save="$emit('save', localProject)"
@@ -34,7 +13,6 @@
       v-model="localProject.description"
     />
     <template #footer>
->>>>>>> a423cfde (Apply code changes from migration guide for Vue 3)
       <button
         :class="{ 'button--disabled': !formValid }"
         :disabled="!formValid"
@@ -44,24 +22,12 @@
       >
         Speichern
       </button>
-<<<<<<< HEAD
-      <router-link to="/portfolio" tag="button" class="button"> Abbrechen </router-link>
-||||||| parent of c96f9b5b (Remove obsolete tag attributes)
-      <router-link
-        to="/portfolio"
-        tag="button"
-        class="button"
-      >
-        Abbrechen
-      </router-link>
-=======
       <router-link
         to="/portfolio"
         class="button"
       >
         Abbrechen
       </router-link>
->>>>>>> c96f9b5b (Remove obsolete tag attributes)
     </template>
   </page-form>
 </template>

client/src/components/portfolio/ProjectListItem.vue

@@ -1,18 +1,6 @@
 <template>
   <li class="project">
-    <router-link
+    <router-link :to="{ name: 'project', params: { slug: project.slug } }" class="project__link" data-cy="project-link">
-<<<<<<< HEAD
-      :to="{ name: 'project', params: { slug: project.slug } }"
-      tag="div"
-||||||| parent of c96f9b5b (Remove obsolete tag attributes)
-      :to="{name: 'project', params: {slug: project.slug}}"
-      tag="div"
-=======
-      :to="{name: 'project', params: {slug: project.slug}}"
->>>>>>> c96f9b5b (Remove obsolete tag attributes)
-      class="project__link"
-      data-cy="project-link"
-    >
       <span class="project__title" data-cy="project-title">{{ project.title }}</span>
 
       <owner-widget :owner="project.student" class="project__owner" />

client/src/components/profile/EditNameWizard.vue

@@ -6,24 +6,6 @@
 
     <modal-input :value="name" :placeholder="placeholder" data-cy="edit-name-input" @input="$emit('input', $event)" />
     <template #footer>
-<<<<<<< HEAD
-      <div slot="footer">
-        <a class="button button--primary" data-cy="modal-save-button" @click="$emit('save')">Speichern</a>
-        <a class="button" @click="$emit('cancel')">Abbrechen</a>
-      </div>
-||||||| parent of a423cfde (Apply code changes from migration guide for Vue 3)
-      <div slot="footer">
-        <a
-          class="button button--primary"
-          data-cy="modal-save-button"
-          @click="$emit('save')"
-        >Speichern</a>
-        <a
-          class="button"
-          @click="$emit('cancel')"
-        >Abbrechen</a>
-      </div>
-=======
       <a
         class="button button--primary"
         data-cy="modal-save-button"
@@ -33,7 +15,6 @@
         class="button"
         @click="$emit('cancel')"
       >Abbrechen</a>
->>>>>>> a423cfde (Apply code changes from migration guide for Vue 3)
     </template>
   </modal>
 </template>

client/src/components/rooms/RoomEntry.vue

@@ -1,29 +1,4 @@
 <template>
-<<<<<<< HEAD
-  <div class="room-entry" data-cy="room-entry">
-    <router-link :to="{ name: 'article', params: { slug: slug } }" class="room-entry__router-link" tag="div">
-      <div class="room-entry__header" v-if="image">
-        <img :src="image" :alt="title" class="room-entry__image" />
-||||||| parent of c96f9b5b (Remove obsolete tag attributes)
-  <div
-    class="room-entry"
-    data-cy="room-entry"
-  >
-    <router-link
-      :to="{name: 'article', params: { slug: slug }}"
-      class="room-entry__router-link"
-      tag="div"
-    >
-      <div
-        class="room-entry__header"
-        v-if="image"
-      >
-        <img
-          :src="image"
-          :alt="title"
-          class="room-entry__image"
-        >
-=======
   <div
     class="room-entry"
     data-cy="room-entry"
@@ -41,7 +16,6 @@
           :alt="title"
           class="room-entry__image"
         >
->>>>>>> c96f9b5b (Remove obsolete tag attributes)
       </div>
       <div class="room-entry__content">
         <h2 class="room-entry__title">

client/src/components/rooms/RoomWidget.vue

@@ -1,18 +1,4 @@
 <template>
-<<<<<<< HEAD
-  <div :class="roomClass" class="room-widget">
-    <router-link :to="{ name: 'room', params: { slug: slug } }" tag="div" class="room-widget__content">
-||||||| parent of c96f9b5b (Remove obsolete tag attributes)
-  <div
-    :class="roomClass"
-    class="room-widget"
-  >
-    <router-link
-      :to="{name: 'room', params: {slug: slug}}"
-      tag="div"
-      class="room-widget__content"
-    >
-=======
   <div
     :class="roomClass"
     class="room-widget"
@@ -21,7 +7,6 @@
       :to="{name: 'room', params: {slug: slug}}"
       class="room-widget__content"
     >
->>>>>>> c96f9b5b (Remove obsolete tag attributes)
       <h2 class="room-widget__title">
         {{ title }}
       </h2>

client/src/helpers/app-flavor.ts

@@ -1,4 +1,4 @@
-import log from 'loglevel';
+// import log from 'loglevel';
 import type { FlavorValues } from '@/helpers/types';
 import { defaultFlavorValues, dhaValues, dhfValues, myKvValues } from '@/helpers/app-flavor.constants';
 
@@ -18,6 +18,6 @@ switch (process.env.VUE_APP_FLAVOR) {
     flavorValues = defaultFlavorValues;
 }
 
-log.debug('flavorValues', flavorValues);
+// log.debug('flavorValues', flavorValues);
 
 export default flavorValues;

client/src/pages/start.vue

@@ -17,24 +17,12 @@
             :key="index"
           />
         </div>
-<<<<<<< HEAD
-        <router-link :to="topicRoute" tag="div" class="button"> Alle {{ $flavor.textModules }} anzeigen </router-link>
-||||||| parent of c96f9b5b (Remove obsolete tag attributes)
-        <router-link
-          :to="topicRoute"
-          tag="div"
-          class="button"
-        >
-          Alle {{ $flavor.textModules }} anzeigen
-        </router-link>
-=======
         <router-link
           :to="topicRoute"
           class="button"
         >
           Alle {{ $flavor.textModules }} anzeigen
         </router-link>
->>>>>>> c96f9b5b (Remove obsolete tag attributes)
       </div>
       <div class="start-page__news news" data-cy="news-teasers" v-if="!me.readOnly">
         <h2 class="start-page__heading">News</h2>