diff --git a/.drone.yml b/.drone.yml index 2cb7cbf..670e327 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,6 +7,8 @@ type: docker name: default steps: +- name: reuse + image: fsfe/reuse:latest - name: docker-publish image: plugins/docker settings: diff --git a/.gitignore b/.gitignore index 5c0d718..361c1a3 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ pnpm-debug.log* *.njsproj *.sln *.sw? +jsconfig.json diff --git a/.reuse/dep5 b/.reuse/dep5 index 16c06ba..688310d 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -3,8 +3,26 @@ Upstream-Name: ki-frontend Upstream-Contact: Scammo Source: https://git.wtf-eg.de/kompetenzinventar/ki-frontend -# Sample paragraph, commented out: -# -# Files: src/* -# Copyright: $YEAR $NAME <$CONTACT> -# License: ... +Files: package.json package-lock.json +Copyright: WTF Kooperative eG +License: AGPL-3.0-or-later + +Files: .browserslistrc .dockerignore .eslintrc.js .gitignore +Copyright: WTF Kooperative eG +License: AGPL-3.0-or-later + +Files: src/assets/img/wtf_logo* +Copyright: WTF Kooperative eG +License: LicenseRef-WTF + +Files: src/assets/language_level.json src/assets/skill_level.json +Copyright: WTF Kooperative eG +License: AGPL-3.0-or-later + +Files: public/img/bootstrap-icons-1.5.0/* +Copyright: Copyright (c) 2019-2020 The Bootstrap Authors +License: MIT + +Files: public/fonts/Lato* +Copyright: 2010-2015, Łukasz Dziedzic (dziedzic@typoland.com) +License: OFL-1.1-RFN diff --git a/Dockerfile b/Dockerfile index 32033ec..62199ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: WTF Kooperative eG +# +# SPDX-License-Identifier: AGPL-3.0-or-later + FROM node:14-alpine as builder COPY . ./ @@ -8,3 +12,4 @@ 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 diff --git a/LICENSES/LicenseRef-WTF.txt b/LICENSES/LicenseRef-WTF.txt new file mode 100644 index 0000000..200df4a --- /dev/null +++ b/LICENSES/LicenseRef-WTF.txt @@ -0,0 +1 @@ +Alle Rechte vorbehalten diff --git a/LICENSES/OFL-1.1-RFN.txt b/LICENSES/OFL-1.1-RFN.txt new file mode 100644 index 0000000..6fe84ee --- /dev/null +++ b/LICENSES/OFL-1.1-RFN.txt @@ -0,0 +1,43 @@ +SIL OPEN FONT LICENSE + +Version 1.1 - 26 February 2007 + +PREAMBLE + +The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives. + +DEFINITIONS + +"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the copyright statement(s). + +"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, or substituting — in part or in whole — any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS + +Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission. + +5) The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software. + +TERMINATION + +This license becomes null and void if any of the above conditions are not met. + +DISCLAIMER + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/README.md b/README.md index a91b106..2580adf 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,13 @@ + + # ki-frontend [![Build Status](https://drone.wtf-eg.de/api/badges/kompetenzinventar/ki-frontend/status.svg)](https://drone.wtf-eg.de/kompetenzinventar/ki-frontend) +[![REUSE status](https://api.reuse.software/badge/git.wtf-eg.de/kompetenzinventar/ki-frontend)](https://api.reuse.software/info/git.wtf-eg.de/kompetenzinventar/ki-frontend) ## Über diff --git a/babel.config.js b/babel.config.js index e955840..78befaf 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: WTF Kooperative eG +// +// SPDX-License-Identifier: AGPL-3.0-or-later + module.exports = { presets: [ '@vue/cli-plugin-babel/preset' diff --git a/etc/nginx/conf.d/default.conf b/etc/nginx/conf.d/default.conf new file mode 100644 index 0000000..8b91bec --- /dev/null +++ b/etc/nginx/conf.d/default.conf @@ -0,0 +1,49 @@ +# SPDX-FileCopyrightText: WTF Kooperative eG +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +server { + listen 80; + listen [::]:80; + server_name localhost; + + #access_log /var/log/nginx/host.access.log main; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + try_files $uri $uri/ /index.html; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} +} diff --git a/package-lock.json b/package-lock.json index 40e3980..5ce9315 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,6 @@ "@vue/cli-plugin-router": "~4.5.0", "@vue/cli-service": "~4.5.0", "@vue/compiler-sfc": "^3.0.0", - "axios": "^0.21.1", "babel-eslint": "^10.1.0", "bootstrap": "^5.0.1", "core-js": "^3.6.5", @@ -22,7 +21,8 @@ "sass": "^1.37.5", "sass-loader": "^10.2.0", "vue": "^3.0.0", - "vue-router": "^4.0.0-0" + "vue-router": "^4.0.0-0", + "vuex": "^4.0.2" } }, "node_modules/@babel/code-frame": { @@ -1209,6 +1209,17 @@ "node": ">= 6" } }, + "node_modules/@popperjs/core": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.1.tgz", + "integrity": "sha512-HnUhk1Sy9IuKrxEMdIRCxpIqPw6BFsbYSEUO9p/hNw5sMld/+3OLMWQP80F8/db9qsv3qUjs7ZR5bS/R+iinXw==", + "dev": true, + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@soda/friendly-errors-webpack-plugin": { "version": "1.8.0", "resolved": "https://registry.npm.taobao.org/@soda/friendly-errors-webpack-plugin/download/@soda/friendly-errors-webpack-plugin-1.8.0.tgz?cache=0&sync_timestamp=1607927625608&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40soda%2Ffriendly-errors-webpack-plugin%2Fdownload%2F%40soda%2Ffriendly-errors-webpack-plugin-1.8.0.tgz", @@ -2576,15 +2587,6 @@ "integrity": "sha1-1h9G2DslGSUOJ4Ta9bCUeai0HFk=", "dev": true }, - "node_modules/axios": { - "version": "0.21.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", - "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", - "dev": true, - "dependencies": { - "follow-redirects": "^1.10.0" - } - }, "node_modules/babel-eslint": { "version": "10.1.0", "resolved": "https://registry.npm.taobao.org/babel-eslint/download/babel-eslint-10.1.0.tgz", @@ -2840,10 +2842,17 @@ "dev": true }, "node_modules/bootstrap": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.1.tgz", - "integrity": "sha512-Fl79+wsLOZKoiU345KeEaWD0ik8WKRI5zm0YSPj2oF1Qr+BO7z0fco6GbUtqjoG1h4VI89PeKJnMsMMVQdKKTw==", - "dev": true + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.1.tgz", + "integrity": "sha512-/jUa4sSuDZWlDLQ1gwQQR8uoYSvLJzDd8m5o6bPKh3asLAMYVZKdRCjb1joUd5WXf0WwCNzd2EjwQQhupou0dA==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + }, + "peerDependencies": { + "@popperjs/core": "^2.10.1" + } }, "node_modules/brace-expansion": { "version": "1.1.11", @@ -13327,6 +13336,18 @@ "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=", "dev": true }, + "node_modules/vuex": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.0.2.tgz", + "integrity": "sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==", + "dev": true, + "dependencies": { + "@vue/devtools-api": "^6.0.0-beta.11" + }, + "peerDependencies": { + "vue": "^3.0.2" + } + }, "node_modules/watchpack": { "version": "1.7.5", "resolved": "https://registry.nlark.com/watchpack/download/watchpack-1.7.5.tgz?cache=0&sync_timestamp=1621437900992&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwatchpack%2Fdownload%2Fwatchpack-1.7.5.tgz", @@ -15629,6 +15650,13 @@ "integrity": "sha1-K1o6s/kYzKSKjHVMCBaOPwPrphs=", "dev": true }, + "@popperjs/core": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.1.tgz", + "integrity": "sha512-HnUhk1Sy9IuKrxEMdIRCxpIqPw6BFsbYSEUO9p/hNw5sMld/+3OLMWQP80F8/db9qsv3qUjs7ZR5bS/R+iinXw==", + "dev": true, + "peer": true + }, "@soda/friendly-errors-webpack-plugin": { "version": "1.8.0", "resolved": "https://registry.npm.taobao.org/@soda/friendly-errors-webpack-plugin/download/@soda/friendly-errors-webpack-plugin-1.8.0.tgz?cache=0&sync_timestamp=1607927625608&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40soda%2Ffriendly-errors-webpack-plugin%2Fdownload%2F%40soda%2Ffriendly-errors-webpack-plugin-1.8.0.tgz", @@ -16887,15 +16915,6 @@ "integrity": "sha1-1h9G2DslGSUOJ4Ta9bCUeai0HFk=", "dev": true }, - "axios": { - "version": "0.21.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", - "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", - "dev": true, - "requires": { - "follow-redirects": "^1.10.0" - } - }, "babel-eslint": { "version": "10.1.0", "resolved": "https://registry.npm.taobao.org/babel-eslint/download/babel-eslint-10.1.0.tgz", @@ -17130,10 +17149,11 @@ "dev": true }, "bootstrap": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.1.tgz", - "integrity": "sha512-Fl79+wsLOZKoiU345KeEaWD0ik8WKRI5zm0YSPj2oF1Qr+BO7z0fco6GbUtqjoG1h4VI89PeKJnMsMMVQdKKTw==", - "dev": true + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.1.tgz", + "integrity": "sha512-/jUa4sSuDZWlDLQ1gwQQR8uoYSvLJzDd8m5o6bPKh3asLAMYVZKdRCjb1joUd5WXf0WwCNzd2EjwQQhupou0dA==", + "dev": true, + "requires": {} }, "brace-expansion": { "version": "1.1.11", @@ -25933,6 +25953,15 @@ "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=", "dev": true }, + "vuex": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.0.2.tgz", + "integrity": "sha512-M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q==", + "dev": true, + "requires": { + "@vue/devtools-api": "^6.0.0-beta.11" + } + }, "watchpack": { "version": "1.7.5", "resolved": "https://registry.nlark.com/watchpack/download/watchpack-1.7.5.tgz?cache=0&sync_timestamp=1621437900992&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwatchpack%2Fdownload%2Fwatchpack-1.7.5.tgz", diff --git a/package.json b/package.json index 0d93fa3..088c008 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "@vue/cli-plugin-router": "~4.5.0", "@vue/cli-service": "~4.5.0", "@vue/compiler-sfc": "^3.0.0", - "axios": "^0.21.1", "babel-eslint": "^10.1.0", "bootstrap": "^5.0.1", "core-js": "^3.6.5", @@ -21,6 +20,7 @@ "sass": "^1.37.5", "sass-loader": "^10.2.0", "vue": "^3.0.0", - "vue-router": "^4.0.0-0" + "vue-router": "^4.0.0-0", + "vuex": "^4.0.2" } } diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png deleted file mode 100644 index 5b05aaf..0000000 --- a/public/apple-touch-icon.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78047c1b779820271298de92cbeaae9fc9be8e7305cc1d04050046dcbeab57bc -size 22506 diff --git a/public/config.js.dev b/public/config.js.dev index 583034c..31f295d 100644 --- a/public/config.js.dev +++ b/public/config.js.dev @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: WTF Kooperative eG +// // SPDX-License-Identifier: AGPL-3.0-or-later + window.ki = { apiUrl: 'http://localhost:5000' } diff --git a/public/config.js.int b/public/config.js.int index 30f1e84..1f864fb 100644 --- a/public/config.js.int +++ b/public/config.js.int @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: WTF Kooperative eG +// // SPDX-License-Identifier: AGPL-3.0-or-later + window.ki = { apiUrl: 'http://localhost:13338' } diff --git a/public/favicon-96x96.png b/public/favicon-96x96.png deleted file mode 100644 index 187af2e..0000000 --- a/public/favicon-96x96.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c943b50d7fc442cf26577f30ca7d71faae3d368cf94d5283cad0395fc724a51b -size 10248 diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index 37ced2e..0000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/public/index.html b/public/index.html index a0bb7df..311fd69 100644 --- a/public/index.html +++ b/public/index.html @@ -1,3 +1,9 @@ + + diff --git a/src/App.vue b/src/App.vue index caf930a..e221db0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,118 +1,25 @@ - + + diff --git a/src/assets/global.scss b/src/assets/global.scss index 9ffe129..204a732 100644 --- a/src/assets/global.scss +++ b/src/assets/global.scss @@ -1,10 +1,12 @@ /* + * SPDX-FileCopyrightText: WTF Kooperative eG + * * SPDX-License-Identifier: AGPL-3.0-or-later */ @import "variables"; @import "bootstrap/scss/bootstrap"; -.container{ - min-height: calc(100vh - 70px - 24px); +.btn-primary { + color: #fff !important; } diff --git a/public/img/wtf_logo.svg b/src/assets/img/wtf_logo.svg similarity index 100% rename from public/img/wtf_logo.svg rename to src/assets/img/wtf_logo.svg diff --git a/src/assets/img/wtf_logo_white.svg b/src/assets/img/wtf_logo_white.svg new file mode 100644 index 0000000..dd3d935 --- /dev/null +++ b/src/assets/img/wtf_logo_white.svg @@ -0,0 +1,100 @@ + + + + + + + + diff --git a/src/assets/variables.scss b/src/assets/variables.scss index 691bc07..2e88ee0 100644 --- a/src/assets/variables.scss +++ b/src/assets/variables.scss @@ -1 +1,16 @@ +/* + * SPDX-FileCopyrightText: WTF Kooperative eG + * + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +$gray-100: #edefeb; +$gray-800: #344b5d; + $primary: #0790a9; +$dark: $gray-800; + +$body-bg: $gray-100; + +$link-decoration: none; +$link-hover-decoration: underline; diff --git a/src/components/AutoComplete.vue b/src/components/AutoComplete.vue index 526de5f..43fd420 100644 --- a/src/components/AutoComplete.vue +++ b/src/components/AutoComplete.vue @@ -1,4 +1,9 @@ - + + + + diff --git a/src/components/ProfileList.vue b/src/components/ProfileList.vue index 26482f8..3aad96e 100644 --- a/src/components/ProfileList.vue +++ b/src/components/ProfileList.vue @@ -1,4 +1,9 @@ - + +