diff --git a/.gitignore b/.gitignore index 20bcb253d..82783fce2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,9 @@ yarn-error.log* test/unit/coverage package-lock.json +.env +.env.development.local +.env.production.local # Editor directories and files .idea diff --git a/README.md b/README.md index e5ac4a2d0..2e5fb18e1 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ +https://gruhn.github.io/vue-qrcode-reader/api/QrcodeStream.html +https://github.com/gruhn/vue-qrcode-reader + +https://bootstrap-vue.org/docs/components/image + + # [BootstrapVue Argon Dashboard](https://demos.creative-tim.com/bootstrap-vue-argon-dashboard/?ref=bvad-github-readme) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=BootstrapVue%20Argon%20Dashboard%20is%20a%20Free%20Bootstrap%20and%Vue.js%20Dashboard%20made%20using%vue-cli%20%E2%9D%A4%EF%B8%8F%0Ahttps%3A//demos.creative-tim.com/bootstrap-vue-argon-dashboard%20%vue.js%20%23vue-cli%20%23argon%20%23argondesign%20%23angulardashboard%20%23argonvue%20%23vuedesign%20%23bootstrap%20%23design%20%23uikit%20%23freebie%20%20via%20%40CreativeTim) diff --git a/package.json b/package.json index 5acb7ca86..62c60bf2a 100755 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "vue-chartjs": "^3.5.0", "vue-clipboard2": "^0.3.0", "vue-flatpickr-component": "^8.1.2", + "vue-qrcode-reader": "^2.3.16", "vue-router": "^3.0.6", "vue2-transitions": "^0.2.3" }, diff --git a/public/favicon.png b/public/favicon.png index 7d8b7d072..db3d73274 100644 Binary files a/public/favicon.png and b/public/favicon.png differ diff --git a/public/img/brand/Gradido-Coin_300_120dpi.png b/public/img/brand/Gradido-Coin_300_120dpi.png new file mode 100644 index 000000000..d7887a4b3 Binary files /dev/null and b/public/img/brand/Gradido-Coin_300_120dpi.png differ diff --git a/public/img/brand/Gradido-Coin_300_120dpi_comic.png b/public/img/brand/Gradido-Coin_300_120dpi_comic.png new file mode 100644 index 000000000..f32b4e922 Binary files /dev/null and b/public/img/brand/Gradido-Coin_300_120dpi_comic.png differ diff --git a/public/img/brand/Gradido-Coin_300_120dpi_cubeb.png b/public/img/brand/Gradido-Coin_300_120dpi_cubeb.png new file mode 100644 index 000000000..e190523bb Binary files /dev/null and b/public/img/brand/Gradido-Coin_300_120dpi_cubeb.png differ diff --git a/public/img/brand/Gradido-Coin_300_120dpi_sw.png b/public/img/brand/Gradido-Coin_300_120dpi_sw.png new file mode 100644 index 000000000..f3bfe05e2 Binary files /dev/null and b/public/img/brand/Gradido-Coin_300_120dpi_sw.png differ diff --git a/public/img/brand/Gradido-Coin_500_175dpi.png b/public/img/brand/Gradido-Coin_500_175dpi.png new file mode 100644 index 000000000..bc7f1ef88 Binary files /dev/null and b/public/img/brand/Gradido-Coin_500_175dpi.png differ diff --git a/public/img/brand/cube.webm b/public/img/brand/cube.webm new file mode 100644 index 000000000..0bfcdad7b Binary files /dev/null and b/public/img/brand/cube.webm differ diff --git a/public/img/brand/favicon.png b/public/img/brand/favicon.png index f8ae7cfcc..7515a34bc 100755 Binary files a/public/img/brand/favicon.png and b/public/img/brand/favicon.png differ diff --git a/public/img/brand/green.png b/public/img/brand/green.png index 2939ccf19..f87e1487d 100644 Binary files a/public/img/brand/green.png and b/public/img/brand/green.png differ diff --git a/public/img/brand/white.png b/public/img/brand/white.png index 2bf86a966..b7181bf1a 100755 Binary files a/public/img/brand/white.png and b/public/img/brand/white.png differ diff --git a/public/img/icons/gradido/minus-low.png b/public/img/icons/gradido/minus-low.png new file mode 100644 index 000000000..5c1f5afed Binary files /dev/null and b/public/img/icons/gradido/minus-low.png differ diff --git a/public/img/icons/gradido/minus.png b/public/img/icons/gradido/minus.png new file mode 100644 index 000000000..b6c40ba22 Binary files /dev/null and b/public/img/icons/gradido/minus.png differ diff --git a/public/img/icons/gradido/my_gradido.png b/public/img/icons/gradido/my_gradido.png new file mode 100644 index 000000000..c5131678e Binary files /dev/null and b/public/img/icons/gradido/my_gradido.png differ diff --git a/public/img/icons/gradido/plus-low.png b/public/img/icons/gradido/plus-low.png new file mode 100644 index 000000000..8ddf8a6fe Binary files /dev/null and b/public/img/icons/gradido/plus-low.png differ diff --git a/public/img/icons/gradido/plus.png b/public/img/icons/gradido/plus.png new file mode 100644 index 000000000..8d22e3b50 Binary files /dev/null and b/public/img/icons/gradido/plus.png differ diff --git a/public/img/icons/gradido/qr-make.png b/public/img/icons/gradido/qr-make.png new file mode 100644 index 000000000..4890498e1 Binary files /dev/null and b/public/img/icons/gradido/qr-make.png differ diff --git a/public/img/icons/gradido/qr-scan-pure.png b/public/img/icons/gradido/qr-scan-pure.png new file mode 100644 index 000000000..88ee90091 Binary files /dev/null and b/public/img/icons/gradido/qr-scan-pure.png differ diff --git a/public/img/icons/gradido/qr-scan.png b/public/img/icons/gradido/qr-scan.png new file mode 100644 index 000000000..ac7185a22 Binary files /dev/null and b/public/img/icons/gradido/qr-scan.png differ diff --git a/src/components/Cards/StatsCard.vue b/src/components/Cards/StatsCard.vue index 6aea2e1f3..919384882 100644 --- a/src/components/Cards/StatsCard.vue +++ b/src/components/Cards/StatsCard.vue @@ -17,6 +17,13 @@ + + + + + + +

@@ -40,6 +47,7 @@ default: 'primary' }, icon: String, + img: String, title: String, subTitle: String, iconClasses: [String, Array] diff --git a/src/views/KontoOverview.vue b/src/views/KontoOverview.vue index 4e58517ea..7a53b8570 100644 --- a/src/views/KontoOverview.vue +++ b/src/views/KontoOverview.vue @@ -7,7 +7,7 @@