Use Bootstrap classes

Reviewed-on: #89

.dockerignore

@@ -1,2 +1,11 @@
+.browserslistrc
+.dockerignore
+.drone.yml
+.editorconfig
 .git
+.gitignore
+.reuse
+Dockerfile
+LICENSES
+README.md
 node_modules

.drone.yml

@@ -4,40 +4,115 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 kind: pipeline
 type: docker
-name: default
+name: qa
+
+trigger:
+  event:
+    - push
+    - pull_request
+  branch:
+    - main
 
 steps:
-- name: reuse
+  - name: reuse
-  image: fsfe/reuse:latest
+    image: fsfe/reuse:3.0.2-debian
+  - name: lint
+    image: node:20.12.2
+    commands:
+      - npm ci
+      - npm run lint
+  - name: audit
+    image: node:20.12.2
+    commands:
+      - npm install -g better-npm-audit
+      - better-npm-audit audit --production --level=moderate
+  - name: docker-dry-run
+    image: plugins/docker:20.17.3
+    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:20.17.3
-    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:1.7.5
+    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:3.0.2-debian
+  - name: lint
+    image: node:20.12.2
+    commands:
+      - npm ci
+      - npm run lint
+  - name: docker-publish
+    image: plugins/docker:20.17.3
+    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"

.eslintrc.js

@@ -8,10 +8,13 @@ module.exports = {
     'eslint:recommended'
   ],
   parserOptions: {
-    parser: 'babel-eslint'
+    parser: '@babel/eslint-parser'
   },
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'vue/multi-word-component-names': 'off',
+    'vue/no-useless-template-attributes': 'off',
+    'vue/no-reserved-component-names': 'off'
   }
 }

Dockerfile

@@ -2,19 +2,27 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-FROM node:14-alpine as builder
+FROM node:20.12.2-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
 
 
-FROM nginx as ki-frontend
+FROM nginx:1.24-alpine 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 .

README.md

@@ -41,6 +41,14 @@ Folgende Kanäle gibt es für die Kommunikation über das Kompetenzinventar:
 npm ci
 ```
 
+### Pre requirements
+
+* Node 20
+  * Wenn du eine andere node version installiert hast, kannst du [nvm](https://github.com/nvm-sh/nvm) benutzen um schnell zwischen node version zu wechseln
+* NPM
+* (KI-backend)[https://git.wtf-eg.de/kompetenzinventar/ki-backend] muss lokal laufen
+
+
 ### Konfigurationsdatei anpassen
 
 ```
@@ -48,7 +56,6 @@ cp public/config.js.dev public/config.js
 vi public/config.js
 ```
 
-
 ### Compiles and hot-reloads for development
 ```
 npm run serve

etc/nginx/conf.d/default.conf

@@ -9,10 +9,24 @@ server {
 
     #access_log  /var/log/nginx/host.access.log  main;
 
+    root   /usr/share/nginx/html;
+
+    # routes without dots serve the index.html without caching
     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;

package.json

@@ -1,28 +1,28 @@
 {
   "name": "@wtf/ki-frontend",
-  "version": "0.1.0",
+  "version": "1.1.0",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.5.0",
+    "@babel/eslint-parser": "7.23.10",
-    "@vue/cli-plugin-eslint": "^4.5.0",
+    "@vue/cli-plugin-babel": "~5.0.8",
-    "@vue/cli-plugin-router": "^4.5.0",
+    "@vue/cli-plugin-eslint": "~5.0.8",
-    "@vue/cli-service": "^4.5.0",
+    "@vue/cli-plugin-router": "~5.0.8",
-    "@vue/compiler-sfc": "^3.0.0",
+    "@vue/cli-service": "~5.0.8",
-    "babel-eslint": "^10.1.0",
+    "@vue/compiler-sfc": "^3.4.19",
-    "bootstrap": "^5.0.1",
+    "bootstrap": "^5.3.3",
-    "bootstrap-icons": "^1.5.0",
+    "bootstrap-icons": "^1.11.3",
-    "core-js": "^3.6.5",
+    "core-js": "^3.38.1",
-    "eslint": "^6.7.2",
+    "eslint": "^7.32.0",
-    "eslint-plugin-vue": "^7.0.0",
+    "eslint-plugin-vue": "^9.27.0",
-    "sass": "^1.37.5",
+    "sass": "^1.77.8",
-    "sass-loader": "^10.2.0",
+    "sass-loader": "^14.2.1",
-    "v-tooltip": "^4.0.0-alpha.1",
+    "v-tooltip": "^4.0.0-beta.17",
-    "vue": "^3.0.0",
+    "vue": "^3.4.0",
-    "vue-router": "^4.0.0-0",
+    "vue-router": "^4.4.3",
-    "vuex": "^4.0.2"
+    "vuex": "^4.1.0"
   }
 }

src/components/AutoComplete.vue

@@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
     @update-values="this.$emit('update-values', this.values)"
   >
   </profile-list>
-  <div v-bind="$attrs" class="card-body">
+  <div v-bind="$attrs" class="card-body bg-white">
     <div class="row">
       <div class="col-12 col-md-4 col-lg-3 col-xl-2">
         <div class="form-control-plaintext form-control-sm">Eintrag hinzufügen:</div>
@@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
         <div v-if="searchResults">
           <ul class="list-group">
             <li
-              class="list-group-item"
+              class="list-group-item bg-white"
               v-for="result in searchResults"
               :key="result.id"
               @click="addResult(result)"

src/components/Paginator.vue

@@ -14,6 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
     >
       <span
         class="page-link pointer"
+        :class="{ 'bg-white': page !== current }"
         @click="onPageClicked(page)"
       >
         {{ page }}

src/components/ProfileList.vue

@@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 <template>
   <ul class="list-group list-group-flush">
     <li
-      class="list-group-item"
+      class="list-group-item bg-white"
       v-for="(value, valueKey) in values"
       :key="value.id"
     >

src/components/SearchResult.vue

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
     class="text-decoration-none d-flex"
     :to="{ path: `/s/profile/${profile.user_id}` }"
   >
-    <div class="card w-100">
+    <div class="card w-100 bg-white">
       <div class="card-body d-flex">
         <div class="d-flex align-items-center justify-content-center me-3">
           <Avatar :name="profile.nickname"/>

src/components/profile/Section.vue

@@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
     </h3>
     <div class="card w-100">
       <slot name="card-body">
-        <div class="card-body">
+        <div class="card-body bg-white">
           <slot></slot>
         </div>
       </slot>

src/mixins/request.mixin.js

@@ -95,10 +95,11 @@ export default {
         console.error(error);
       }
     },
-    async submitFormEdit() {
+    async submitFormEdit(isProfileVisible) {
       this.showErrorMessage = false
       this.showSuccessMessage = false
       const userId = store.state.currentUserId
+      this.profile.visible = isProfileVisible;
 
       try {
         const body = JSON.stringify(this.profile)

src/views/profile/Edit.vue

@@ -12,25 +12,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
       </div>
     </div>
     <div class="container">
-      <form @submit.prevent="submitFormEdit()">
+      <form @submit.prevent="submitFormEdit(false)">
         <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>
@@ -184,7 +167,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
             </Section>
 
             <Section title="Sonstiges">
-              <div class="mb-3">
+              <div class="mb-3 bg-white">
                 <label class="form-label">Über mich</label>
                 <textarea
                   class="form-control"
@@ -223,10 +206,16 @@ SPDX-License-Identifier: AGPL-3.0-or-later
               Gespeichert
             </div>
             <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>
           </div>
         </div>