Merge branch 'main' into profile-page

Merge pull request 'Fix typo for language levels' (#67 ) from zeitschlag/ki-frontend:typo into main
Reviewed-on: #67
2022-01-14 13:09:46 +01:00 · 2021-12-17 20:41:45 +01:00 · 2021-12-17 18:29:54 +01:00 · 2021-11-22 20:14:45 +01:00 · 2021-11-22 18:48:13 +01:00 · 2021-10-25 14:15:38 +02:00
3 changed files with 9 additions and 6 deletions
--- a/src/assets/language_level.json
+++ b/src/assets/language_level.json
@ -1,6 +1,6 @@
 {
    "1": "Keine Angabe",
-    "2": "Grundkentnisse",
+    "2": "Grundkenntnisse",
    "3": "Gut",
    "4": "Fließend",
    "5": "Muttersprache"
--- a/src/components/AutoComplete.vue
+++ b/src/components/AutoComplete.vue
@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
          type="text"
          class="form-control form-control-sm"
          id="searchText"
-          maxlength="25"
+          :maxlength="maxlength"
          :placeholder="placeholder"
          v-model="searchText"
          @input="search()"
@ -99,7 +99,10 @@ export default {
    };
  },
  computed: {
-    ...mapState(['currentUserId'])
+    ...mapState(['currentUserId']),
+    maxlength() {
+      return this.type === 'skill' ? 50 : 25
+    }
  },
  methods: {
    addResult(result = false) {
--- a/src/views/profile/View.vue
+++ b/src/views/profile/View.vue
@ -65,8 +65,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
            <i class="bi bi-x-square me-1"></i>
            nein
          </div>
-          <span 
-            class="ms-3" 
+          <span
+            class="ms-3"
            v-if="profile.availability_status && profile.availability_hours_per_week">
            ({{ profile.availability_hours_per_week }} Stunden pro Woche)
          </span>
@ -101,7 +101,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
          {{ profile.freetext }}
        </div>
        <div v-if="profile.volunteerwork" class="lh-base">
-          <h5>Ehrentamtliche Arbeit</h5>
+          <h5>Ehrenamtliche Arbeit</h5>
          {{ profile.volunteerwork }}
        </div>
      </Section>
Author	SHA1	Message	Date
weeman	e3115f9944	Merge branch 'main' into profile-page All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	2022-01-14 13:09:46 +01:00
frlan	872d544075	Merge pull request 'Fix typo for language levels' (#67 ) from zeitschlag/ki-frontend:typo into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #67	2021-12-17 20:41:45 +01:00
Nathan Mattes	fba33d20a7	Fix typo for language levels	2021-12-17 18:29:54 +01:00
Michael Weimann	e035fa3289	extend skill length to 50 All checks were successful continuous-integration/drone/push Build is passing Details	2021-11-22 20:14:45 +01:00
Michael Weimann	324203216a	fix typo	2021-11-22 18:48:13 +01:00
scammo	b270a5d56a	Merge pull request 'Weitere Arbeiten Profilseite' (#53 ) from profile-page into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #53	2021-10-25 14:15:38 +02:00