Merge branch 'vue3-again' into shigusegubu-vue3

* vue3-again:
  fix being unable to set/reset background (and possibly avatar/banner)
  fix background not showing
This commit is contained in:
Henry Jameson 2022-03-28 15:02:01 +03:00
commit 22f4cf1d4a
2 changed files with 29 additions and 18 deletions

View file

@ -1,11 +1,11 @@
<template> <template>
<div <div
id="app-loaded" id="app-loaded"
:style="bgStyle"
> >
<div <div
id="app_bg_wrapper" id="app_bg_wrapper"
class="app-bg-wrapper" class="app-bg-wrapper"
:style="bgStyle"
/> />
<MobileNav v-if="isMobileLayout" /> <MobileNav v-if="isMobileLayout" />
<DesktopNav v-else /> <DesktopNav v-else />

View file

@ -68,8 +68,9 @@
class="delete-field button-unstyled -hover-highlight" class="delete-field button-unstyled -hover-highlight"
@click="deleteField(i)" @click="deleteField(i)"
> >
<!-- TODO something is wrong with v-show here -->
<FAIcon <FAIcon
v-show="newFields.length > 1" v-if="newFields.length > 1"
icon="times" icon="times"
/> />
</button> </button>
@ -106,14 +107,17 @@
:src="user.profile_image_url_original" :src="user.profile_image_url_original"
class="current-avatar" class="current-avatar"
> >
<FAIcon <button
v-if="!isDefaultAvatar && pickAvatarBtnVisible" v-if="!isDefaultAvatar && pickAvatarBtnVisible"
:title="$t('settings.reset_avatar')" :title="$t('settings.reset_avatar')"
@click="resetAvatar"
>
<FAIcon
class="reset-button" class="reset-button"
icon="times" icon="times"
type="button" type="button"
@click="resetAvatar"
/> />
</button>
</div> </div>
<p>{{ $t('settings.set_new_avatar') }}</p> <p>{{ $t('settings.set_new_avatar') }}</p>
<button <button
@ -135,14 +139,17 @@
<h2>{{ $t('settings.profile_banner') }}</h2> <h2>{{ $t('settings.profile_banner') }}</h2>
<div class="banner-background-preview"> <div class="banner-background-preview">
<img :src="user.cover_photo"> <img :src="user.cover_photo">
<FAIcon <button
v-if="!isDefaultBanner" v-if="!isDefaultBanner"
:title="$t('settings.reset_profile_banner')" :title="$t('settings.reset_profile_banner')"
@click="resetBanner"
>
<FAIcon
class="reset-button" class="reset-button"
icon="times" icon="times"
type="button" type="button"
@click="resetBanner"
/> />
</button>
</div> </div>
<p>{{ $t('settings.set_new_profile_banner') }}</p> <p>{{ $t('settings.set_new_profile_banner') }}</p>
<img <img
@ -174,14 +181,18 @@
<h2>{{ $t('settings.profile_background') }}</h2> <h2>{{ $t('settings.profile_background') }}</h2>
<div class="banner-background-preview"> <div class="banner-background-preview">
<img :src="user.background_image"> <img :src="user.background_image">
<FAIcon <button
v-if="!isDefaultBackground" v-if="!isDefaultBackground"
class="button-unstyled"
@click="resetBackground"
:title="$t('settings.reset_profile_background')" :title="$t('settings.reset_profile_background')"
>
<FAIcon
class="reset-button" class="reset-button"
icon="times" icon="times"
type="button" type="button"
@click="resetBackground"
/> />
</button>
</div> </div>
<p>{{ $t('settings.set_new_profile_background') }}</p> <p>{{ $t('settings.set_new_profile_background') }}</p>
<img <img