feat: use blurHash when loading list backgrounds (#1188)
All checks were successful
continuous-integration/drone/push Build is passing

Co-authored-by: kolaente <k@knt.li>
Reviewed-on: #1188
This commit is contained in:
konrad 2022-04-02 15:05:30 +00:00
parent 53787a65df
commit 4cff3ebee1
13 changed files with 387 additions and 234 deletions

View File

@ -26,6 +26,7 @@
"@vue/compat": "3.2.31", "@vue/compat": "3.2.31",
"@vueuse/core": "8.2.3", "@vueuse/core": "8.2.3",
"@vueuse/router": "8.2.3", "@vueuse/router": "8.2.3",
"blurhash": "^1.1.4",
"bulma-css-variables": "0.9.33", "bulma-css-variables": "0.9.33",
"camel-case": "4.1.2", "camel-case": "4.1.2",
"codemirror": "5.65.2", "codemirror": "5.65.2",

View File

@ -1,5 +1,5 @@
<template> <template>
<div> <div class="content-auth" :class="{'modal-active': modalActive}">
<BaseButton <BaseButton
v-if="menuActive" v-if="menuActive"
@click="$store.commit('menuActive', false)" @click="$store.commit('menuActive', false)"
@ -8,10 +8,14 @@
<icon icon="times"/> <icon icon="times"/>
</BaseButton> </BaseButton>
<div <div
:class="{'has-background': background}" :class="{'has-background': background || blurHash}"
:style="{'background-image': background && `url(${background})`}" :style="{'background-image': blurHash && `url(${blurHash})`}"
class="app-container" class="app-container"
> >
<div
:class="{'is-visible': background}"
class="app-container-background background-fade-in"
:style="{'background-image': background && `url(${background})`}"></div>
<navigation/> <navigation/>
<main <main
:class="[ :class="[
@ -120,11 +124,12 @@ function useRouteWithModal() {
const {routeWithModal, currentModal, closeModal} = useRouteWithModal() const {routeWithModal, currentModal, closeModal} = useRouteWithModal()
const store = useStore() const store = useStore()
const background = computed(() => store.state.background) const background = computed(() => store.state.background)
const blurHash = computed(() => store.state.blurHash)
const menuActive = computed(() => store.state.menuActive) const menuActive = computed(() => store.state.menuActive)
const modalActive = computed(() => store.state.modalActive)
function showKeyboardShortcuts() { function showKeyboardShortcuts() {
store.commit(KEYBOARD_SHORTCUTS_ACTIVE, true) store.commit(KEYBOARD_SHORTCUTS_ACTIVE, true)
@ -235,6 +240,8 @@ store.dispatch('labels/loadAllLabels')
.app-content { .app-content {
padding: $navbar-height + 1.5rem 1.5rem 1rem 1.5rem; padding: $navbar-height + 1.5rem 1.5rem 1rem 1.5rem;
z-index: 10;
position: relative;
// Used to make sure the spinner is always in the middle while loading // Used to make sure the spinner is always in the middle while loading
> .loader-container { > .loader-container {
@ -296,5 +303,14 @@ store.dispatch('labels/loadAllLabels')
} }
} }
.content-auth {
position: relative;
z-index: 1;
&.modal-active {
z-index: unset;
}
}
@include modal-transition(); @include modal-transition();
</style> </style>

View File

@ -2,16 +2,21 @@
<router-link <router-link
:class="{ :class="{
'has-light-text': !colorIsDark(list.hexColor), 'has-light-text': !colorIsDark(list.hexColor),
'has-background': background !== null 'has-background': blurHashUrl !== ''
}" }"
:style="{ :style="{
'background-color': list.hexColor, 'background-color': list.hexColor,
'background-image': background !== null ? `url(${background})` : false, 'background-image': blurHashUrl !== null ? `url(${blurHashUrl})` : false,
}" }"
:to="{ name: 'list.index', params: { listId: list.id} }" :to="{ name: 'list.index', params: { listId: list.id} }"
class="list-card" class="list-card"
v-if="list !== null && (showArchived ? true : !list.isArchived)" v-if="list !== null && (showArchived ? true : !list.isArchived)"
> >
<div
class="list-background background-fade-in"
:class="{'is-visible': background}"
:style="{'background-image': background !== null ? `url(${background})` : false}"></div>
<div class="list-content">
<div class="is-archived-container"> <div class="is-archived-container">
<span class="is-archived" v-if="list.isArchived"> <span class="is-archived" v-if="list.isArchived">
{{ $t('namespace.archived') }} {{ $t('namespace.archived') }}
@ -24,6 +29,7 @@
</span> </span>
</div> </div>
<div class="title">{{ list.title }}</div> <div class="title">{{ list.title }}</div>
</div>
</router-link> </router-link>
</template> </template>
@ -32,12 +38,14 @@ import {PropType, ref, watch} from 'vue'
import {useStore} from 'vuex' import {useStore} from 'vuex'
import ListService from '@/services/list' import ListService from '@/services/list'
import {getBlobFromBlurHash} from '@/helpers/getBlobFromBlurHash'
import {colorIsDark} from '@/helpers/color/colorIsDark' import {colorIsDark} from '@/helpers/color/colorIsDark'
import ListModel from '@/models/list' import ListModel from '@/models/list'
const background = ref<string | null>(null) const background = ref<string | null>(null)
const backgroundLoading = ref(false) const backgroundLoading = ref(false)
const blurHashUrl = ref('')
const props = defineProps({ const props = defineProps({
list: { list: {
@ -57,6 +65,11 @@ async function loadBackground() {
return return
} }
const blurHash = await getBlobFromBlurHash(props.list.backgroundBlurHash)
if (blurHash) {
blurHashUrl.value = window.URL.createObjectURL(blurHash)
}
backgroundLoading.value = true backgroundLoading.value = true
const listService = new ListService() const listService = new ListService()
@ -86,14 +99,34 @@ function toggleFavoriteList(list: ListModel) {
height: $list-height; height: $list-height;
background: var(--white); background: var(--white);
margin: 0 $list-spacing $list-spacing 0; margin: 0 $list-spacing $list-spacing 0;
padding: 1rem;
border-radius: $radius; border-radius: $radius;
box-shadow: var(--shadow-sm); box-shadow: var(--shadow-sm);
transition: box-shadow $transition; transition: box-shadow $transition;
position: relative;
overflow: hidden;
display: flex; &.has-light-text .title {
justify-content: space-between; color: var(--light);
flex-wrap: wrap; }
&.has-background, .list-background {
background-size: cover;
background-repeat: no-repeat;
background-position: center;
}
&.has-background .list-content .title {
text-shadow: 0 0 10px var(--black), 1px 1px 5px var(--grey-700), -1px -1px 5px var(--grey-700);
color: var(--white);
}
.list-background {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
}
&:hover { &:hover {
box-shadow: var(--shadow-md); box-shadow: var(--shadow-md);
@ -141,6 +174,15 @@ function toggleFavoriteList(list: ListModel) {
} }
} }
.list-content {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
padding: 1rem;
position: absolute;
height: 100%;
width: 100%;
.is-archived-container { .is-archived-container {
width: 100%; width: 100%;
text-align: right; text-align: right;
@ -168,21 +210,6 @@ function toggleFavoriteList(list: ListModel) {
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
&.has-light-text .title {
color: var(--light);
}
&.has-background {
background-size: cover;
background-repeat: no-repeat;
background-position: center;
.title {
text-shadow: 0 0 10px var(--black), 1px 1px 5px var(--grey-700), -1px -1px 5px var(--grey-700);
color: var(--white);
}
}
.favorite { .favorite {
transition: opacity $transition, color $transition; transition: opacity $transition, color $transition;
opacity: 0; opacity: 0;
@ -205,5 +232,7 @@ function toggleFavoriteList(list: ListModel) {
&:hover .favorite { &:hover .favorite {
opacity: 1; opacity: 1;
} }
}
} }
</style> </style>

View File

@ -64,6 +64,9 @@
import BaseButton from '@/components/base/BaseButton.vue' import BaseButton from '@/components/base/BaseButton.vue'
import {ref, watch} from 'vue' import {ref, watch} from 'vue'
import {useScrollLock} from '@vueuse/core' import {useScrollLock} from '@vueuse/core'
import {useStore} from 'vuex'
const store = useStore()
const props = withDefaults(defineProps<{ const props = withDefaults(defineProps<{
enabled?: boolean, enabled?: boolean,
@ -86,6 +89,7 @@ watch(
() => props.enabled, () => props.enabled,
enabled => { enabled => {
scrollLock.value = enabled scrollLock.value = enabled
store.commit('modalActive', enabled)
}, },
{ {
immediate: true, immediate: true,

View File

@ -0,0 +1,31 @@
import {decode} from 'blurhash'
export async function getBlobFromBlurHash(blurHash: string): Promise<Blob | null> {
if (blurHash === '') {
return null
}
const pixels = decode(blurHash, 32, 32)
const canvas = document.createElement('canvas')
canvas.width = 32
canvas.height = 32
const ctx = canvas.getContext('2d')
if (ctx === null) {
return null
}
const imageData = ctx.createImageData(32, 32)
imageData.data.set(pixels)
ctx.putImageData(imageData, 0, 0)
return new Promise<Blob>((resolve, reject) => {
canvas.toBlob(b => {
if (b === null) {
reject(b)
return
}
resolve(b)
})
})
}

View File

@ -7,6 +7,7 @@ export default class BackgroundImageModel extends AbstractModel {
url: '', url: '',
thumb: '', thumb: '',
info: {}, info: {},
blurHash: '',
} }
} }
} }

View File

@ -44,6 +44,7 @@ export default class ListModel extends AbstractModel {
isFavorite: false, isFavorite: false,
subscription: null, subscription: null,
position: 0, position: 0,
backgroundBlurHash: '',
created: null, created: null,
updated: null, updated: null,

View File

@ -1,6 +1,8 @@
import {createStore} from 'vuex' import {createStore} from 'vuex'
import {getBlobFromBlurHash} from '../helpers/getBlobFromBlurHash'
import { import {
BACKGROUND, BACKGROUND,
BLUR_HASH,
CURRENT_LIST, CURRENT_LIST,
HAS_TASKS, HAS_TASKS,
KEYBOARD_SHORTCUTS_ACTIVE, KEYBOARD_SHORTCUTS_ACTIVE,
@ -44,10 +46,12 @@ export const store = createStore({
isArchived: false, isArchived: false,
}), }),
background: '', background: '',
blurHash: '',
hasTasks: false, hasTasks: false,
menuActive: true, menuActive: true,
keyboardShortcutsActive: false, keyboardShortcutsActive: false,
quickActionsActive: false, quickActionsActive: false,
modalActive: false,
}, },
mutations: { mutations: {
[LOADING](state, loading) { [LOADING](state, loading) {
@ -83,6 +87,12 @@ export const store = createStore({
[BACKGROUND](state, background) { [BACKGROUND](state, background) {
state.background = background state.background = background
}, },
[BLUR_HASH](state, blurHash) {
state.blurHash = blurHash
},
modalActive(state, active) {
state.modalActive = active
},
}, },
actions: { actions: {
async [CURRENT_LIST]({state, commit}, currentList) { async [CURRENT_LIST]({state, commit}, currentList) {
@ -90,6 +100,7 @@ export const store = createStore({
if (currentList === null) { if (currentList === null) {
commit(CURRENT_LIST, {}) commit(CURRENT_LIST, {})
commit(BACKGROUND, null) commit(BACKGROUND, null)
commit(BLUR_HASH, null)
return return
} }
@ -122,6 +133,11 @@ export const store = createStore({
) { ) {
if (currentList.backgroundInformation) { if (currentList.backgroundInformation) {
try { try {
const blurHash = await getBlobFromBlurHash(currentList.backgroundBlurHash)
if (blurHash) {
commit(BLUR_HASH, window.URL.createObjectURL(blurHash))
}
const listService = new ListService() const listService = new ListService()
const background = await listService.background(currentList) const background = await listService.background(currentList)
commit(BACKGROUND, background) commit(BACKGROUND, background)
@ -133,6 +149,7 @@ export const store = createStore({
if (typeof currentList.backgroundInformation === 'undefined' || currentList.backgroundInformation === null) { if (typeof currentList.backgroundInformation === 'undefined' || currentList.backgroundInformation === null) {
commit(BACKGROUND, null) commit(BACKGROUND, null)
commit(BLUR_HASH, null)
} }
commit(CURRENT_LIST, currentList) commit(CURRENT_LIST, currentList)

View File

@ -6,6 +6,6 @@ export const MENU_ACTIVE = 'menuActive'
export const KEYBOARD_SHORTCUTS_ACTIVE = 'keyboardShortcutsActive' export const KEYBOARD_SHORTCUTS_ACTIVE = 'keyboardShortcutsActive'
export const QUICK_ACTIONS_ACTIVE = 'quickActionsActive' export const QUICK_ACTIONS_ACTIVE = 'quickActionsActive'
export const BACKGROUND = 'background' export const BACKGROUND = 'background'
export const BLUR_HASH = 'blurHash'
export const CONFIG = 'config' export const CONFIG = 'config'
export const AUTH = 'auth'

View File

@ -1,10 +1,14 @@
.app-container.has-background, .app-container.has-background,
.link-share-container.has-background { .link-share-container.has-background {
position: relative;
&, .app-container-background {
background-position: center; background-position: center;
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;
background-attachment: fixed; background-attachment: fixed;
min-height: 100vh; min-height: 100vh;
}
// FIXME: move to pagination component // FIXME: move to pagination component
.pagination-link:not(.is-current) { .pagination-link:not(.is-current) {
@ -33,3 +37,20 @@
} }
} }
} }
.app-container-background {
width: 100vw;
height: 100vh;
position: fixed;
z-index: 0;
}
.background-fade-in {
opacity: 0;
transition: opacity $transition;
transition-delay: $transition-duration * 2; // To fake an appearing background
&.is-visible {
opacity: 1;
}
}

View File

@ -55,7 +55,7 @@ import Message from '@/components/misc/message.vue'
import ListModel from '@/models/list' import ListModel from '@/models/list'
import ListService from '@/services/list' import ListService from '@/services/list'
import {BACKGROUND, CURRENT_LIST} from '@/store/mutation-types' import {BACKGROUND, BLUR_HASH, CURRENT_LIST} from '@/store/mutation-types'
import {getListTitle} from '@/helpers/getListTitle' import {getListTitle} from '@/helpers/getListTitle'
import {saveListToHistory} from '@/modules/listHistory' import {saveListToHistory} from '@/modules/listHistory'
@ -145,6 +145,7 @@ async function loadList(listIdToLoad: number) {
const listFromStore = store.getters['lists/getListById'](listData.id) const listFromStore = store.getters['lists/getListById'](listData.id)
if (listFromStore !== null) { if (listFromStore !== null) {
store.commit(BACKGROUND, null) store.commit(BACKGROUND, null)
store.commit(BLUR_HASH, null)
store.commit(CURRENT_LIST, listFromStore) store.commit(CURRENT_LIST, listFromStore)
} }

View File

@ -35,16 +35,25 @@
v-model="backgroundSearchTerm" v-model="backgroundSearchTerm"
/> />
<p class="unsplash-link"> <p class="unsplash-link">
<a href="https://unsplash.com" rel="noreferrer noopener nofollow" target="_blank">{{ $t('list.background.poweredByUnsplash') }}</a> <a href="https://unsplash.com" rel="noreferrer noopener nofollow" target="_blank">
{{ $t('list.background.poweredByUnsplash') }}
</a>
</p> </p>
<div class="image-search-result"> <div class="image-search-result">
<a <a
:key="im.id" :key="im.id"
:style="{'background-image': `url(${backgroundThumbs[im.id]})`}" :style="{'background-image': `url(${backgroundBlurHashes[im.id]})`}"
@click="() => setBackground(im.id)" @click="() => setBackground(im.id)"
class="image" class="image"
v-for="im in backgroundSearchResult"> v-for="im in backgroundSearchResult">
<a :href="`https://unsplash.com/@${im.info.author}`" rel="noreferrer noopener nofollow" target="_blank" class="info"> <transition name="fade">
<img :src="backgroundThumbs[im.id]" alt="" v-if="backgroundThumbs[im.id]"/>
</transition>
<a
:href="`https://unsplash.com/@${im.info.author}`"
rel="noreferrer noopener nofollow"
target="_blank"
class="info">
{{ im.info.authorName }} {{ im.info.authorName }}
</a> </a>
</a> </a>
@ -65,6 +74,8 @@
<script> <script>
import {mapState} from 'vuex' import {mapState} from 'vuex'
import {getBlobFromBlurHash} from '../../../helpers/getBlobFromBlurHash'
import BackgroundUnsplashService from '../../../services/backgroundUnsplash' import BackgroundUnsplashService from '../../../services/backgroundUnsplash'
import BackgroundUploadService from '../../../services/backgroundUpload' import BackgroundUploadService from '../../../services/backgroundUpload'
import ListService from '@/services/list' import ListService from '@/services/list'
@ -83,6 +94,7 @@ export default {
backgroundSearchTerm: '', backgroundSearchTerm: '',
backgroundSearchResult: [], backgroundSearchResult: [],
backgroundThumbs: {}, backgroundThumbs: {},
backgroundBlurHashes: {},
currentPage: 1, currentPage: 1,
// We're using debounce to not search on every keypress but with a delay. // We're using debounce to not search on every keypress but with a delay.
@ -120,8 +132,16 @@ export default {
this.currentPage = page this.currentPage = page
const result = await this.backgroundService.getAll({}, {s: this.backgroundSearchTerm, p: page}) const result = await this.backgroundService.getAll({}, {s: this.backgroundSearchTerm, p: page})
this.backgroundSearchResult = this.backgroundSearchResult.concat(result) this.backgroundSearchResult = this.backgroundSearchResult.concat(result)
result.forEach(async background => { result.forEach(background => {
this.backgroundThumbs[background.id] = await this.backgroundService.thumb(background) getBlobFromBlurHash(background.blurHash)
.then(b => {
this.backgroundBlurHashes[background.id] = window.URL.createObjectURL(b)
})
this.backgroundService.thumb(background)
.then(b => {
this.backgroundThumbs[background.id] = b
})
}) })
}, },
@ -186,6 +206,7 @@ export default {
background-size: cover; background-size: cover;
background-position: center; background-position: center;
display: flex; display: flex;
position: relative;
@media screen and (min-width: $desktop) { @media screen and (min-width: $desktop) {
&:nth-child(5n) { &:nth-child(5n) {
@ -229,6 +250,11 @@ export default {
font-weight: bold; font-weight: bold;
color: var(--white); color: var(--white);
transition: opacity $transition; transition: opacity $transition;
position: absolute;
}
img {
object-fit: cover;
} }
&:hover .info { &:hover .info {

View File

@ -4217,6 +4217,11 @@ blueimp-md5@^2.10.0:
resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.19.0.tgz#b53feea5498dcb53dc6ec4b823adb84b729c4af0" resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.19.0.tgz#b53feea5498dcb53dc6ec4b823adb84b729c4af0"
integrity sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w== integrity sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==
blurhash@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.4.tgz#a7010ceb3019cd2c9809b17c910ebf6175d29244"
integrity sha512-MXIPz6zwYUKayju+Uidf83KhH0vodZfeRl6Ich8Gu+KGl0JgKiFq9LsfqV7cVU5fKD/AotmduZqvOfrGKOfTaA==
body-parser@1.19.0: body-parser@1.19.0:
version "1.19.0" version "1.19.0"
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"