Compare commits
4 Commits
fix-docker
...
feature/up
Author | SHA1 | Date | |
---|---|---|---|
5f7c2063c3 | |||
09611184e8 | |||
f7ed4d9a84 | |||
00002b81de |
@ -1,11 +1,2 @@
|
||||
.browserslistrc
|
||||
.dockerignore
|
||||
.drone.yml
|
||||
.editorconfig
|
||||
.git
|
||||
.gitignore
|
||||
.reuse
|
||||
Dockerfile
|
||||
LICENSES
|
||||
README.md
|
||||
node_modules
|
||||
|
@ -21,13 +21,6 @@ steps:
|
||||
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
|
||||
|
||||
---
|
||||
kind: pipeline
|
||||
|
@ -8,7 +8,7 @@ module.exports = {
|
||||
'eslint:recommended'
|
||||
],
|
||||
parserOptions: {
|
||||
parser: 'babel-eslint'
|
||||
parser: '@babel/eslint-parser'
|
||||
},
|
||||
rules: {
|
||||
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
|
||||
|
18
Dockerfile
18
Dockerfile
@ -2,27 +2,19 @@
|
||||
#
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
FROM node:14-alpine as builder
|
||||
FROM node:20-alpine as builder
|
||||
|
||||
COPY package.json package-lock.json ./
|
||||
RUN npm install
|
||||
|
||||
COPY .eslintrc.js .
|
||||
COPY babel.config.js .
|
||||
COPY public public
|
||||
COPY src src
|
||||
COPY . ./
|
||||
|
||||
RUN npm ci && npm run build
|
||||
|
||||
|
||||
FROM nginx as ki-frontend
|
||||
|
||||
COPY --from=builder /dist/ /usr/share/nginx/html/
|
||||
COPY etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
|
||||
|
||||
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 --from=builder /dist .
|
||||
|
26530
package-lock.json
generated
26530
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
24
package.json
24
package.json
@ -7,22 +7,22 @@
|
||||
"lint": "vue-cli-service lint"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vue/cli-plugin-babel": "^4.5.0",
|
||||
"@vue/cli-plugin-eslint": "^4.5.0",
|
||||
"@vue/cli-plugin-router": "^4.5.0",
|
||||
"@vue/cli-service": "^4.5.0",
|
||||
"@vue/cli-plugin-babel": "~5.0.8",
|
||||
"@vue/cli-plugin-eslint": "~5.0.8",
|
||||
"@vue/cli-plugin-router": "~5.0.8",
|
||||
"@vue/cli-service": "~5.0.8",
|
||||
"@vue/compiler-sfc": "^3.0.0",
|
||||
"babel-eslint": "^10.1.0",
|
||||
"bootstrap": "^5.0.1",
|
||||
"bootstrap-icons": "^1.5.0",
|
||||
"@babel/eslint-parser": "7.23.10",
|
||||
"bootstrap": "^5.3.2",
|
||||
"bootstrap-icons": "^1.11.3",
|
||||
"core-js": "^3.6.5",
|
||||
"eslint": "^6.7.2",
|
||||
"eslint": "^7.32.0",
|
||||
"eslint-plugin-vue": "^7.0.0",
|
||||
"sass": "^1.37.5",
|
||||
"sass-loader": "^10.2.0",
|
||||
"v-tooltip": "^4.0.0-alpha.1",
|
||||
"vue": "^3.0.0",
|
||||
"vue-router": "^4.0.0-0",
|
||||
"vuex": "^4.0.2"
|
||||
"v-tooltip": "^4.0.0-beta.17",
|
||||
"vue": "^3.4.0",
|
||||
"vue-router": "^4.2.5",
|
||||
"vuex": "^4.1.0"
|
||||
}
|
||||
}
|
||||
|
@ -21,3 +21,11 @@
|
||||
.search-card{
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.card-body {
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.list-group-flush > .list-group-item {
|
||||
background-color: #fff;
|
||||
}
|
@ -95,11 +95,10 @@ export default {
|
||||
console.error(error);
|
||||
}
|
||||
},
|
||||
async submitFormEdit(isProfileVisible) {
|
||||
async submitFormEdit() {
|
||||
this.showErrorMessage = false
|
||||
this.showSuccessMessage = false
|
||||
const userId = store.state.currentUserId
|
||||
this.profile.visible = isProfileVisible;
|
||||
|
||||
try {
|
||||
const body = JSON.stringify(this.profile)
|
||||
|
@ -12,8 +12,25 @@ SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
<form @submit.prevent="submitFormEdit(false)">
|
||||
<form @submit.prevent="submitFormEdit()">
|
||||
<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="col-12 col-md-4 mb-3 mb-md-0">
|
||||
<label class="form-label">Nickname</label>
|
||||
@ -205,17 +222,11 @@ SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
<i class="bi bi-check-lg"></i>
|
||||
Gespeichert
|
||||
</div>
|
||||
<button
|
||||
class="btn btn-secondary ms-3"
|
||||
@click="submitFormEdit(false)"
|
||||
>
|
||||
Entwurf Speichern
|
||||
</button>
|
||||
<button
|
||||
class="btn btn-primary ms-3"
|
||||
@click="submitFormEdit(true)"
|
||||
@click="submitFormEdit()"
|
||||
>
|
||||
Speichern und Veröffentlichen
|
||||
Speichern
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
Reference in New Issue
Block a user