forked from kompetenzinventar/ki-frontend
Compare commits
18 Commits
Author | SHA1 | Date |
---|---|---|
Brain | d46aaa0f31 | |
Brain | 81dcf5ebe7 | |
Brain | 7433d25716 | |
Brain | 7feee07d35 | |
Nikolai | c79ada2123 | |
nomaster | f8e78d1cc8 | |
jaschop | c2552f3c3a | |
Brain | 687454afdb | |
jaschop | a7c8774cc4 | |
jaschop | b63e5a6c2d | |
jaschop | 1b221ab180 | |
Brain | e2b101eb89 | |
Brain | 654169c383 | |
Brain | 26edf1d4b2 | |
jaschop | e7ff487aeb | |
jaschop | c5bda80f11 | |
zeitschlag | 379ddaf5b9 | |
Brain | 13fb15e033 |
|
@ -1,2 +1,11 @@
|
||||||
|
.browserslistrc
|
||||||
|
.dockerignore
|
||||||
|
.drone.yml
|
||||||
|
.editorconfig
|
||||||
.git
|
.git
|
||||||
|
.gitignore
|
||||||
|
.reuse
|
||||||
|
Dockerfile
|
||||||
|
LICENSES
|
||||||
|
README.md
|
||||||
node_modules
|
node_modules
|
||||||
|
|
136
.drone.yml
136
.drone.yml
|
@ -4,40 +4,110 @@
|
||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: docker
|
type: docker
|
||||||
name: default
|
name: qa
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
event:
|
||||||
|
- push
|
||||||
|
- pull_request
|
||||||
|
branch:
|
||||||
|
- main
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: reuse
|
- name: reuse
|
||||||
image: fsfe/reuse:latest
|
image: fsfe/reuse
|
||||||
|
- name: lint
|
||||||
|
image: node:20
|
||||||
|
commands:
|
||||||
|
- npm ci
|
||||||
|
- npm run lint
|
||||||
|
- name: docker-build
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
registry: git.wtf-eg.de
|
||||||
|
repo: git.wtf-eg.de/kompetenzinventar/frontend
|
||||||
|
target: ki-frontend
|
||||||
|
dry_run: true
|
||||||
|
|
||||||
- name: docker-publish
|
---
|
||||||
image: plugins/docker
|
kind: pipeline
|
||||||
settings:
|
type: docker
|
||||||
registry: registry.wtf-eg.net
|
name: build
|
||||||
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:
|
|
||||||
- push
|
|
||||||
branch:
|
|
||||||
- main
|
|
||||||
|
|
||||||
- name: docker-publish-tag
|
trigger:
|
||||||
image: plugins/docker
|
event:
|
||||||
settings:
|
- push
|
||||||
registry: registry.wtf-eg.net
|
branch:
|
||||||
repo: registry.wtf-eg.net/ki-frontend
|
- main
|
||||||
target: ki-frontend
|
|
||||||
auto_tag: true
|
depends_on:
|
||||||
username:
|
- qa
|
||||||
from_secret: "docker_username"
|
|
||||||
password:
|
steps:
|
||||||
from_secret: "docker_password"
|
- name: docker-publish
|
||||||
when:
|
image: plugins/docker
|
||||||
event:
|
settings:
|
||||||
- tag
|
registry: git.wtf-eg.de
|
||||||
|
repo: git.wtf-eg.de/kompetenzinventar/frontend
|
||||||
|
target: ki-frontend
|
||||||
|
auto_tag: true
|
||||||
|
username:
|
||||||
|
from_secret: "docker_username"
|
||||||
|
password:
|
||||||
|
from_secret: "docker_password"
|
||||||
|
|
||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
name: deploy
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
event:
|
||||||
|
- push
|
||||||
|
branch:
|
||||||
|
- main
|
||||||
|
|
||||||
|
depends_on:
|
||||||
|
- build
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: deploy-dev
|
||||||
|
image: appleboy/drone-ssh
|
||||||
|
settings:
|
||||||
|
host:
|
||||||
|
- dev01.wtf-eg.net
|
||||||
|
username: drone_deployment
|
||||||
|
key:
|
||||||
|
from_secret: "dev01_deployment_key"
|
||||||
|
command_timeout: 2m
|
||||||
|
script:
|
||||||
|
- echo "Executing forced command..."
|
||||||
|
|
||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
name: tag-release
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
event:
|
||||||
|
- tag
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: reuse
|
||||||
|
image: fsfe/reuse
|
||||||
|
- name: lint
|
||||||
|
image: node:20
|
||||||
|
commands:
|
||||||
|
- npm ci
|
||||||
|
- npm run lint
|
||||||
|
- name: docker-publish
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
registry: git.wtf-eg.de
|
||||||
|
repo: git.wtf-eg.de/kompetenzinventar/frontend
|
||||||
|
target: ki-frontend
|
||||||
|
auto_tag: true
|
||||||
|
username:
|
||||||
|
from_secret: "docker_username"
|
||||||
|
password:
|
||||||
|
from_secret: "docker_password"
|
||||||
|
|
17
Dockerfile
17
Dockerfile
|
@ -4,12 +4,25 @@
|
||||||
|
|
||||||
FROM node:14-alpine as builder
|
FROM node:14-alpine as builder
|
||||||
|
|
||||||
COPY . ./
|
COPY package.json package-lock.json ./
|
||||||
|
RUN npm install
|
||||||
|
|
||||||
|
COPY .eslintrc.js .
|
||||||
|
COPY babel.config.js .
|
||||||
|
COPY public public
|
||||||
|
COPY src src
|
||||||
|
|
||||||
RUN npm ci && npm run build
|
RUN npm ci && npm run build
|
||||||
|
|
||||||
|
|
||||||
FROM nginx as ki-frontend
|
FROM nginx as ki-frontend
|
||||||
|
|
||||||
COPY --from=builder /dist/ /usr/share/nginx/html/
|
LABEL org.opencontainers.image.source=https://git.wtf-eg.de/kompetenzinventar/ki-frontend.git
|
||||||
|
LABEL org.opencontainers.image.url=https://git.wtf-eg.de/kompetenzinventar/ki-frontend
|
||||||
|
LABEL org.opencontainers.image.documentation=https://git.wtf-eg.de/kompetenzinventar/ki-frontend#docker
|
||||||
|
LABEL org.opencontainers.image.vendor="WTF Kooperative eG"
|
||||||
|
|
||||||
|
WORKDIR /usr/share/nginx/html
|
||||||
|
|
||||||
COPY etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
|
COPY etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
|
||||||
|
COPY --from=builder /dist .
|
||||||
|
|
|
@ -9,10 +9,24 @@ server {
|
||||||
|
|
||||||
#access_log /var/log/nginx/host.access.log main;
|
#access_log /var/log/nginx/host.access.log main;
|
||||||
|
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
|
||||||
|
# routes without dots serve the index.html without caching
|
||||||
location / {
|
location / {
|
||||||
root /usr/share/nginx/html;
|
add_header Cache-Control "no-cache";
|
||||||
index index.html index.htm;
|
try_files $uri $uri/index.html /index.html;
|
||||||
try_files $uri $uri/ /index.html;
|
}
|
||||||
|
|
||||||
|
# static js and css files that get replaced instead of updated
|
||||||
|
location ~ \.(js|css) {
|
||||||
|
add_header Cache-Control "public, max-age=31536000, immutable";
|
||||||
|
try_files $uri =404;
|
||||||
|
}
|
||||||
|
|
||||||
|
# cache other static files for 30 days
|
||||||
|
location ~ \.(?!html) {
|
||||||
|
add_header Cache-Control "public, max-age=2592000";
|
||||||
|
try_files $uri =404;
|
||||||
}
|
}
|
||||||
|
|
||||||
#error_page 404 /404.html;
|
#error_page 404 /404.html;
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -95,10 +95,11 @@ export default {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async submitFormEdit() {
|
async submitFormEdit(isProfileVisible) {
|
||||||
this.showErrorMessage = false
|
this.showErrorMessage = false
|
||||||
this.showSuccessMessage = false
|
this.showSuccessMessage = false
|
||||||
const userId = store.state.currentUserId
|
const userId = store.state.currentUserId
|
||||||
|
this.profile.visible = isProfileVisible;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const body = JSON.stringify(this.profile)
|
const body = JSON.stringify(this.profile)
|
||||||
|
|
|
@ -19,7 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
class="form-control"
|
class="form-control"
|
||||||
id="searchText"
|
id="searchText"
|
||||||
v-model="searchText"
|
v-model="searchText"
|
||||||
placeholder="Nick, Fähigkeit, Sprache"
|
placeholder="Nick, Name, Fähigkeit, Sprache"
|
||||||
ref="searchTextInput"
|
ref="searchTextInput"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -12,25 +12,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<form @submit.prevent="submitFormEdit()">
|
<form @submit.prevent="submitFormEdit(false)">
|
||||||
<Section title="Grunddaten">
|
<Section title="Grunddaten">
|
||||||
<div class="mb-4">
|
|
||||||
<div class="form-check form-switch">
|
|
||||||
<input
|
|
||||||
class="form-check-input"
|
|
||||||
type="checkbox"
|
|
||||||
role="switch"
|
|
||||||
v-model="profile.visible"
|
|
||||||
id="visibility"
|
|
||||||
>
|
|
||||||
<label
|
|
||||||
class="form-check-label"
|
|
||||||
for="visibility">
|
|
||||||
Profil für angemeldete Benutzer sichtbar
|
|
||||||
</label>
|
|
||||||
</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-12 col-md-4 mb-3 mb-md-0">
|
||||||
<label class="form-label">Nickname</label>
|
<label class="form-label">Nickname</label>
|
||||||
|
@ -223,10 +206,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
Gespeichert
|
Gespeichert
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
class="btn btn-primary ms-3"
|
class="btn btn-secondary ms-3"
|
||||||
@click="submitFormEdit()"
|
@click="submitFormEdit(false)"
|
||||||
>
|
>
|
||||||
Speichern
|
Entwurf Speichern
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
class="btn btn-primary ms-3"
|
||||||
|
@click="submitFormEdit(true)"
|
||||||
|
>
|
||||||
|
Speichern und Veröffentlichen
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue