diff --git a/package-lock.json b/package-lock.json index ba765f14..62ac6635 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1486,6 +1486,21 @@ "@fortawesome/fontawesome-common-types": "^0.2.32" } }, + "@fortawesome/free-brands-svg-icons": { + "version": "5.15.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.15.2.tgz", + "integrity": "sha512-YPlVjE1cEO+OJ9I9ay3TQ3I88+XkxMTYwnnddqAboxLhPNGncsHV0DjWOVLCyuAY66yPfyndWwVn4v7vuqsO1g==", + "requires": { + "@fortawesome/fontawesome-common-types": "^0.2.34" + }, + "dependencies": { + "@fortawesome/fontawesome-common-types": { + "version": "0.2.34", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.34.tgz", + "integrity": "sha512-XcIn3iYbTEzGIxD0/dY5+4f019jIcEIWBiHc3KrmK/ROahwxmZ/s+tdj97p/5K0klz4zZUiMfUlYP0ajhSJjmA==" + } + } + }, "@fortawesome/free-solid-svg-icons": { "version": "5.15.1", "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.1.tgz", diff --git a/package.json b/package.json index 946a5024..a7123baa 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ }, "dependencies": { "@fortawesome/fontawesome-svg-core": "^1.2.32", + "@fortawesome/free-brands-svg-icons": "^5.15.2", "@fortawesome/free-solid-svg-icons": "^5.15.1", "@fortawesome/vue-fontawesome": "^2.0.2", "@silvermine/videojs-quality-selector": "^1.2.4", diff --git a/src/renderer/main.js b/src/renderer/main.js index d22bf026..185cd90f 100644 --- a/src/renderer/main.js +++ b/src/renderer/main.js @@ -6,6 +6,7 @@ import store from './store/index' // import 'material-design-icons/iconfont/material-icons.css' import { library } from '@fortawesome/fontawesome-svg-core' import { fas } from '@fortawesome/free-solid-svg-icons' +import { fab } from '@fortawesome/free-brands-svg-icons' import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome' import VueI18n from 'vue-i18n' import yaml from 'js-yaml' @@ -18,6 +19,7 @@ Vue.config.performance = isDev Vue.config.productionTip = isDev library.add(fas) +library.add(fab) Vue.component('FontAwesomeIcon', FontAwesomeIcon) Vue.use(VueI18n) diff --git a/src/renderer/views/About/About.css b/src/renderer/views/About/About.css index 3aa62187..9dd5bac1 100644 --- a/src/renderer/views/About/About.css +++ b/src/renderer/views/About/About.css @@ -1,7 +1,8 @@ .card { width: 85%; margin: 0 auto; - margin-bottom: 60px; + margin-bottom: 10px; + word-wrap: break-word; } .logo { diff --git a/src/renderer/views/About/About.js b/src/renderer/views/About/About.js index 78518276..a425ff92 100644 --- a/src/renderer/views/About/About.js +++ b/src/renderer/views/About/About.js @@ -1,6 +1,7 @@ import Vue from 'vue' import FtCard from '../../components/ft-card/ft-card.vue' import FtElementList from '../../components/ft-element-list/ft-element-list.vue' +import FtButton from '../../components/ft-button/ft-button.vue' const { version } = require('../../../../package.json') @@ -8,13 +9,25 @@ export default Vue.extend({ name: 'About', components: { 'ft-card': FtCard, - 'ft-element-list': FtElementList + 'ft-element-list': FtElementList, + 'ft-button': FtButton }, data: function () { return { versionNumber: `v${version}` } }, - mounted: function () { + computed: { + usingElectron: function () { + return this.$store.getters.getUsingElectron + } + }, + methods: { + openUrl: function (url) { + if (this.usingElectron) { + const shell = require('electron').shell + shell.openExternal(url) + } + } } }) diff --git a/src/renderer/views/About/About.vue b/src/renderer/views/About/About.vue index 3b1ee272..14ce38eb 100644 --- a/src/renderer/views/About/About.vue +++ b/src/renderer/views/About/About.vue @@ -2,60 +2,114 @@

- About + {{ $t("About.About") }}

- {{ versionNumber }} Beta + {{ versionNumber }} {{ $t("About.Beta") }}

+

+ {{ $t("About.License") }}: + AGPLv3 +

+ + +

+ {{ $t("About.Contact") }} +

  FreeTubeApp@protonmail.com

-

- This software is FOSS and released under the - GNU Affero General Public License v3.0. -

-

- Found a bug? Want to suggest a feature? Want to help out? Check out our - GitHub - page. Pull requests are welcome. -

-

- Thank you very much to the - People and Projects - that make FreeTube possible! -

-

- Want to chat? Join our - Element / Matrix Server - . Please check the - rules - before joining. -

-

- Looking for help? Check out our - Wiki - page. -

-

- Check out our - Firefox - extension! -

-

- If you enjoy using FreeTube, consider donating via - Liberapay - or through our Bitcoin address. -

-

- BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS -

+

+ +   @FreeTube@mastodon.technology +

+

+ +   #freetube:matrix.org ({{ $t("About.Channel Rules") }}) +

+ + +

+ {{ $t("About.Help") }} +

+ + + + + +

+ {{ $t("About.Useful Links") }} +

+ + + + + + + + +

+ {{ $t("About.Donate") }} +

+

+ +   Liberapay +

+

+ +   BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS +

+

+ +   XMR: 48WyAPdjwc6VokeXACxSZCFeKEXBiYPV6GjfvBsfg4CrUJ95LLCQSfpM9pvNKy5GE5H4hNaw99P8RZyzmaU9kb1pD7kzhCB +

diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml index a4a710b5..22dd60b3 100644 --- a/static/locales/en-US.yaml +++ b/static/locales/en-US.yaml @@ -282,32 +282,23 @@ Settings: About: #On About page About: About - #& About - 'This software is FOSS and released under the GNU Affero General Public License v3.0.': This - copylefted software is freely licensed AGPL-3.0. - - 'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >- - Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub - page. Pull requests welcome. - - Thank you very much to the People and Projects that make FreeTube possible!: Thank - you very much to the People and Projects that make FreeTube possible! - - 'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': Want - to chat? Join our Element / Matrix Server . Please check the rules before joining. - - 'Looking for help? Check out our Wiki page.': Looking for help? Check out our Wiki - page. - - Check out our Firefox extension!: Check out our Firefox extension! - - 'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': If - you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin - address. - - #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS' - - Latest FreeTube News: Latest FreeTube News + Contact: Contact + Help: Help + Useful Links: Useful Links + Donate: Donate + Beta: Beta + License: License + Email: Email + Channel Rules: Channel Rules + Report an Issue: Report an Issue + Wiki: Wiki + FAQ: FAQ + Credits: Credits + Blog: Blog + Release Notes: Release Notes + Source Code: Source Code + Website: Website + Translate via Weblate: Translate via Weblate Profile: Profile Select: Profile Select diff --git a/static/locales/en_GB.yaml b/static/locales/en_GB.yaml index 1631b101..14888422 100644 --- a/static/locales/en_GB.yaml +++ b/static/locales/en_GB.yaml @@ -282,33 +282,24 @@ Settings: the changes? About: #On About page - About: 'About' - #& About - 'This software is FOSS and released under the GNU Affero General Public License v3.0.': 'This - copylefted software is freely licenced AGPL-3.0.' - - 'Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub page. Pull requests are welcome.': >- - Found a bug? Want to suggest a feature? Want to help out? Check out our GitHub - page. Pull requests welcome. - - Thank you very much to the People and Projects that make FreeTube possible!: 'Thank - you very much to the People and Projects that make FreeTube possible!' - - 'Want to chat? Join our Element / Matrix Server . Please check the rules before joining.': 'Want - to chat? Join our Element / Matrix Server . Please check the rules before joining.' - - 'Looking for help? Check out our Wiki page.': 'Looking for help? Check out our Wiki - page.' - - Check out our Firefox extension!: 'Check out our Firefox extension!' - - 'If you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin address.': 'If - you enjoy using FreeTube, consider donating via Liberapay or through our Bitcoin - address.' - - #~ 'BTC: 1Lih7Ho5gnxb1CwPD4o59ss78pwo2T91eS' - - Latest FreeTube News: 'Latest FreeTube News' + About: About + Contact: Contact + Help: Help + Useful Links: Useful Links + Donate: Donate + Beta: Beta + License: License + Email: Email + Channel Rules: Channel Rules + Report an Issue: Report an Issue + Wiki: Wiki + FAQ: FAQ + Credits: Credits + Blog: Blog + Release Notes: Release Notes + Source Code: Source Code + Website: Website + Translate via Weblate: Translate via Weblate Profile: Profile Select: 'Profile Select'