Merge remote-tracking branch 'origin/main'

This commit is contained in:
778a69cd 2023-08-16 13:29:05 +02:00
commit 922ce515f9
4 changed files with 70 additions and 84 deletions

View file

@ -1,86 +1,68 @@
<template>
<div class="flex items-center">
<figure class="image" v-if="imageSrc && !imagePreviewLoadingError">
<img :src="imageSrc" @error="showImageLoadingError" />
</figure>
<figure class="image is-128x128" v-else>
<div>
<o-upload
rootClass="!flex"
v-if="!imageSrc || imagePreviewLoadingError || pictureTooBig"
@update:modelValue="onFileChanged"
:accept="accept"
drag-drop
>
<div
class="image-placeholder"
:class="{ error: imagePreviewLoadingError }"
class="w-100 rounded text-center p-4 rounded-xl border-dashed border-2 border-gray-600"
>
<span class="has-text-centered" v-if="imagePreviewLoadingError">{{
$t("Error while loading the preview")
}}</span>
<span class="has-text-centered" v-else>{{
textFallbackWithDefault
}}</span>
<span class="mx-auto flex w-fit">
<Upload />
<span class="capitalize"
>{{ $t("Click to upload") }} {{ textFallbackWithDefault }}</span
>
</span>
<p v-if="pictureTooBig" class="text-mbz-danger">
{{
$t(
"The selected picture is too heavy. You need to select a file smaller than {size}.",
{ size: formatBytes(maxSize) }
)
}}
</p>
<span
class="has-text-centered text-mbz-danger"
v-if="imagePreviewLoadingError"
>{{ $t("Error while loading the preview") }}</span
>
</div>
</figure>
</o-upload>
</div>
<div class="flex flex-col">
<p v-if="modelValue" class="inline-flex">
<span class="block truncate max-w-[200px]" :title="modelValue.name">{{
modelValue.name
}}</span>
<span>({{ formatBytes(modelValue.size) }})</span>
</p>
<p v-if="pictureTooBig" class="text-mbz-danger">
{{
$t(
"The selected picture is too heavy. You need to select a file smaller than {size}.",
{ size: formatBytes(maxSize) }
)
}}
</p>
<o-field class="justify-center" variant="primary">
<o-upload @update:modelValue="onFileChanged" :accept="accept" drag-drop>
<span>
<Upload />
<span>{{ $t("Click to upload") }}</span>
</span>
</o-upload>
</o-field>
<div
v-if="
imageSrc &&
!imagePreviewLoadingError &&
!pictureTooBig &&
!imagePreviewLoadingError
"
>
<figure
class="w-fit relative image mx-auto my-4"
v-if="imageSrc && !imagePreviewLoadingError"
>
<img
class="max-h-52 rounded-xl"
:src="imageSrc"
@error="showImageLoadingError"
/>
<o-button
variant="text"
class="!absolute right-1 bottom-1"
variant="danger"
v-if="imageSrc"
@click="removeOrClearPicture"
@keyup.enter="removeOrClearPicture"
>
{{ $t("Clear") }}
</o-button>
</div>
</figure>
</div>
</template>
<style scoped lang="scss">
@use "@/styles/_mixins" as *;
figure.image {
// @include margin-right(30px);
max-height: 200px;
max-width: 200px;
overflow: hidden;
}
.image-placeholder {
background-color: grey;
width: 100%;
height: 100%;
border-radius: 100%;
display: flex;
justify-content: center;
align-items: center;
&.error {
border: 2px solid red;
}
span {
flex: 1;
color: #eee;
}
}
</style>
<script lang="ts" setup>
import { IMedia } from "@/types/media.model";
import { computed, ref, watch } from "vue";

View file

@ -8,13 +8,14 @@
}}</span>
<span v-else>{{ $t("I create an identity") }}</span>
</h1>
<picture-upload
v-model="avatarFile"
:defaultImage="identity.avatar"
:maxSize="avatarMaxSize"
class="picture-upload"
/>
<o-field horizontal :label="t('Avatar')">
<picture-upload
v-model="avatarFile"
:defaultImage="identity.avatar"
:maxSize="avatarMaxSize"
class="picture-upload"
/>
</o-field>
<o-field
horizontal

View file

@ -9,11 +9,14 @@
<form ref="form">
<h2>{{ t("General information") }}</h2>
<picture-upload
v-model:modelValue="pictureFile"
:textFallback="t('Headline picture')"
:defaultImage="event.picture"
/>
<o-field :label="t('Headline picture')">
<picture-upload
v-model:modelValue="pictureFile"
:textFallback="t('Headline picture')"
:defaultImage="event.picture"
/>
</o-field>
<o-field
:label="t('Title')"

View file

@ -23,8 +23,8 @@
<fieldset>
<legend class="sr-only">{{ t("Theme") }}</legend>
<o-radio
:class="{ 'border-mbz-bluegreen border-2': theme === 'light' }"
class="p-4 bg-white text-zinc-800 rounded-md mt-2 mr-2"
:class="{ 'border-mbz-bluegreen': theme === 'light' }"
class="p-4 bg-white text-zinc-800 rounded-md mt-2 mr-2 border-2"
:disabled="systemTheme"
v-model="theme"
name="theme"
@ -32,8 +32,8 @@
>{{ t("Light") }}</o-radio
>
<o-radio
:class="{ 'border-mbz-bluegreen border-2': theme === 'dark' }"
class="p-4 bg-zinc-800 rounded-md text-white mt-2 ml-2"
:class="{ 'border-mbz-bluegreen': theme === 'dark' }"
class="p-4 bg-zinc-800 rounded-md text-white mt-2 ml-2 border-2"
:disabled="systemTheme"
v-model="theme"
name="theme"