From f38d2a09a41aad2cd017a00c7d608d482d55ba07 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 28 Jan 2021 20:08:06 -0700 Subject: [PATCH] Update components --- resources/assets/js/components/My2020.vue | 11 ++++++ resources/assets/js/components/Timeline.vue | 29 +++++++++++--- .../components/presenter/PhotoPresenter.vue | 38 ++++++++++++++----- 3 files changed, 63 insertions(+), 15 deletions(-) diff --git a/resources/assets/js/components/My2020.vue b/resources/assets/js/components/My2020.vue index 8d276e532..1c8f728eb 100644 --- a/resources/assets/js/components/My2020.vue +++ b/resources/assets/js/components/My2020.vue @@ -165,6 +165,12 @@ export default { return; } + if(this.page == 7 && this.stats.popular.places == null) { + this.page = 9; + window.history.pushState({}, {}, '/i/my2020?v=20&ned=0&sl=9'); + return; + } + if(this.page == 8) { axios.post('/api/pixelfed/v2/seasonal/yir', { 'profile_id' : this.user.profile_id @@ -178,6 +184,11 @@ export default { if(this.page == 1) { return; } + if(this.page == 9 && this.stats.popular.places == null) { + this.page = 7; + window.history.pushState({}, {}, '/i/my2020?v=20&ned=0&sl=7'); + return; + } --this.page; if(this.page == 1) { window.history.pushState({}, {}, '/i/my2020'); diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index 6fe19a3a9..5bc023980 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -171,6 +171,18 @@ +
+

+ + + For information about COVID-19, {{config.features.label.covid.org}} + + + + +

+
+

@@ -741,14 +753,14 @@ body-class="p-2 rounded"> }, mounted() { - if(window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches || $('link[data-stylesheet="dark"]').length != 0) { + // todo: release after dark mode updates + /* if(window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches || $('link[data-stylesheet="dark"]').length != 0) { this.modes.dark = true; - // todo: release after dark mode updates - /* let el = document.querySelector('link[data-stylesheet="light"]'); + let el = document.querySelector('link[data-stylesheet="light"]'); el.setAttribute('href', '/css/appdark.css?id=' + Date.now()); - el.setAttribute('data-stylesheet', 'dark'); */ - } + el.setAttribute('data-stylesheet', 'dark'); + }*/ if(localStorage.getItem('pf_metro_ui.exp.rec') == 'false') { this.showSuggestions = false; @@ -1666,10 +1678,15 @@ body-class="p-2 rounded"> self.loading = false; }, 500); }, + + labelRedirect(type) { + let url = '/i/redirect?url=' + encodeURI(this.config.features.label.covid.url); + window.location.href = url; + } }, beforeDestroy () { clearInterval(this.mpInterval); }, } - \ No newline at end of file + diff --git a/resources/assets/js/components/presenter/PhotoPresenter.vue b/resources/assets/js/components/presenter/PhotoPresenter.vue index cd80b5f97..d96973600 100644 --- a/resources/assets/js/components/presenter/PhotoPresenter.vue +++ b/resources/assets/js/components/presenter/PhotoPresenter.vue @@ -1,14 +1,26 @@