diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist index 91e37b594..9a9d57b4c 100644 --- a/deployment/bare_metal/.env.dist +++ b/deployment/bare_metal/.env.dist @@ -47,6 +47,15 @@ KLICKTIPP_APIKEY_EN= GRAPHQL_URI=https://stage1.gradido.net/graphql ADMIN_AUTH_URL=https://stage1.gradido.net/admin/authenticate?token={token} +META_URL=http://localhost +META_TITLE_DE="Gradido – Dein Dankbarkeitskonto" +META_TITLE_EN="Gradido - Your gratitude account" +META_DESCRIPTION_DE="Dankbarkeit ist die Währung der neuen Zeit. Immer mehr Menschen entfalten ihr Potenzial und gestalten eine gute Zukunft für alle." +META_DESCRIPTION_EN="Gratitude is the currency of the new age. More and more people are unleashing their potential and shaping a good future for all." +META_KEYWORDS_DE="Grundeinkommen, Währung, Dankbarkeit, Schenk-Ökonomie, Natürliche Ökonomie des Lebens, Ökonomie, Ökologie, Potenzialentfaltung, Schenken und Danken, Kreislauf des Lebens, Geldsystem" +META_KEYWORDS_EN="Basic Income, Currency, Gratitude, Gift Economy, Natural Economy of Life, Economy, Ecology, Potential Development, Giving and Thanking, Cycle of Life, Monetary System" +META_AUTHOR="Bernd Hückstädt - Gradido-Akademie" + # admin WALLET_AUTH_URL=https://stage1.gradido.net/authenticate?token={token} WALLET_URL=https://stage1.gradido.net/login \ No newline at end of file diff --git a/frontend/.env.dist b/frontend/.env.dist index f7bda826a..0de8c6252 100644 --- a/frontend/.env.dist +++ b/frontend/.env.dist @@ -1,3 +1,11 @@ +META_URL=http://localhost +META_TITLE_DE="Gradido – Dein Dankbarkeitskonto" +META_TITLE_EN="Gradido - Your gratitude account" +META_DESCRIPTION_DE="Dankbarkeit ist die Währung der neuen Zeit. Immer mehr Menschen entfalten ihr Potenzial und gestalten eine gute Zukunft für alle." +META_DESCRIPTION_EN="Gratitude is the currency of the new age. More and more people are unleashing their potential and shaping a good future for all." +META_KEYWORDS_DE="Grundeinkommen, Währung, Dankbarkeit, Schenk-Ökonomie, Natürliche Ökonomie des Lebens, Ökonomie, Ökologie, Potenzialentfaltung, Schenken und Danken, Kreislauf des Lebens, Geldsystem" +META_KEYWORDS_EN="Basic Income, Currency, Gratitude, Gift Economy, Natural Economy of Life, Economy, Ecology, Potential Development, Giving and Thanking, Cycle of Life, Monetary System" +META_AUTHOR="Bernd Hückstädt - Gradido-Akademie" GRAPHQL_URI=http://localhost/graphql DEFAULT_PUBLISHER_ID=2896 ADMIN_AUTH_URL=http://localhost/admin/authenticate?token={token} \ No newline at end of file diff --git a/frontend/.env.template b/frontend/.env.template index 8c9c053cc..1eef43cef 100644 --- a/frontend/.env.template +++ b/frontend/.env.template @@ -1,3 +1,11 @@ +META_URL=$META_URL +META_TITLE_DE=$META_TITLE_DE +META_TITLE_EN=$META_TITLE_EN +META_DESCRIPTION_DE=$META_DESCRIPTION_DE +META_DESCRIPTION_EN=$META_DESCRIPTION_EN +META_KEYWORDS_DE=$META_KEYWORDS_DE +META_KEYWORDS_EN=$META_KEYWORDS_EN +META_AUTHOR=$META_AUTHOR GRAPHQL_URI=$GRAPHQL_URI DEFAULT_PUBLISHER_ID=2896 ADMIN_AUTH_URL=$ADMIN_AUTH_URL \ No newline at end of file diff --git a/frontend/package.json b/frontend/package.json index cbb6e01b7..69c843bf5 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -85,6 +85,7 @@ "stylelint-config-recommended-vue": "^1.3.0", "stylelint-config-standard-scss": "^3.0.0", "vue-cli-plugin-i18n": "^1.0.1", + "vue-html-webpack-plugin": "^3.2.2", "vue-template-compiler": "^2.6.11", "webpack-bundle-analyzer": "^4.5.0" }, diff --git a/frontend/public/img/gradido-wallet-650-400.jpg b/frontend/public/img/gradido-wallet-650-400.jpg new file mode 100644 index 000000000..b851460a2 Binary files /dev/null and b/frontend/public/img/gradido-wallet-650-400.jpg differ diff --git a/frontend/public/index.html b/frontend/public/index.html index 4aad83f03..a15b46916 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -1,7 +1,7 @@ + + + + + + + + + + + + + +
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js index 7e213e1d9..eaa1e7f3d 100644 --- a/frontend/src/config/index.js +++ b/frontend/src/config/index.js @@ -18,6 +18,25 @@ const environment = { DEFAULT_PUBLISHER_ID: process.env.DEFAULT_PUBLISHER_ID || 2896, } +// const meta = { +// META_URL: process.env.META_URL || 'http://localhost', +// META_TITLE_DE: process.env.META_TITLE_DE || 'Gradido – Dein Dankbarkeitskonto', +// META_TITLE_EN: process.env.META_TITLE_EN || 'Gradido - Your gratitude account', +// META_DESCRIPTION_DE: +// process.env.META_DESCRIPTION_DE || +// 'Dankbarkeit ist die Währung der neuen Zeit. Immer mehr Menschen entfalten ihr Potenzial und gestalten eine gute Zukunft für alle.', +// META_DESCRIPTION_EN: +// process.env.META_DESCRIPTION_EN || +// 'Gratitude is the currency of the new age. More and more people are unleashing their potential and shaping a good future for all.', +// META_KEYWORDS_DE: +// process.env.META_KEYWORDS_DE || +// 'Grundeinkommen, Währung, Dankbarkeit, Schenk-Ökonomie, Natürliche Ökonomie des Lebens, Ökonomie, Ökologie, Potenzialentfaltung, Schenken und Danken, Kreislauf des Lebens, Geldsystem', +// META_KEYWORDS_EN: +// process.env.META_KEYWORDS_EN || +// 'Basic Income, Currency, Gratitude, Gift Economy, Natural Economy of Life, Economy, Ecology, Potential Development, Giving and Thanking, Cycle of Life, Monetary System', +// META_AUTHOR: process.env.META_AUTHOR || 'Bernd Hückstädt - Gradido-Akademie', +// } + const endpoints = { GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost/graphql', ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token={token}', diff --git a/frontend/vue.config.js b/frontend/vue.config.js index 47b016aea..133f90846 100644 --- a/frontend/vue.config.js +++ b/frontend/vue.config.js @@ -2,6 +2,7 @@ const path = require('path') const webpack = require('webpack') const Dotenv = require('dotenv-webpack') const StatsPlugin = require('stats-webpack-plugin') +const HtmlWebpackPlugin = require('vue-html-webpack-plugin') // vue.config.js module.exports = { @@ -38,6 +39,20 @@ module.exports = { }), // generate webpack stats to allow analysis of the bundlesize new StatsPlugin('webpack.stats.json'), + new HtmlWebpackPlugin({ + vue: true, + template: 'public/index.html', + meta: { + title_de: process.env.META_TITLE_DE, + title_en: process.env.META_TITLE_EN, + description_de: process.env.META_DESCRIPTION_DE, + description_en: process.env.META_DESCRIPTION_EN, + keywords_de: process.env.META_KEYWORDS_DE, + keywords_en: process.env.META_KEYWORDS_EN, + author: process.env.META_AUTHOR, + url: process.env.META_URL, + }, + }), ], infrastructureLogging: { level: 'warn', // 'none' | 'error' | 'warn' | 'info' | 'log' | 'verbose' diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 8605777c4..d0c486d4e 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -14364,6 +14364,19 @@ vue-hot-reload-api@^2.3.0: resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== +vue-html-webpack-plugin@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/vue-html-webpack-plugin/-/vue-html-webpack-plugin-3.2.2.tgz#df1499f05bcdf22c2e7040fa760fb0f5de66beea" + integrity sha512-C1qz9hxxrzvPSkpr59GHY8oh0U6TUuKYkhRg47pcYoq8D7JQKDGON8xsI6LYudVKGowcPj8GulfdHsp0Cc1gJA== + dependencies: + html-minifier "^3.2.3" + loader-utils "^0.2.16" + lodash "^4.17.3" + pretty-error "^2.0.2" + tapable "^1.0.0" + toposort "^1.0.0" + util.promisify "1.0.0" + vue-i18n-extract@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/vue-i18n-extract/-/vue-i18n-extract-1.0.2.tgz#0a136e12d1634d6799e187aad81a7003d02f67a5"