Compare commits

..

10 Commits

Author SHA1 Message Date
13fb15e033 Fix link for new issues 2022-07-20 18:26:39 +02:00
aaa0883692 Merge pull request 'add tag trigger' (!77) from feature/tag-trigger into main
All checks were successful
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is passing
Reviewed-on: #77
2022-02-28 19:32:33 +01:00
e404bef2a9 add tag trigger
All checks were successful
continuous-integration/drone/push Build is passing
2022-02-28 19:32:04 +01:00
cbbcfd0f37 Merge pull request 'add address.name to frontend' (!76) from feature/realname into main
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
Reviewed-on: #76
2022-01-26 22:03:08 +01:00
5c5f157a77 add address.name to frontend
All checks were successful
continuous-integration/drone/push Build is passing
2022-01-25 21:04:17 +01:00
3017c001b2 Merge pull request 'Paginierung' (!74) from feature/pagination into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #74
2022-01-24 19:46:59 +01:00
fefe9a034d Merge pull request 'Aktualisierung NPM Pakete' (!75) from fix/npm-update into main
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #75
2022-01-24 19:11:50 +01:00
bac8731e17 add pagination
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2022-01-23 20:14:52 +01:00
dc883ac302 update npm packages
All checks were successful
continuous-integration/drone/push Build is passing
2022-01-23 19:56:14 +01:00
16feb41f8a kompetenzinventar/ki-doku#18 line-break new text (!72)
All checks were successful
continuous-integration/drone/push Build is passing
Co-authored-by: scammo <samuel.brinkmann@googlemail.com>
Reviewed-on: #72
Reviewed-by: weeman <weeman@noreply.git.wtf-eg.de>
Co-authored-by: scammo <scammo@noreply.git.wtf-eg.de>
Co-committed-by: scammo <scammo@noreply.git.wtf-eg.de>
2022-01-17 14:44:13 +01:00
10 changed files with 7988 additions and 6591 deletions

View File

@ -9,6 +9,7 @@ name: default
steps: steps:
- name: reuse - name: reuse
image: fsfe/reuse:latest image: fsfe/reuse:latest
- name: docker-publish - name: docker-publish
image: plugins/docker image: plugins/docker
settings: settings:
@ -21,5 +22,22 @@ steps:
password: password:
from_secret: "docker_password" from_secret: "docker_password"
when: when:
event:
- push
branch: branch:
- main - main
- name: docker-publish-tag
image: plugins/docker
settings:
registry: registry.wtf-eg.net
repo: registry.wtf-eg.net/ki-frontend
target: ki-frontend
auto_tag: true
username:
from_secret: "docker_username"
password:
from_secret: "docker_password"
when:
event:
- tag

14478
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -7,10 +7,10 @@
"lint": "vue-cli-service lint" "lint": "vue-cli-service lint"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "~4.5.0", "@vue/cli-plugin-babel": "^4.5.0",
"@vue/cli-plugin-eslint": "~4.5.0", "@vue/cli-plugin-eslint": "^4.5.0",
"@vue/cli-plugin-router": "~4.5.0", "@vue/cli-plugin-router": "^4.5.0",
"@vue/cli-service": "~4.5.0", "@vue/cli-service": "^4.5.0",
"@vue/compiler-sfc": "^3.0.0", "@vue/compiler-sfc": "^3.0.0",
"babel-eslint": "^10.1.0", "babel-eslint": "^10.1.0",
"bootstrap": "^5.0.1", "bootstrap": "^5.0.1",

View File

@ -13,7 +13,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
<div class="fw-bold text-white mb-2">Kompetenzinventar</div> <div class="fw-bold text-white mb-2">Kompetenzinventar</div>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><a href="https://git.wtf-eg.de/kompetenzinventar">Quellcode</a></li> <li><a href="https://git.wtf-eg.de/kompetenzinventar">Quellcode</a></li>
<li><a href="https://git.wtf-eg.de/kompetenzinventar/ki-frontend/issues/new">Problem melden</a></li> <li><a href="https://git.wtf-eg.de/kompetenzinventar/ki-doku/issues/new/choose">Problem melden</a></li>
</ul> </ul>
</div> </div>
</div> </div>

View File

@ -1,3 +1,9 @@
<!--
SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
SPDX-License-Identifier: AGPL-3.0-or-later
-->
<template> <template>
<ul class="pagination"> <ul class="pagination">
<li <li

View File

@ -16,6 +16,14 @@ SPDX-License-Identifier: AGPL-3.0-or-later
</span> </span>
</div> </div>
</div> </div>
<div v-if="profile?.address?.name">
<div class="d-flex align-items-center">
<i class="fs-4 bi bi-person-fill text-dark mx-2"></i>
<div class="text-white">
a.k.a. {{ profile.address.name }}
</div>
</div>
</div>
<div v-if="location"> <div v-if="location">
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<i class="fs-4 bi bi-geo-alt-fill text-dark mx-2"></i> <i class="fs-4 bi bi-geo-alt-fill text-dark mx-2"></i>

View File

@ -42,17 +42,17 @@ export default {
state.errorMessage = errorMessage state.errorMessage = errorMessage
}, },
setQuerySearch(state, search) { setQuerySearch(state, search) {
state.query.search = search state.query = {...state.query, search}
}, },
setPages(state, pages) { setPages(state, pages) {
state.pages = pages state.pages = pages
}, },
setQueryPage(state, page) { setQueryPage(state, page) {
state.query.page = page state.query = {...state.query, page}
} }
}, },
actions: { actions: {
async search({state, commit, rootState}) { async search({state, commit, rootState, dispatch}) {
if (state.searching) { if (state.searching) {
return return
} }
@ -91,8 +91,19 @@ export default {
return return
} }
console.log(response.ok)
console.log(response.status)
console.log(state.query.page)
clearTimeout(timeoutId) clearTimeout(timeoutId)
if (!response.ok && response.status === 404 && state.query.page != 1) {
commit('setQueryPage', 1)
commit('setSearching', false)
await dispatch('search')
return
}
if (!response.ok) { if (!response.ok) {
commit('setError', true) commit('setError', true)
commit('clearProfiles') commit('clearProfiles')

View File

@ -161,11 +161,16 @@ export default {
} }
}, },
created() { created() {
if (this.$route.query.query !== undefined) { if (this.$route.query.query) {
this.searchText = this.$route.query.query this.searchText = this.$route.query.query
this.$store.commit('search/clearProfiles') this.$store.commit('search/clearProfiles')
} }
if (this.$route.query.page) {
this.currentPage = parseInt(this.$route.query.page, 10)
this.$store.commit('search/clearProfiles')
}
this.$store.dispatch('search/search') this.$store.dispatch('search/search')
} }
}; };

View File

@ -32,7 +32,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
</div> </div>
<div class="row mb-4"> <div class="row mb-4">
<div class="col-6 mb-3"> <div class="col-12 col-md-4 mb-3 mb-md-0">
<label class="form-label">Nickname</label> <label class="form-label">Nickname</label>
<input <input
type="text" type="text"
@ -43,7 +43,17 @@ SPDX-License-Identifier: AGPL-3.0-or-later
required required
/> />
</div> </div>
<div class="col-6 mb-3"> <div class="col-12 col-md-4 mb-3 mb-md-0">
<label class="form-label">Klarname (optional)</label>
<input
type="text"
class="form-control"
id="realname"
maxlength="25"
v-model="profile.address.name"
/>
</div>
<div class="col-12 col-md-4">
<label class="form-label"> <label class="form-label">
Pronomen Pronomen
<i class="bi bi-info-circle" v-tooltip="pronounsTooltip"></i> <i class="bi bi-info-circle" v-tooltip="pronounsTooltip"></i>

View File

@ -75,7 +75,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
<label class="form-label fw-bold"> <label class="form-label fw-bold">
Anmerkungen Anmerkungen
</label> </label>
<div>{{ profile.availability_text }}</div> <div class="line-break-text">{{ profile.availability_text }}</div>
</div> </div>
</Section> </Section>
@ -98,11 +98,11 @@ SPDX-License-Identifier: AGPL-3.0-or-later
title="Sonstiges"> title="Sonstiges">
<div v-if="profile.freetext" :class="{ 'lh-base': true, 'mb-4': profile.volunteerwork }"> <div v-if="profile.freetext" :class="{ 'lh-base': true, 'mb-4': profile.volunteerwork }">
<h5>Über mich</h5> <h5>Über mich</h5>
{{ profile.freetext }} <div class="line-break-text">{{ profile.freetext }}</div>
</div> </div>
<div v-if="profile.volunteerwork" class="lh-base"> <div v-if="profile.volunteerwork" class="lh-base">
<h5>Ehrenamtliche Arbeit</h5> <h5>Ehrenamtliche Arbeit</h5>
{{ profile.volunteerwork }} <div class="line-break-text">{{ profile.volunteerwork }}</div>
</div> </div>
</Section> </Section>
</template> </template>
@ -154,4 +154,7 @@ export default {
</script> </script>
<style> <style>
.line-break-text{
white-space: pre-line;
}
</style> </style>