From 430af8306b1ab17e59a6dabf8f65ab816d28695d Mon Sep 17 00:00:00 2001 From: Pitu Date: Wed, 19 Sep 2018 04:45:50 -0300 Subject: Switch to Nuxt.js --- src/site/layouts/default.vue | 114 +++++++++++++++++++++++++++++++++++++++++++ src/site/layouts/error.vue | 35 +++++++++++++ 2 files changed, 149 insertions(+) create mode 100644 src/site/layouts/default.vue create mode 100644 src/site/layouts/error.vue (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue new file mode 100644 index 0000000..cd7efe5 --- /dev/null +++ b/src/site/layouts/default.vue @@ -0,0 +1,114 @@ + + + diff --git a/src/site/layouts/error.vue b/src/site/layouts/error.vue new file mode 100644 index 0000000..597653b --- /dev/null +++ b/src/site/layouts/error.vue @@ -0,0 +1,35 @@ + + + + + -- cgit v1.2.3 From 7ad463469bd636f55e04500d3a960535e04e768a Mon Sep 17 00:00:00 2001 From: Pitu Date: Thu, 28 Feb 2019 23:26:03 +0900 Subject: When a call regarding the token fails, logout --- src/site/layouts/default.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue index cd7efe5..afa8eb9 100644 --- a/src/site/layouts/default.vue +++ b/src/site/layouts/default.vue @@ -73,7 +73,7 @@ export default { this.showToast(error.response.data.message, true, 5000); if (error.response.status === 429) return; if (error.response.status === 502) return; - if (logout) { + if (error.response.data.message === 'Token expired') { this.$logOut(); setTimeout(() => this.$router.push('/'), 3000); } -- cgit v1.2.3 From 789f5fc259b90dd6a3b21fd2aef1a9e54a19506e Mon Sep 17 00:00:00 2001 From: Pitu Date: Sat, 2 Mar 2019 22:16:35 +0900 Subject: Removed google analytics --- src/site/layouts/error.vue | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/error.vue b/src/site/layouts/error.vue index 597653b..77d188f 100644 --- a/src/site/layouts/error.vue +++ b/src/site/layouts/error.vue @@ -23,13 +23,6 @@ import Navbar from '~/components/navbar/Navbar.vue'; export default { - components: { Navbar }, - mounted() { - this.$ga.page({ - page: '/404', - title: 'Not Found', - location: window.location.href - }); - } + components: { Navbar } }; -- cgit v1.2.3 From 85ed48219e123d6aed0b028becc2849169bb4409 Mon Sep 17 00:00:00 2001 From: Pitu Date: Fri, 15 Mar 2019 07:17:35 +0000 Subject: This is not needed anymore --- src/site/layouts/default.vue | 53 -------------------------------------------- 1 file changed, 53 deletions(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue index afa8eb9..41c3ebd 100644 --- a/src/site/layouts/default.vue +++ b/src/site/layouts/default.vue @@ -21,14 +21,6 @@ export default { console.log(`%c lolisafe %c v${this.config.version} %c`, 'background:#35495e ; padding: 1px; border-radius: 3px 0 0 3px; color: #fff', 'background:#ff015b; padding: 1px; border-radius: 0 3px 3px 0; color: #fff', 'background:transparent'); }, created() { - Vue.prototype.$search = (term, list, options) => { - return new Promise(resolve => { - const run = new Fuse(list, options); - const results = run.search(term); - return resolve(results); - }); - }; - Vue.prototype.$onPromiseError = (error, logout = false) => { this.processCatch(error, logout); }; @@ -36,28 +28,6 @@ export default { Vue.prototype.$showToast = (text, error, duration) => { this.showToast(text, error, duration); }; - - Vue.prototype.$logOut = () => { - this.$store.commit('user', null); - this.$store.commit('loggedIn', false); - this.$store.commit('token', null); - }; - - this.$router.beforeEach((to, from, next) => { - if (this.$store.state.loggedIn) return next(); - if (process.browser) { - if (localStorage && localStorage.getItem('lolisafe-token')) return this.tryToLogin(next, `/login?redirect=${to.path}`); - } - - for (const match of to.matched) { - if (protectedRoutes.includes(match.path)) { - if (this.$store.state.loggedIn === false) return next(`/login?redirect=${to.path}`); - } - } - - return next(); - }); - if (process.browser) this.tryToLogin(); }, methods: { showToast(text, error, duration) { @@ -81,29 +51,6 @@ export default { console.error(error); this.showToast('Something went wrong, please check the console :(', true, 5000); } - }, - tryToLogin(next, destination) { - if (process.browser) this.$store.commit('token', localStorage.getItem('lolisafe-token')); - this.axios.get(`${this.config.baseURL}/verify`).then(res => { - this.$store.commit('user', res.data.user); - this.$store.commit('loggedIn', true); - if (next) return next(); - return null; - }).catch(error => { - if (error.response && error.response.status === 520) return; - if (error.response && error.response.status === 429) { - setTimeout(() => { - this.tryToLogin(next, destination); - }, 1000); - return next(false); - } - this.$store.commit('user', null); - this.$store.commit('loggedIn', false); - this.$store.commit('token', null); - if (next && destination) return next(destination); - if (next) return next('/'); - return null; - }); } } }; -- cgit v1.2.3 From ea3e503d13b7be477c064b02b9b2e5a9ef06c9a9 Mon Sep 17 00:00:00 2001 From: Pitu Date: Fri, 29 Mar 2019 00:35:58 +0900 Subject: Added middleware for pages and switched to $axios --- src/site/layouts/default.vue | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue index 41c3ebd..a251e7c 100644 --- a/src/site/layouts/default.vue +++ b/src/site/layouts/default.vue @@ -3,14 +3,6 @@ -- cgit v1.2.3 From d44154d379bd895e2edd44b74eba77e815d9a3ca Mon Sep 17 00:00:00 2001 From: Pitu Date: Tue, 23 Apr 2019 22:11:14 +0900 Subject: Fix toast --- src/site/layouts/default.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue index 8ee9140..dfaa193 100644 --- a/src/site/layouts/default.vue +++ b/src/site/layouts/default.vue @@ -15,10 +15,10 @@ export default { created() { Vue.prototype.$onPromiseError = (error, logout = false) => { if (error.response && error.response.data && error.response.data.message) { - this.showToast(error.response.data.message, true, 5000); + this.$showToast(error.response.data.message, true, 5000); } else { console.error(error); - this.showToast('Something went wrong, please check the console :(', true, 5000); + this.$showToast('Something went wrong, please check the console :(', true, 5000); } }; @@ -35,5 +35,5 @@ export default { -- cgit v1.2.3 From 9609279554b77ca73106f95f5d96356415a48cfb Mon Sep 17 00:00:00 2001 From: Pitu Date: Tue, 23 Apr 2019 22:20:23 +0900 Subject: Get rid of the icons altogether in a future commit --- src/site/layouts/default.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue index dfaa193..e2c7e12 100644 --- a/src/site/layouts/default.vue +++ b/src/site/layouts/default.vue @@ -35,5 +35,5 @@ export default { -- cgit v1.2.3 From a7c1855ce560dc5ef13c63c61cf73af36b956ba7 Mon Sep 17 00:00:00 2001 From: Pitu Date: Wed, 24 Apr 2019 08:37:12 +0000 Subject: Better alert handling --- src/site/layouts/default.vue | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue index e2c7e12..c0b2407 100644 --- a/src/site/layouts/default.vue +++ b/src/site/layouts/default.vue @@ -2,38 +2,37 @@ -- cgit v1.2.3 From 3680432bdfe49fc2416e50b3e91a740bbe66cfa8 Mon Sep 17 00:00:00 2001 From: Pitu Date: Tue, 1 Oct 2019 14:20:37 -0300 Subject: chore: prepare for filepond --- src/site/layouts/default.vue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue index c0b2407..bd6f134 100644 --- a/src/site/layouts/default.vue +++ b/src/site/layouts/default.vue @@ -1,8 +1,17 @@ -- cgit v1.2.3 From 391ee68e4a67aec640e25bc3506f9e31c77e58f5 Mon Sep 17 00:00:00 2001 From: Pitu Date: Sat, 12 Oct 2019 15:47:25 +0900 Subject: chore: Upgrade buefy to newest version --- src/site/layouts/default.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue index bd6f134..f33a61a 100644 --- a/src/site/layouts/default.vue +++ b/src/site/layouts/default.vue @@ -24,7 +24,7 @@ export default { alert() { if (!this.alert) return; - this.$toast.open({ + this.$buefy.toast.open({ duration: 3500, message: this.alert.text, position: 'is-bottom', -- cgit v1.2.3 From 05c129ec322216356456cdcae517cd6c879a844a Mon Sep 17 00:00:00 2001 From: Pitu Date: Sat, 11 Apr 2020 00:52:06 +0900 Subject: chore: remove filepond --- src/site/layouts/default.vue | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue index f33a61a..e69a21c 100644 --- a/src/site/layouts/default.vue +++ b/src/site/layouts/default.vue @@ -2,16 +2,13 @@
-
+ -- cgit v1.2.3 From ac037c773ef5f15372c6999445a2efe00034c0c0 Mon Sep 17 00:00:00 2001 From: Zephyrrus Date: Mon, 29 Jun 2020 20:02:47 +0300 Subject: fix: Remove hero and hero body and use sections and containers instead Hero is meant to be used as a full-width banner to showcare or present somethign, not to contain the entire content of the webpage --- src/site/layouts/default.vue | 45 +++++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue index 1642980..744285c 100644 --- a/src/site/layouts/default.vue +++ b/src/site/layouts/default.vue @@ -1,15 +1,11 @@ @@ -17,7 +13,10 @@ import Navbar from '~/components/navbar/Navbar.vue'; import Footer from '~/components/footer/Footer'; export default { - components: { Navbar, Footer }, + components: { + Navbar, + Footer + }, computed: { config() { return this.$store.state.config; @@ -49,25 +48,19 @@ export default { -- cgit v1.2.3 From c8ad345d1287d9078075cb92956ac9bbd554f022 Mon Sep 17 00:00:00 2001 From: Zephyrrus Date: Mon, 29 Jun 2020 22:18:18 +0300 Subject: fix: heigh issues where the parent is smaller than the child --- src/site/layouts/default.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue index 744285c..61a257e 100644 --- a/src/site/layouts/default.vue +++ b/src/site/layouts/default.vue @@ -13,7 +13,7 @@ import Navbar from '~/components/navbar/Navbar.vue'; import Footer from '~/components/footer/Footer'; export default { - components: { + components: { Navbar, Footer }, @@ -48,7 +48,10 @@ export default { -- cgit v1.2.3 From ac1d6eec5b5ec3093ac97e179d2573b5a225ea0e Mon Sep 17 00:00:00 2001 From: Zephyrrus Date: Sat, 4 Jul 2020 03:28:05 +0300 Subject: fix: change watcher from a component watcher to a store watcher --- src/site/layouts/default.vue | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue index 08d733f..579a73e 100644 --- a/src/site/layouts/default.vue +++ b/src/site/layouts/default.vue @@ -19,21 +19,22 @@ export default { Navbar, Footer }, - computed: mapState(['config', 'alert']), - watch: { - 'alert.text'() { - console.log('aaaaaaaa'); - if (!this.alert.text) return; + computed: mapState(['config']), + created() { + this.$store.watch(state => state.alert.text, () => { + const { text, error } = this.$store.state.alert; + + if (!text) return; this.$buefy.toast.open({ duration: 3500, - message: this.alert.text, + message: text, position: 'is-bottom', - type: this.alert.error ? 'is-danger' : 'is-success' + type: error ? 'is-danger' : 'is-success' }); this.$store.dispatch('alert/clear', null); - } + }) }, mounted() { console.log( -- cgit v1.2.3 From ad852de51a0d2dd5d29c08838d5a430c58849e74 Mon Sep 17 00:00:00 2001 From: Zephyrrus Date: Wed, 8 Jul 2020 04:00:12 +0300 Subject: chore: linter the entire project using the new rules --- src/site/layouts/default.vue | 23 +++++++++++++---------- src/site/layouts/error.vue | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue index 579a73e..13a56c0 100644 --- a/src/site/layouts/default.vue +++ b/src/site/layouts/default.vue @@ -1,27 +1,29 @@ diff --git a/src/site/layouts/error.vue b/src/site/layouts/error.vue index 77d188f..3f12c46 100644 --- a/src/site/layouts/error.vue +++ b/src/site/layouts/error.vue @@ -23,6 +23,6 @@ import Navbar from '~/components/navbar/Navbar.vue'; export default { - components: { Navbar } + components: { Navbar }, }; -- cgit v1.2.3 From 495a23c3a53b8f1e9f885163129d962cbd3e8c2b Mon Sep 17 00:00:00 2001 From: Zephyrrus Date: Thu, 9 Jul 2020 02:21:35 +0300 Subject: =?UTF-8?q?feat:=20add=20notifier=20plugin=20for=20=F0=9F=90=8D=20?= =?UTF-8?q?and=20=F0=9F=8D=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/site/layouts/default.vue | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue index 13a56c0..0049b88 100644 --- a/src/site/layouts/default.vue +++ b/src/site/layouts/default.vue @@ -21,19 +21,28 @@ export default { Navbar, Footer, }, - computed: mapState(['config']), + computed: mapState(['config', 'alert']), created() { - this.$store.watch((state) => state.alert.text, () => { - const { text, error } = this.$store.state.alert; + this.$store.watch((state) => state.alert.message, () => { + const { message, type, snackbar } = this.alert; - if (!text) return; + if (!message) return; - this.$buefy.toast.open({ - duration: 3500, - message: text, - position: 'is-bottom', - type: error ? 'is-danger' : 'is-success', - }); + if (snackbar) { + this.$buefy.snackbar.open({ + duration: 3500, + position: 'is-bottom', + message, + type, + }); + } else { + this.$buefy.toast.open({ + duration: 3500, + position: 'is-bottom', + message, + type, + }); + } this.$store.dispatch('alert/clear', null); }); -- cgit v1.2.3 From 90001c2df56d58e69fd199a518ae7f3e4ed327fc Mon Sep 17 00:00:00 2001 From: Zephyrrus Date: Thu, 24 Dec 2020 10:40:50 +0200 Subject: chore: remove trailing commas --- src/site/layouts/default.vue | 10 +++++----- src/site/layouts/error.vue | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue index 0049b88..3fa7ebd 100644 --- a/src/site/layouts/default.vue +++ b/src/site/layouts/default.vue @@ -19,7 +19,7 @@ import Footer from '~/components/footer/Footer.vue'; export default { components: { Navbar, - Footer, + Footer }, computed: mapState(['config', 'alert']), created() { @@ -33,14 +33,14 @@ export default { duration: 3500, position: 'is-bottom', message, - type, + type }); } else { this.$buefy.toast.open({ duration: 3500, position: 'is-bottom', message, - type, + type }); } @@ -53,9 +53,9 @@ export default { `%c lolisafe %c v${this.config.version} %c`, 'background:#35495e ; padding: 1px; border-radius: 3px 0 0 3px; color: #fff', 'background:#ff015b; padding: 1px; border-radius: 0 3px 3px 0; color: #fff', - 'background:transparent', + 'background:transparent' ); - }, + } }; diff --git a/src/site/layouts/error.vue b/src/site/layouts/error.vue index 3f12c46..77d188f 100644 --- a/src/site/layouts/error.vue +++ b/src/site/layouts/error.vue @@ -23,6 +23,6 @@ import Navbar from '~/components/navbar/Navbar.vue'; export default { - components: { Navbar }, + components: { Navbar } }; -- cgit v1.2.3 From fb2c27086f570fec60f4d52dcc9ca80e53186293 Mon Sep 17 00:00:00 2001 From: Pitu Date: Thu, 24 Dec 2020 23:45:16 +0900 Subject: Fix ESLint rules once and for all --- src/site/layouts/default.vue | 4 ++-- src/site/layouts/error.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/site/layouts') diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue index 3fa7ebd..b2b2633 100644 --- a/src/site/layouts/default.vue +++ b/src/site/layouts/default.vue @@ -3,7 +3,7 @@ v-bar class="scroll-area">
- + @@ -23,7 +23,7 @@ export default { }, computed: mapState(['config', 'alert']), created() { - this.$store.watch((state) => state.alert.message, () => { + this.$store.watch(state => state.alert.message, () => { const { message, type, snackbar } = this.alert; if (!message) return; diff --git a/src/site/layouts/error.vue b/src/site/layouts/error.vue index 77d188f..28f3036 100644 --- a/src/site/layouts/error.vue +++ b/src/site/layouts/error.vue @@ -10,7 +10,7 @@