Compare commits
1 Commits
v1.1.0
...
f36d55ebc8
Author | SHA1 | Date | |
---|---|---|---|
f36d55ebc8
|
18
.drone.yml
18
.drone.yml
@ -9,7 +9,6 @@ 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:
|
||||||
@ -22,22 +21,5 @@ 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
14478
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -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",
|
||||||
|
@ -16,14 +16,6 @@ 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>
|
||||||
|
@ -42,17 +42,17 @@ export default {
|
|||||||
state.errorMessage = errorMessage
|
state.errorMessage = errorMessage
|
||||||
},
|
},
|
||||||
setQuerySearch(state, search) {
|
setQuerySearch(state, search) {
|
||||||
state.query = {...state.query, search}
|
state.query.search = search
|
||||||
},
|
},
|
||||||
setPages(state, pages) {
|
setPages(state, pages) {
|
||||||
state.pages = pages
|
state.pages = pages
|
||||||
},
|
},
|
||||||
setQueryPage(state, page) {
|
setQueryPage(state, page) {
|
||||||
state.query = {...state.query, page}
|
state.query.page = page
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
actions: {
|
actions: {
|
||||||
async search({state, commit, rootState, dispatch}) {
|
async search({state, commit, rootState}) {
|
||||||
if (state.searching) {
|
if (state.searching) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -68,7 +68,7 @@ export default {
|
|||||||
commit('setErrorMessage', '')
|
commit('setErrorMessage', '')
|
||||||
|
|
||||||
const url = new URL(`${window.ki.apiUrl}/users/profiles`)
|
const url = new URL(`${window.ki.apiUrl}/users/profiles`)
|
||||||
|
|
||||||
if (state.query.search) {
|
if (state.query.search) {
|
||||||
url.searchParams.append('search', state.query.search)
|
url.searchParams.append('search', state.query.search)
|
||||||
}
|
}
|
||||||
@ -91,19 +91,8 @@ 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')
|
||||||
|
@ -161,16 +161,11 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
if (this.$route.query.query) {
|
if (this.$route.query.query !== undefined) {
|
||||||
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')
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -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-12 col-md-4 mb-3 mb-md-0">
|
<div class="col-6 mb-3">
|
||||||
<label class="form-label">Nickname</label>
|
<label class="form-label">Nickname</label>
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
@ -43,17 +43,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
|
|||||||
required
|
required
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-12 col-md-4 mb-3 mb-md-0">
|
<div class="col-6 mb-3">
|
||||||
<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>
|
||||||
|
@ -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 class="line-break-text">{{ profile.availability_text }}</div>
|
<div>{{ 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>
|
||||||
<div class="line-break-text">{{ profile.freetext }}</div>
|
{{ profile.freetext }}
|
||||||
</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>
|
||||||
<div class="line-break-text">{{ profile.volunteerwork }}</div>
|
{{ profile.volunteerwork }}
|
||||||
</div>
|
</div>
|
||||||
</Section>
|
</Section>
|
||||||
</template>
|
</template>
|
||||||
@ -154,7 +154,4 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.line-break-text{
|
|
||||||
white-space: pre-line;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
Reference in New Issue
Block a user