From 2312f1039ca46743461400bb00cc5b48540545f2 Mon Sep 17 00:00:00 2001 From: Roman Cervantes Date: Thu, 22 Oct 2020 14:53:41 -0700 Subject: [PATCH 01/25] pro wip --- src/components/PageHeader.vue | 8 ++ src/i18n/en.json | 4 + src/pages/Upgrade.vue | 255 ++++++++++++++++++++++++++++++++++ src/router.js | 9 ++ yarn.lock | 128 +++++++---------- 5 files changed, 326 insertions(+), 78 deletions(-) create mode 100644 src/pages/Upgrade.vue diff --git a/src/components/PageHeader.vue b/src/components/PageHeader.vue index 0ce0ac3d..03832413 100755 --- a/src/components/PageHeader.vue +++ b/src/components/PageHeader.vue @@ -67,6 +67,14 @@ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
StandardPro
Boards3Unlimited
Tags10Unlimited
Filters + + + Board filters + Filter by Tags, Progress, Notes +
Search + + + Search notes +
Deal alerts + In app only + + In app + via email +
Notes + Basic + + Advanced: + + Notes dashboard, search, rich text, upload images, etc... + +
Custom boardsCustom wallpaper
Public profile + + Claim your profile +
List sortingManualAutomatic
Public profile + + Claim your profile +
Public profile + Basic + + + Advanced: + + Claim your profile + custom url +
STEAM INTEGRATION + x + + +
Game Watch (add game to db + , cron querys db and emails results, logs data) + x + + +
CSV Import / Export + x + + +
Track game progress
+ Free + + $4/Mo or $40/yr (save 2 months) +
+ + + Upgrade + + +
+

GamePro enhances your all-in-one Discord voice, video, and text chat.

+

Check out the perks you'll get.

+ + + + + + + Some quick example text to build on the card title + and make up the bulk of the card's content. + + + + + + + + Some quick example text to build on the card title + and make up the bulk of the card's content. + + + + + + + + Some quick example text to build on the card + itle and make up the bulk of the card's content. + + + + +
+ + +
+ + + + + diff --git a/src/router.js b/src/router.js index c429d296..4bdce5be 100755 --- a/src/router.js +++ b/src/router.js @@ -9,6 +9,7 @@ import Account from '@/pages/Account'; import Releases from '@/pages/Releases'; import Auth from '@/pages/Auth'; import Dashboard from '@/pages/Dashboard'; +import Upgrade from '@/pages/Upgrade'; import NotFound from '@/pages/NotFound'; Vue.use(Router); @@ -23,6 +24,14 @@ export default new Router({ title: 'Dashboard', }, }, + { + name: 'upgrade', + path: '/upgrade', + component: Upgrade, + meta: { + title: 'Upgrade', + }, + }, { name: 'boards', path: '/boards', diff --git a/yarn.lock b/yarn.lock index 858d96a9..2294a855 100644 --- a/yarn.lock +++ b/yarn.lock @@ -92,10 +92,10 @@ resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.4.0.tgz#d6716f9fa36a6e340bc0ecfe68af325aa6f60508" integrity sha512-Jj2xW+8+8XPfWGkv9HPv/uR+Qrmq37NPYT352wf7MvE9LrstpLVmFg3LqG6MCRr5miLAom5sen2gZ+iOhVDeRA== -"@firebase/analytics@0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.5.0.tgz#587292ec9a24410ad795a65c07fb1ea238ccef95" - integrity sha512-WyQ8BT6JSoXpg4q7SV9Yg5EPXbGbG8FkkXAIhV/AnslCglhpxegO1FU33qbuT4Grzc525hZJA97oqtQS8tm4Wg== +"@firebase/analytics@0.6.0": + version "0.6.0" + resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.6.0.tgz#49f508d3f9f419f08c503f1171ef5fa1c3ba52eb" + integrity sha512-6qYEOPUVYrMhqvJ46Z5Uf1S4uULd6d7vGpMP5Qz+u8kIWuOQGcPdJKQap+Hla6Rq164or9gC2HRXuYXKlgWfpw== dependencies: "@firebase/analytics-types" "0.4.0" "@firebase/component" "0.1.19" @@ -132,10 +132,10 @@ resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.10.1.tgz#7815e71c9c6f072034415524b29ca8f1d1770660" integrity sha512-/+gBHb1O9x/YlG7inXfxff/6X3BPZt4zgBv4kql6HEmdzNQCodIRlEYnI+/da+lN+dha7PjaFH7C7ewMmfV7rw== -"@firebase/auth@0.14.9": - version "0.14.9" - resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.14.9.tgz#481db24d5bd6eded8ac2e5aea6edb9307040229c" - integrity sha512-PxYa2r5qUEdheXTvqROFrMstK8W4uPiP7NVfp+2Bec+AjY5PxZapCx/YFDLkU0D7YBI82H74PtZrzdJZw7TJ4w== +"@firebase/auth@0.15.0": + version "0.15.0" + resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.15.0.tgz#45d6def6d6d9444432c005710df442991828275f" + integrity sha512-IFuzhxS+HtOQl7+SZ/Mhaghy/zTU7CENsJFWbC16tv2wfLZbayKF5jYGdAU3VFLehgC8KjlcIWd10akc3XivfQ== dependencies: "@firebase/auth-types" "0.10.1" @@ -167,21 +167,21 @@ faye-websocket "0.11.3" tslib "^1.11.1" -"@firebase/firestore-types@1.13.0": - version "1.13.0" - resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-1.13.0.tgz#4ab9c40e1e66e8193a929460d64507acd07d9230" - integrity sha512-QF5CAuYOHE6Zbsn1uEg6wkl836iP+i6C0C/Zs3kF60eebxZvTWp8JSZk19Ar+jj4w+ye8/7H5olu5CqDNjWpEA== +"@firebase/firestore-types@1.14.0": + version "1.14.0" + resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-1.14.0.tgz#4516249d3c181849fd3c856831944dbd5c8c55fc" + integrity sha512-WF8IBwHzZDhwyOgQnmB0pheVrLNP78A8PGxk1nxb/Nrgh1amo4/zYvFMGgSsTeaQK37xMYS/g7eS948te/dJxw== -"@firebase/firestore@1.17.1": - version "1.17.1" - resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-1.17.1.tgz#fba94eef755e48b6aa31a586311e3f0a946aafe5" - integrity sha512-FJlNmFIBr9wrkA5g9JBPJWPmxYIzUhBDfsJGHNTUCxMbwm12pz/1Y6CW56kvZOgl6l+iPNlF911iduUDFzNUqw== +"@firebase/firestore@1.18.0": + version "1.18.0" + resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-1.18.0.tgz#3430e8c60d3e6be1d174b3a258838b1944c93a4d" + integrity sha512-maMq4ltkrwjDRusR2nt0qS4wldHQMp+0IDSfXIjC+SNmjnWY/t/+Skn9U3Po+dB38xpz3i7nsKbs+8utpDnPSw== dependencies: "@firebase/component" "0.1.19" - "@firebase/firestore-types" "1.13.0" + "@firebase/firestore-types" "1.14.0" "@firebase/logger" "0.2.6" "@firebase/util" "0.3.2" - "@firebase/webchannel-wrapper" "0.3.0" + "@firebase/webchannel-wrapper" "0.4.0" "@grpc/grpc-js" "^1.0.0" "@grpc/proto-loader" "^0.5.0" node-fetch "2.6.1" @@ -192,15 +192,15 @@ resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.3.17.tgz#348bf5528b238eeeeeae1d52e8ca547b21d33a94" integrity sha512-DGR4i3VI55KnYk4IxrIw7+VG7Q3gA65azHnZxo98Il8IvYLr2UTBlSh72dTLlDf25NW51HqvJgYJDKvSaAeyHQ== -"@firebase/functions@0.4.51": - version "0.4.51" - resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.4.51.tgz#97be571cfe3b9ee3bf289b9dc5194e3ae49a4819" - integrity sha512-PPx8eZcr4eoU9BITOUGUVurs4WZu8Thj3uCWx766dU3mV1W/7kRgtiptmW0XJUB18FZ1PT3+Hadd6V6vjtLgYw== +"@firebase/functions@0.5.1": + version "0.5.1" + resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.5.1.tgz#fa0568bdcdf7dfa7e5f4f66c1e06e376dc7e25b6" + integrity sha512-yyjPZXXvzFPjkGRSqFVS5Hc2Y7Y48GyyMH+M3i7hLGe69r/59w6wzgXKqTiSYmyE1pxfjxU4a1YqBDHNkQkrYQ== dependencies: "@firebase/component" "0.1.19" "@firebase/functions-types" "0.3.17" "@firebase/messaging-types" "0.5.0" - isomorphic-fetch "2.2.1" + node-fetch "2.6.1" tslib "^1.11.1" "@firebase/installations-types@0.3.4": @@ -246,10 +246,10 @@ resolved "https://registry.yarnpkg.com/@firebase/performance-types/-/performance-types-0.0.13.tgz#58ce5453f57e34b18186f74ef11550dfc558ede6" integrity sha512-6fZfIGjQpwo9S5OzMpPyqgYAUZcFzZxHFqOyNtorDIgNXq33nlldTL/vtaUZA8iT9TT5cJlCrF/jthKU7X21EA== -"@firebase/performance@0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.4.1.tgz#4e78f406ef2bc0eec2ce67cdfc57a53a55c31476" - integrity sha512-eAqS3/456xnUwuTg4w58x2fYbvTtQpgt67lpBUX3DuhOqwiM8+JELRte52nDgum2lTaTZWiu5de9mPuAYx2WDg== +"@firebase/performance@0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.4.2.tgz#d5f134674b429d095ce0edfb50fcb4ab279c3cbe" + integrity sha512-irHTCVWJ/sxJo0QHg+yQifBeVu8ZJPihiTqYzBUz/0AGc51YSt49FZwqSfknvCN2+OfHaazz/ARVBn87g7Ex8g== dependencies: "@firebase/component" "0.1.19" "@firebase/installations" "0.4.17" @@ -306,10 +306,10 @@ dependencies: tslib "^1.11.1" -"@firebase/webchannel-wrapper@0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.3.0.tgz#d1689566b94c25423d1fb2cb031c5c2ea4c9f939" - integrity sha512-VniCGPIgSGNEgOkh5phb3iKmSGIzcwrccy3IomMFRWPCMiCk2y98UQNJEoDs1yIHtZMstVjYWKYxnunIGzC5UQ== +"@firebase/webchannel-wrapper@0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.4.0.tgz#becce788818d3f47f0ac1a74c3c061ac1dcf4f6d" + integrity sha512-8cUA/mg0S+BxIZ72TdZRsXKBP5n5uRcE3k29TZhZw6oIiHBt9JA7CTb/4pE1uKtE/q5NeTY2tBDcagoZ+1zjXQ== "@fullhuman/postcss-purgecss@^2.1.2": version "2.3.0" @@ -3834,13 +3834,6 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -encoding@^0.1.11: - version "0.1.13" - resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" - integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== - dependencies: - iconv-lite "^0.6.2" - end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -4719,7 +4712,7 @@ find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" -firebase-admin@^9.1.1: +firebase-admin@^9.2.0: version "9.2.0" resolved "https://registry.yarnpkg.com/firebase-admin/-/firebase-admin-9.2.0.tgz#df5176e2d0c5711df6dbf7012320492a703538ea" integrity sha512-LhnMYl71B4gP1FlTLfwaYlOWhBCAcNF+byb2CPTfaW/T4hkp4qlXOgo2bws/zbAv5X9GTFqGir3KexMslVGsIA== @@ -4744,21 +4737,21 @@ firebase-functions@^3.11.0: express "^4.17.1" lodash "^4.17.14" -firebase@^7.19.0: - version "7.21.1" - resolved "https://registry.yarnpkg.com/firebase/-/firebase-7.21.1.tgz#45c92d6c53136a07d637e9da227726460e86e746" - integrity sha512-ogqWUXIP2/1BTee112QJiAjgch/Ig7pzlAw2mfWOhl9E0IUX46OKv0hypLX62MBgaAKwPHfICIwsWOCxlQ9dZQ== +firebase@^7.23.0: + version "7.24.0" + resolved "https://registry.yarnpkg.com/firebase/-/firebase-7.24.0.tgz#dab53b9c0f1c9538d2d6f4f51769897b0b6d60d8" + integrity sha512-j6jIyGFFBlwWAmrlUg9HyQ/x+YpsPkc/TTkbTyeLwwAJrpAmmEHNPT6O9xtAnMV4g7d3RqLL/u9//aZlbY4rQA== dependencies: - "@firebase/analytics" "0.5.0" + "@firebase/analytics" "0.6.0" "@firebase/app" "0.6.11" "@firebase/app-types" "0.6.1" - "@firebase/auth" "0.14.9" + "@firebase/auth" "0.15.0" "@firebase/database" "0.6.13" - "@firebase/firestore" "1.17.1" - "@firebase/functions" "0.4.51" + "@firebase/firestore" "1.18.0" + "@firebase/functions" "0.5.1" "@firebase/installations" "0.4.17" "@firebase/messaging" "0.7.1" - "@firebase/performance" "0.4.1" + "@firebase/performance" "0.4.2" "@firebase/polyfill" "0.3.36" "@firebase/remote-config" "0.1.28" "@firebase/storage" "0.3.43" @@ -5615,13 +5608,6 @@ iconv-lite@0.4.24, iconv-lite@^0.4.17: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01" - integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ== - dependencies: - safer-buffer ">= 2.1.2 < 3.0.0" - icss-replace-symbols@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" @@ -6243,14 +6229,6 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -isomorphic-fetch@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" - integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk= - dependencies: - node-fetch "^1.0.1" - whatwg-fetch ">=0.10.0" - isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" @@ -7554,14 +7532,6 @@ node-fetch@2.6.1, node-fetch@^2.2.0, node-fetch@^2.3.0, node-fetch@^2.6.0, node- resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== -node-fetch@^1.0.1: - version "1.7.3" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" - integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ== - dependencies: - encoding "^0.1.11" - is-stream "^1.0.1" - node-forge@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" @@ -9779,7 +9749,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -11381,6 +11351,13 @@ vue-markdown@^2.2.4: markdown-it-task-lists "^2.0.1" markdown-it-toc-and-anchor "^4.1.2" +vue-octicon@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/vue-octicon/-/vue-octicon-2.1.1.tgz#c1841ba5d1dd9acbffd497794c947823fcb25c3e" + integrity sha1-wYQbpdHdmsv/1Jd5TJR4I/yyXD4= + dependencies: + vue "^2.0.1" + vue-raven@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/vue-raven/-/vue-raven-1.0.3.tgz#cce941a9255e9694a5793c384fd8ab2e576ce764" @@ -11414,7 +11391,7 @@ vue-template-es2015-compiler@^1.6.0: resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== -vue@^2.6.11: +vue@^2.0.1, vue@^2.6.11: version "2.6.12" resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123" integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg== @@ -11594,11 +11571,6 @@ whatwg-fetch@2.0.4: resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng== -whatwg-fetch@>=0.10.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz#e5f871572d6879663fa5674c8f833f15a8425ab3" - integrity sha512-sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ== - whet.extend@~0.9.9: version "0.9.9" resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1" From 2dd560c59a5f257b4ba02425e09d2e6aff7acd9a Mon Sep 17 00:00:00 2001 From: Gamebrary Date: Fri, 23 Oct 2020 09:20:35 -0700 Subject: [PATCH 02/25] Merge branch 'master' into pro --- src/App.vue | 1 + src/components/Boards.vue | 49 +++++++++++++------- src/components/Game/GameDetails.vue | 27 ++++------- src/components/Game/GameModal.vue | 4 +- src/components/GameCards/GameCardDefault.vue | 2 + src/components/ModalHeader.vue | 20 ++++---- 6 files changed, 56 insertions(+), 47 deletions(-) diff --git a/src/App.vue b/src/App.vue index a9f4cbda..51fe3832 100644 --- a/src/App.vue +++ b/src/App.vue @@ -55,6 +55,7 @@ export default { }, dir() { + // TODO: find out all rtl languages and store in const return this.settings && this.settings.language === 'ar' ? 'rtl' : 'ltr'; diff --git a/src/components/Boards.vue b/src/components/Boards.vue index c30a42b3..fb8c23ba 100644 --- a/src/components/Boards.vue +++ b/src/components/Boards.vue @@ -21,30 +21,45 @@ class="overflow-hidden clickable mt-3" @click="viewBoard(board.id)" > - - - + + + + - - - - {{ board.description }} - + +
{{ board.name }}
- - {{ board.platforms.length }} {{ $t('boards.platforms') }} - + + {{ board.platforms.length }} {{ $t('boards.platforms') }} + - -
- {{ platformNames[id].name }} -
- - + +
+ {{ platformNames[id].name }} +
+ + +

+ {{ board.description }} +

diff --git a/src/components/Game/GameDetails.vue b/src/components/Game/GameDetails.vue index ac346646..80986dee 100644 --- a/src/components/Game/GameDetails.vue +++ b/src/components/Game/GameDetails.vue @@ -2,29 +2,26 @@
-
{{ $t('board.gameModal.platforms') }}
-
{{ platforms }}
+
{{ $t('board.gameModal.platforms') }}
+
{{ platforms }}
{{ $t('board.gameModal.genres') }}
-
{{ genres }}
+
{{ genres }}
{{ $t('board.gameModal.gameModes') }}
-
{{ gameModes }}
+
{{ gameModes }}
{{ $t('board.gameModal.developers') }}
-
{{ gameDevelopers }}
+
{{ gameDevelopers }}
{{ $t('board.gameModal.publishers') }}
-
{{ gamePublishers }}
+
{{ gamePublishers }}
{{ $t('board.gameModal.perspective') }}
-
{{ playerPerspectives }}
- -
{{ $t('board.gameModal.timeToBeat') }}
-
{{ timeToBeat }}
+
{{ playerPerspectives }}
{{ $t('board.gameModal.ageRatings') }}
-
{{ ageRatings }}
+
{{ ageRatings }}
@@ -34,8 +31,6 @@ diff --git a/src/router.js b/src/router.js index 4bdce5be..1a0aaa47 100755 --- a/src/router.js +++ b/src/router.js @@ -5,6 +5,7 @@ import About from '@/pages/About'; import Languages from '@/pages/Languages'; import Wallpapers from '@/pages/Wallpapers'; import Tags from '@/pages/Tags'; +import Notes from '@/pages/Notes'; import Account from '@/pages/Account'; import Releases from '@/pages/Releases'; import Auth from '@/pages/Auth'; @@ -64,6 +65,14 @@ export default new Router({ title: 'Tags', }, }, + { + name: 'notes', + path: '/notes', + component: Notes, + meta: { + title: 'Notes', + }, + }, { name: 'language', path: '/language', From 21b1867915d14b8d4b5a1c2e08e3462cf168ee70 Mon Sep 17 00:00:00 2001 From: Gamebrary Date: Sat, 31 Oct 2020 10:43:12 -0700 Subject: [PATCH 06/25] resolve promise --- src/store/actions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/store/actions.js b/src/store/actions.js index 75d1612f..763e650d 100644 --- a/src/store/actions.js +++ b/src/store/actions.js @@ -275,6 +275,7 @@ export default { .get() .then((doc) => { commit('SET_TWITCH_TOKEN', doc.data()); + resolve(); }) .catch(reject); }); From bbc9b530947da9f3d160d41876abe5c21761f7d1 Mon Sep 17 00:00:00 2001 From: Gamebrary Date: Sat, 31 Oct 2020 10:43:20 -0700 Subject: [PATCH 07/25] wallpapers updates --- src/pages/Wallpapers.vue | 95 ++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 62 deletions(-) diff --git a/src/pages/Wallpapers.vue b/src/pages/Wallpapers.vue index a98d9089..2032d841 100644 --- a/src/pages/Wallpapers.vue +++ b/src/pages/Wallpapers.vue @@ -14,86 +14,49 @@ - -
{{ $t('wallpapers.form.label') }}
- + {{ $t('wallpapers.form.duplicateMessage', { fileName: file.name }) }} - - - - {{ $t('wallpapers.form.upload') }} -
{{ $t('wallpapers.list.title') }}
- - - - - - -

{{ wallpaper.name }}

- - - - - - - + + + You don't have any wallpapers. @@ -130,19 +93,27 @@ export default { methods: { async uploadWallpaper() { - const { file } = this; + if (this.isDuplicate) { + return this.$bvToast.toast('File already exists', { title: '!', variant: 'warning' }); + } + + if (!this.file) { + return; + } + this.saving = true; - await this.$store.dispatch('UPLOAD_WALLPAPER', file) + this.$store.dispatch('UPLOAD_WALLPAPER', this.file) + .then(() => { + this.$bvToast.toast('File uploaded', { title: 'Success', variant: 'success' }); + this.file = null; + this.saving = false; + this.$bus.$emit('WALLPAPER_UPLOADED'); + }) .catch(() => { this.saving = false; this.$bvToast.toast('There was an error uploading wallpaper', { title: 'Error', variant: 'danger' }); }); - - this.file = null; - this.saving = false; - this.$bvToast.toast(file.name, { title: 'File uploaded', variant: 'success' }); - this.$bus.$emit('WALLPAPER_UPLOADED'); }, confirmDeleteWallpaper(file) { From 9954fc05f770c8e502145f8d3e0286c4de86065b Mon Sep 17 00:00:00 2001 From: Gamebrary Date: Sat, 31 Oct 2020 10:43:33 -0700 Subject: [PATCH 08/25] added vue quill --- src/main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main.js b/src/main.js index faa97bb7..39a83a1a 100755 --- a/src/main.js +++ b/src/main.js @@ -4,6 +4,7 @@ import 'bootstrap-vue/dist/bootstrap-vue.css'; import VueAxios from 'vue-axios'; import VueFire from 'vuefire'; import VueI18n from 'vue-i18n'; +import VueQuill from 'vue-quill'; import Icon from '@/components/Icon'; import ModalHeader from '@/components/ModalHeader'; import axios from 'axios'; @@ -26,6 +27,7 @@ Object.defineProperties(Vue.prototype, { }, }); +Vue.use(VueQuill); Vue.use(BootstrapVue, bootstrapSettings); Vue.use(VueAnalytics, { id: 'UA-120053966-1', router }); Vue.use(VueAxios, axios); From 353618a9843fadd04edc2318bf6f6c711650c681 Mon Sep 17 00:00:00 2001 From: Gamebrary Date: Sat, 31 Oct 2020 10:43:47 -0700 Subject: [PATCH 09/25] new translations --- src/i18n/en.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/i18n/en.json b/src/i18n/en.json index 8e3ea527..ab723811 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -26,6 +26,8 @@ "language": "Language", "releases": "Releases", "about": "About", + "upgrade": "Upgrade", + "notes": "Notes", "account": "Account", "theme": "Switch theme" }, @@ -242,5 +244,9 @@ "upgrade": { "title": "Upgrade to Gamebrary Pro", "subtitle": "Give me your money" + }, + "notes": { + "title": "Notes", + "subtitle": "Notes!" } } \ No newline at end of file From 75895000af0d1f04b0947e9cb648e9406bee3141 Mon Sep 17 00:00:00 2001 From: Gamebrary Date: Sat, 31 Oct 2020 10:43:55 -0700 Subject: [PATCH 10/25] modal header tweak --- src/components/ModalHeader.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/ModalHeader.vue b/src/components/ModalHeader.vue index 99b169ef..9bcc5bc0 100644 --- a/src/components/ModalHeader.vue +++ b/src/components/ModalHeader.vue @@ -51,5 +51,6 @@ h5 { .actions { margin-left: auto; + align-self: flex-start; } From 214df11f54dd5debd665944eb52ac9e6b73fb52d Mon Sep 17 00:00:00 2001 From: Gamebrary Date: Sat, 31 Oct 2020 10:44:07 -0700 Subject: [PATCH 11/25] notes and upgrade links --- src/components/PageHeader.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/components/PageHeader.vue b/src/components/PageHeader.vue index 03832413..87046202 100755 --- a/src/components/PageHeader.vue +++ b/src/components/PageHeader.vue @@ -22,6 +22,15 @@ + + + + From e70c42d1a271ee5ec28a5afb7a5797aafb13284d Mon Sep 17 00:00:00 2001 From: Gamebrary Date: Sat, 31 Oct 2020 10:44:15 -0700 Subject: [PATCH 12/25] missing line break --- src/App.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/App.vue b/src/App.vue index 51fe3832..7783e5d2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,6 +4,7 @@ :dir="dir" > +
From bd649e0c3b5f9ce81bb27a21ab054572625f368e Mon Sep 17 00:00:00 2001 From: Roman Cervantes Date: Sat, 31 Oct 2020 11:15:22 -0700 Subject: [PATCH 13/25] Removed momentjs --- package.json | 1 - src/components/Game/GameModal.vue | 24 ------------------------ src/components/GameCards/GameCard.js | 1 - src/pages/About.vue | 5 ----- src/pages/Account.vue | 3 +-- src/pages/Releases.vue | 3 +-- yarn.lock | 14 +------------- 7 files changed, 3 insertions(+), 48 deletions(-) diff --git a/package.json b/package.json index 081a91a7..babd2739 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "lodash.groupby": "^4.6.0", "lodash.orderby": "^4.6.0", "lodash.sortby": "^4.7.0", - "moment": "^2.22.1", "node-sass": "^4.8.3", "raven-js": "^3.27.0", "sass-loader": "^7.0.1", diff --git a/src/components/Game/GameModal.vue b/src/components/Game/GameModal.vue index acc7f06c..43b36700 100644 --- a/src/components/Game/GameModal.vue +++ b/src/components/Game/GameModal.vue @@ -80,15 +80,6 @@ size="lg" no-border /> -
@@ -147,7 +138,6 @@ - - diff --git a/src/components/Game/GameDetails.vue b/src/components/Game/GameDetails.vue index 80986dee..4d31d887 100644 --- a/src/components/Game/GameDetails.vue +++ b/src/components/Game/GameDetails.vue @@ -1,33 +1,31 @@ + + + + From 6499c631c798b296201ba9ee966308fd4800fd91 Mon Sep 17 00:00:00 2001 From: Gamebrary Date: Sun, 1 Nov 2020 14:08:36 -0700 Subject: [PATCH 21/25] fix logic for unique list width in mobile --- src/components/Lists/List.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/Lists/List.vue b/src/components/Lists/List.vue index b86bcb45..c96ea233 100644 --- a/src/components/Lists/List.vue +++ b/src/components/Lists/List.vue @@ -1,6 +1,6 @@