From b5d3baaf2449dcc9776f86b10654ca1ce26bff4b Mon Sep 17 00:00:00 2001 From: Julien Calixte Date: Thu, 28 Nov 2019 23:05:40 +0100 Subject: [PATCH] :sparkles: (header) back button if app installed --- package-lock.json | 27 ------------------ package.json | 1 - src/App.vue | 19 +++++++++++- .../icons/baseline_arrow_back_white_48dp.png | Bin 0 -> 261 bytes src/components/AppInstalled.vue | 21 ++++++++++++++ src/styles/index.scss | 4 +++ src/views/accounts/AccountItem.vue | 1 - 7 files changed, 43 insertions(+), 30 deletions(-) create mode 100755 src/assets/icons/baseline_arrow_back_white_48dp.png create mode 100644 src/components/AppInstalled.vue diff --git a/package-lock.json b/package-lock.json index eef494a..d8928e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1021,15 +1021,6 @@ "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==", "dev": true }, - "@pwabuilder/pwainstall": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/@pwabuilder/pwainstall/-/pwainstall-0.9.4.tgz", - "integrity": "sha512-yJLS4AVMmmvENLlqnaB3d4s+j7MD0k9cmWr9kJuXCBer6b2yVLfDqUlyZjYijJNPxKd6tbbeN9JrecZ8WxKsbg==", - "requires": { - "infinite-carousel-wc": "^0.4.1", - "lit-element": "^2.2.1" - } - }, "@soda/friendly-errors-webpack-plugin": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz", @@ -7515,11 +7506,6 @@ "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", "dev": true }, - "infinite-carousel-wc": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/infinite-carousel-wc/-/infinite-carousel-wc-0.4.1.tgz", - "integrity": "sha512-d0U/zdPXZxMzIFEtMHlQ4iGGwe3BchOi4y5RC3ZMjVW7oXdSOdE0CChTtEBcnjgHvovQXcld31kTFMsMv3emcQ==" - }, "infinity-x": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/infinity-x/-/infinity-x-1.0.2.tgz", @@ -9499,19 +9485,6 @@ "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", "dev": true }, - "lit-element": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-2.2.1.tgz", - "integrity": "sha512-ipDcgQ1EpW6Va2Z6dWm79jYdimVepO5GL0eYkZrFvdr0OD/1N260Q9DH+K5HXHFrRoC7dOg+ZpED2XE0TgGdXw==", - "requires": { - "lit-html": "^1.0.0" - } - }, - "lit-html": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-1.1.2.tgz", - "integrity": "sha512-FFlUMKHKi+qG1x1iHNZ1hrtc/zHmfYTyrSvs3/wBTvaNtpZjOZGWzU7efGYVpgp6KvWeKF6ql9/KsCq6Z/mEDA==" - }, "load-json-file": { "version": "1.1.0", "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", diff --git a/package.json b/package.json index 331ef74..692af6a 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "@fortawesome/fontawesome-svg-core": "^1.2.25", "@fortawesome/free-solid-svg-icons": "^5.11.2", "@fortawesome/vue-fontawesome": "^0.1.7", - "@pwabuilder/pwainstall": "^0.9.4", "@xkeshi/vue-qrcode": "^1.0.0", "axios": "^0.19.0", "bulma": "^0.7.5", diff --git a/src/App.vue b/src/App.vue index 147bb03..310ce6f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -20,6 +20,17 @@ + + + {{ title }} @@ -73,13 +84,15 @@ import { Action, Getter } from 'vuex-class' import IUser from '@/models/IUser' import { COFFEE_LINK } from '@/utils/constants' import OnlineView from '@/components/OnlineView.vue' +import AppInstalled from '@/components/AppInstalled.vue' @Component({ directives: { ClickOutside }, components: { - 'online-view': OnlineView + 'online-view': OnlineView, + 'app-installed': AppInstalled } }) export default class App extends Vue { @@ -114,6 +127,10 @@ export default class App extends Vue { public hideMenu(): void { this.menuOpen = false } + + public back(): void { + window.history.back() + } } diff --git a/src/assets/icons/baseline_arrow_back_white_48dp.png b/src/assets/icons/baseline_arrow_back_white_48dp.png new file mode 100755 index 0000000000000000000000000000000000000000..fdabf3f879d2ab99ec93321aff0236c1fad0fcb1 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoXFOdTLn;{G-eF{8N)&0mxV^!p znmbo<0k6wz?xt_W%xVlm=6|2-JlrjD_>6R&Bv1zf!-OZ(o>)zJv_E#4+n;|NkMhq2 zE7#Std^A74Qt|$6`=dXv=HvI~ACHvx{rK-y^YQ)NACKO%eLU)3 z^HDIq#;#*O!^hLtdh!`Q@+L4SS8zxl;D|e7&?E>!A0oT>H^X@bP4`1T9^M9$3rk{A rp2L=|Et_}rWzzB8h5O{du8O$Lz5c?oDQhz=i$Hu&S3j3^P6 + + + + + + + diff --git a/src/styles/index.scss b/src/styles/index.scss index 2cadbf0..f408fad 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -81,6 +81,10 @@ img { width: 50px; } +.back-icon { + vertical-align: middle; +} + .breadcrumb { font-size: 16pt; text-align: center; diff --git a/src/views/accounts/AccountItem.vue b/src/views/accounts/AccountItem.vue index 731d4af..aa27991 100644 --- a/src/views/accounts/AccountItem.vue +++ b/src/views/accounts/AccountItem.vue @@ -476,7 +476,6 @@ export default class AccountItem extends BaseAccount { color: var(--primary-font-color); } .account-title { - margin: 10px 0; span, a { padding: 0 10px;