Compare commits

..

No commits in common. "a974d2d245dc6df2315586fea5e27268b995a878" and "d042f75b90fb422664be91e1121dc3ec3e0c429e" have entirely different histories.

3 changed files with 5 additions and 7 deletions

View File

@ -26,7 +26,7 @@ export default defineComponent({
async function updateUser(value: FG.User) { async function updateUser(value: FG.User) {
await userStore.updateUser(value); await userStore.updateUser(value);
user.value = value; user.value = value
} }
return { return {

View File

@ -4,7 +4,7 @@
<div v-if="avatar" class="col-4"> <div v-if="avatar" class="col-4">
<div style="width: 100%; padding-bottom: 100%; position: relative"> <div style="width: 100%; padding-bottom: 100%; position: relative">
<q-avatar style="position: absolute; top: 0; left: 0; width: 100%; height: 100%"> <q-avatar style="position: absolute; top: 0; left: 0; width: 100%; height: 100%">
<img :src="api.defaults.baseURL + avatarLink" :onerror="error" /> <img :src="avatarLink" :onerror="error" />
</q-avatar> </q-avatar>
</div> </div>
</div> </div>
@ -26,7 +26,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { useMainStore, useUserStore, api } from '@flaschengeist/api'; import { useMainStore, useUserStore } from '@flaschengeist/api';
import { computed, defineComponent, onMounted, ref } from 'vue'; import { computed, defineComponent, onMounted, ref } from 'vue';
export default defineComponent({ export default defineComponent({
@ -65,7 +65,7 @@ export default defineComponent({
.filter((user) => user.userid !== mainStore.currentUser.userid) .filter((user) => user.userid !== mainStore.currentUser.userid)
); );
return { avatar, avatarLink, error, name, hasBirthday, birthday, api }; return { avatar, avatarLink, error, name, hasBirthday, birthday };
}, },
}); });
</script> </script>

View File

@ -139,9 +139,7 @@ export default defineComponent({
const isCurrentUser = computed(() => userModel.value.userid === mainStore.currentUser.userid); const isCurrentUser = computed(() => userModel.value.userid === mainStore.currentUser.userid);
/* Reset model if props changed */ /* Reset model if props changed */
watchEffect(() => { watchEffect(() => {if(props.user.userid && props.user.userid !== userModel.value.userid) reset()})
if (props.user.userid && props.user.userid !== userModel.value.userid) reset();
});
function onAvatarRejected() { function onAvatarRejected() {
Notify.create({ Notify.create({