strawberries/frangipane-client
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fullstack: added profile pictures/avatars to accounts and improved settings page layout

Browse Source
This commit is contained in:
eiiko6
2026-01-11 18:04:24 +01:00
parent b9819e7562
commit 8b144d87f4
17 changed files with 608 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/api/account.ts
View File

@@ -1,10 +1,37 @@
import { UpdateUserResponse } from '../types';
import { apiFetch } from './client'
// import type { User } from '../types'
import { upload } from '@tauri-apps/plugin-upload';
import { getAuthData } from '../authStore';
import { API } from '../main.ts';
export function updateSettings(username: string, email: string, password: string) {
return apiFetch<UpdateUserResponse>('/settings', {
return apiFetch<UpdateUserResponse>('/account/settings', {
method: 'PUT',
body: JSON.stringify({ username, email, password }),
});
}
export async function uploadAvatar(
filePath: string,
onProgress: (progress: number, total: number) => void
) {
const auth = await getAuthData();
const url = `${API}/account/upload-avatar`;
const headers = new Map<string, string>([
['Authorization', `Bearer ${auth.token}`],
['Content-Type', 'application/octet-stream']
]);
return upload(
url,
filePath,
({ progress, total }) => {
onProgress(progress, total);
},
headers
);
}
export function getAvatar(uuid: string): string {
return `${API}/account/get-avatar/${uuid}`;
}

5
src/api/client.ts
View File

@@ -9,11 +9,14 @@ export async function apiFetch<T>(
): Promise<T> {
const auth = await getAuthData()
const isFormData = options.body instanceof FormData;
const res = await fetch(`${API}${path}`, {
...options,
method: options.method || 'GET',
headers: {
'Content-Type': 'application/json',
// Only add json header if it's not formdata
...(!isFormData ? { 'Content-Type': 'application/json' } : {}),
...(auth.token ? { Authorization: `Bearer ${auth.token}` } : {}),
...options.headers,
},

16
src/authStore.ts
View File

@@ -1,5 +1,6 @@
import { load, Store } from '@tauri-apps/plugin-store'
import { UpdateUserResponse, User } from './types'
import { getAvatar } from './api/account'
let store: Store | null = null
@@ -32,7 +33,8 @@ export async function updateLocalUser(newData: UpdateUserResponse, uuid?: string
const updatedUser = {
username: newData.username,
email: newData.email,
uuid
uuid,
avatar_url: `${getAvatar(uuid || '')}?t=${Date.now()}`
}
const s = await getStore()
@@ -40,6 +42,18 @@ export async function updateLocalUser(newData: UpdateUserResponse, uuid?: string
await s.save()
}
export async function refreshLocalUser() {
const s = await getStore()
const user = await s.get<User>('user')
if (user) {
user.avatar_url = `${getAvatar(user.uuid)}?t=${Date.now()}`
await s.set('user', user)
await s.save()
}
}
export async function setLastRoom(uuid: string) {
if (!uuid || uuid === 'none') return
const s = await getStore()

5
src/components/UpdateAccountModal.vue
View File

@@ -28,7 +28,7 @@
</button>
<button type="submit" :disabled="isSubmitting">
{{ isSubmitting ? $t('settings-updating') : $t('settings-update-save') }}
{{ isSubmitting ? $t('shared-updating') : $t('shared-save') }}
</button>
</div>
</form>
@@ -95,8 +95,7 @@ async function submit() {
.backdrop {
position: fixed;
inset: 0;
background: rgba(0, 0, 0, 0.7);
backdrop-filter: blur(4px);
background: rgba(0, 0, 0, 0.6);
display: flex;
align-items: center;
justify-content: center;

270
src/components/UploadAvatarModal.vue Normal file
View File

@@ -0,0 +1,270 @@
<template>
<div class="backdrop" @click.self="emit('close')">
<div class="modal">
<h2>{{ $t('settings-upload-avatar-title') || 'Upload Avatar' }}</h2>
<p v-if="errorMessage" class="error-message">{{ errorMessage }}</p>
<div class="drop-zone" :class="{ 'is-dragging': isDragging }" @click="pickFile">
<div v-if="!previewUrl" class="drop-content">
<i class="fa-solid fa-cloud-arrow-up"></i>
<p>{{ $t('settings-upload-prompt') || 'Drag an image here or click to browse' }}</p>
</div>
<div v-else class="preview-container">
<img :src="previewUrl" alt="Avatar preview" />
<div class="overlay">
<span>{{ $t('settings-change-photo') || 'Change Photo' }}</span>
</div>
</div>
</div>
<div v-if="isSubmitting" class="progress-container">
<div class="progress-bar" :style="{ width: uploadProgress + '%' }"></div>
</div>
<div class="actions">
<button type="button" @click="emit('close')" class="secondary" :disabled="isSubmitting">
{{ $t('shared-cancel') }}
</button>
<button @click="handleUpload" :disabled="isSubmitting || !selectedPath">
{{ isSubmitting ? $t('shared-uploading') || 'Uploading...' : $t('shared-save') || 'Save Avatar' }}
</button>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { ref, onMounted, onUnmounted } from 'vue';
import { uploadAvatar } from '../api/account';
import { listen, UnlistenFn } from '@tauri-apps/api/event';
import { open } from '@tauri-apps/plugin-dialog';
import { convertFileSrc } from '@tauri-apps/api/core';
import { refreshLocalUser } from '../authStore';
const emit = defineEmits(['close', 'updated']);
const isDragging = ref(false);
const isSubmitting = ref(false);
const errorMessage = ref('');
const uploadProgress = ref(0);
const selectedPath = ref<string | null>(null);
const previewUrl = ref<string | null>(null);
let unlistenDrag: UnlistenFn;
let unlistenHover: UnlistenFn;
let unlistenLeave: UnlistenFn;
onMounted(async () => {
// When files are hovered over the window
unlistenHover = await listen('tauri://drag-enter', () => {
isDragging.value = true;
});
unlistenLeave = await listen('tauri://drag-leave', () => {
isDragging.value = false;
});
// When files are dropped
unlistenDrag = await listen<{ paths: string[] }>('tauri://drag-drop', (event) => {
isDragging.value = false;
const path = event.payload.paths[0];
if (path && isImage(path)) {
setFile(path);
} else {
errorMessage.value = "Please drop a valid image file.";
}
});
});
onUnmounted(() => {
if (unlistenDrag) unlistenDrag();
if (unlistenHover) unlistenHover();
if (unlistenLeave) unlistenLeave();
});
async function pickFile() {
try {
const selected = await open({
multiple: false,
filters: [{ name: 'Image', extensions: ['png', 'jpeg', 'jpg', 'webp'] }]
});
if (selected && typeof selected === 'string') {
setFile(selected);
}
} catch (err) {
console.error(err);
}
}
// Utility to set path and preview
function setFile(path: string) {
selectedPath.value = path;
previewUrl.value = convertFileSrc(path);
errorMessage.value = '';
}
function isImage(path: string) {
return /\.(jpg|jpeg|png|webp|gif)$/i.test(path);
}
async function handleUpload() {
if (!selectedPath.value) return;
isSubmitting.value = true;
errorMessage.value = '';
uploadProgress.value = 0;
try {
await uploadAvatar(selectedPath.value, (progress, total) => {
uploadProgress.value = Math.round((progress / total) * 100);
});
await refreshLocalUser();
emit('updated');
emit('close');
} catch (err: any) {
console.error("Upload failed:", err);
errorMessage.value = 'Failed to upload avatar. Please try again.';
isSubmitting.value = false;
}
}
</script>
<style scoped>
.backdrop {
position: fixed;
inset: 0;
background: rgba(0, 0, 0, 0.6);
display: flex;
align-items: center;
justify-content: center;
z-index: 1000;
}
.modal {
background: var(--panel);
border: 1px solid var(--border);
border-radius: var(--radius);
padding: 1.5rem;
width: 100%;
max-width: 400px;
display: flex;
flex-direction: column;
gap: 1.2rem;
}
.drop-zone {
border: 2px dashed var(--border);
border-radius: var(--radius);
padding: 2rem;
text-align: center;
cursor: pointer;
transition: all 0.2s ease;
background: rgba(255, 255, 255, 0.02);
min-height: 180px;
display: flex;
align-items: center;
justify-content: center;
}
.drop-zone * {
pointer-events: none;
}
.drop-zone.is-dragging {
border-color: var(--accent);
background: rgba(var(--accent-rgb), 0.1);
transform: scale(1.02);
}
.drop-zone:hover {
border-color: var(--accent);
background: rgba(255, 255, 255, 0.05);
}
.drop-content i {
font-size: 2.5rem;
color: var(--muted);
margin-bottom: 1rem;
}
.preview-container {
position: relative;
width: 120px;
height: 120px;
}
.preview-container img {
width: 100%;
height: 100%;
object-fit: cover;
border-radius: 50%;
border: 2px solid var(--accent);
}
.progress-container {
width: 100%;
height: 4px;
background: var(--border);
border-radius: 2px;
overflow: hidden;
margin-top: -10px;
}
.progress-bar {
height: 100%;
background: var(--accent);
transition: width 0.2s ease;
}
.drop-zone.is-dragging {
border-color: var(--accent);
background: rgba(var(--accent-rgb), 0.1);
transform: scale(1.02);
pointer-events: none;
}
.overlay {
position: absolute;
inset: 0;
background: rgba(0, 0, 0, 0.5);
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
opacity: 0;
transition: opacity 0.2s;
}
.preview-container:hover .overlay {
opacity: 1;
}
.overlay span {
font-size: 0.8rem;
color: white;
}
.error-message {
color: var(--error);
font-size: 0.9rem;
}
.actions {
display: flex;
justify-content: flex-end;
gap: 0.5rem;
}
.secondary {
background: transparent;
color: var(--text);
border: 1px solid var(--border);
}
</style>

6
src/locales/en.ftl
View File

@@ -62,6 +62,7 @@ notifications-error-room-accept = An error occurred while accepting the invite.
notifications-error-room-decline = An error occurred while declining the invite.
## Settings page
settings-loading = Loading settings...
settings-title = Settings
settings-account = Account
settings-language = Language
@@ -74,6 +75,9 @@ settings-account-update-modal-title = Update your Account
settings-account-update-subtitle = Only fill in the fields you wish to change.
settings-new-password = New Password
settings-new-password-confirm = Confirm new password
settings-upload-prompt = Upload an image
settings-upload-avatar-btn = Upload an avatar
settings-upload-avatar-title = Upload an avatar
settings-update-save = Save Changes
settings-updating = Updating...
settings-error-required = Username and Email are required.
@@ -82,3 +86,5 @@ settings-error-failed = Update failed
## Shared
shared-cancel = Cancel
shared-error = An error occurred
shared-save = Save
shared-updating = Updating

8
src/locales/fr.ftl
View File

@@ -62,6 +62,7 @@ notifications-error-room-accept = Erreur lors de l'acceptation de l'invitation.
notifications-error-room-decline = Erreur lors du refus de l'invitation.
## Settings page
settings-loading = Chargement des paramètres...
settings-title = Paramètres
settings-account = Compte
settings-language = Langue
@@ -74,11 +75,14 @@ settings-account-update-modal-title = Modifier votre compte
settings-account-update-subtitle = Remplissez uniquement ce que vous souhaitez changer.
settings-new-password = Nouveau mot de passe
settings-new-password-confirm = Confirmer le mot de passe
settings-update-save = Enregistrer
settings-updating = Mise à jour...
settings-upload-prompt = Importer une image
settings-upload-avatar-btn = Importer un avatar
settings-upload-avatar-title = Importer un avatar
settings-error-required = Le nom d'utilisateur et l'email sont requis.
settings-error-failed = Échec de la mise à jour
## Shared
shared-cancel = Annuler
shared-error = Une erreur est survenue
shared-save = Enregistrer
shared-updating = Mise à jour...

221
src/pages/SettingsPage.vue
View File

@@ -1,35 +1,48 @@
<template>
<div class="settings-page">
<h1>{{ $t('settings-title') }}</h1>
<div class="settings-page">
<h1>{{ $t('settings-title') }}</h1>
<UpdateAccountModal v-if="showUpdateModal" :user="user" @close="showUpdateModal = false"
@updated="fetchUserData" />
<UpdateAccountModal v-if="showUpdateModal" :user="user" @close="showUpdateModal = false" @updated="fetchUserData" />
<UploadAvatarModal v-if="showAvatarModal" @close="showAvatarModal = false" @updated="fetchUserData" />
<h2>{{ $t('settings-account') }}</h2>
<div v-if="user" class="info-card">
<button class="update-btn" @click="showUpdateModal = true">{{ $t('settings-update-btn') }}</button>
<p><strong>{{ $t('settings-label-username') }}</strong> {{ user.username }}</p>
<p><strong>{{ $t('settings-label-email') }}</strong> {{ user.email }}</p>
</div>
<div v-else class="loading-state">
<p>{{ $t('settings-loading') }}</p>
</div>
<h2>{{ $t('settings-account') }}</h2>
<div v-if="user" class="info-card">
<div class="avatar-display">
<img :src="user.avatar_url || '/tauri.svg'" class="avatar-img" />
<h2>{{ $t('settings-language') }}</h2>
<div class="input-group">
<div class="lang-grid">
<button v-for="lang in languages" :key="lang.code" class="lang-btn"
:class="{ active: currentLang === lang.code }" @click="changeLanguage(lang.code)">
{{ lang.name }}
</button>
</div>
</div>
<button class="logout-btn" @click="logout">
<i class="fa-solid fa-right-from-bracket"></i>
<span>{{ $t('settings-logout-btn') }}</span>
<button class="update-btn" @click="showAvatarModal = true">
{{ $t('settings-upload-avatar-btn') || 'Change Avatar' }}
</button>
</div>
<div class="info-display">
<div class="left">
<p><strong>{{ $t('settings-label-username') }}</strong> {{ user.username }}</p>
<p><strong>{{ $t('settings-label-email') }}</strong> {{ user.email }}</p>
</div>
<button class="update-btn" @click="showUpdateModal = true">{{ $t('settings-update-btn') }}</button>
</div>
</div>
<div v-else class="loading-state">
<p>{{ $t('settings-loading') }}</p>
</div>
<h2>{{ $t('settings-language') }}</h2>
<div class="input-group">
<div class="lang-grid">
<button v-for="lang in languages" :key="lang.code" class="lang-btn"
:class="{ active: currentLang === lang.code }" @click="changeLanguage(lang.code)">
{{ lang.name }}
</button>
</div>
</div>
<button class="logout-btn" @click="logout">
<i class="fa-solid fa-right-from-bracket"></i>
<span>{{ $t('settings-logout-btn') }}</span>
</button>
</div>
</template>
<script setup lang="ts">
@@ -42,6 +55,8 @@ import UpdateAccountModal from '../components/UpdateAccountModal.vue'
import { useFluent } from 'fluent-vue'
import { saveLocalePreference, getLocalePreference } from "../authStore.ts"
import { getSupportedLanguagesMetadata, setLanguage } from '../i18n'
import UploadAvatarModal from '../components/UploadAvatarModal.vue'
const showAvatarModal = ref(false)
const router = useRouter()
const user = ref<User | null>(null)
@@ -52,112 +67,146 @@ const currentLang = ref('')
const languages = computed(() => getSupportedLanguagesMetadata())
async function fetchUserData() {
try {
const auth = await getAuthData()
user.value = auth.user
} catch (err) {
console.error("Failed to load user data:", err)
}
try {
const auth = await getAuthData()
user.value = auth.user
} catch (err) {
console.error("Failed to load user data:", err)
}
}
onMounted(async () => {
const pref = await getLocalePreference()
// Synchronize the UI state with the actual active language
currentLang.value = pref || (navigator.language.split('-')[0])
const pref = await getLocalePreference()
// Synchronize the UI state with the actual active language
currentLang.value = pref || (navigator.language.split('-')[0])
fetchUserData()
fetchUserData()
})
async function changeLanguage(code: string) {
const actual = setLanguage(code)
currentLang.value = actual
await saveLocalePreference(actual)
const actual = setLanguage(code)
currentLang.value = actual
await saveLocalePreference(actual)
}
function logout() {
authLogout()
router.push('/login')
authLogout()
router.push('/login')
}
</script>
<style scoped>
.settings-page {
max-width: 720px;
margin: 0 auto;
padding: 2rem 1.5rem;
display: flex;
flex-direction: column;
gap: 1rem;
max-width: 720px;
margin: 0 auto;
padding: 2rem 1.5rem;
display: flex;
flex-direction: column;
gap: 0.5rem;
}
h2 {
margin-top: 20px;
margin-top: 20px;
}
.info-card {
position: relative;
background: var(--panel);
border: 1px solid var(--border);
border-radius: var(--radius);
padding: 1rem;
position: relative;
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: flex-start;
gap: 1rem;
background: var(--panel);
border: 1px solid var(--border);
border-radius: var(--radius);
padding: 1rem;
}
.update-btn {
position: absolute;
right: 10px;
top: 10px;
.avatar-display,
.info-display {
display: flex;
/* border: 1px solid var(--border); */
/* border-radius: var(--radius); */
/* background-color: rgba(255, 255, 255, 0.02); */
/* padding: 1rem; */
flex-direction: row;
gap: 1rem;
align-items: center;
flex-wrap: wrap;
}
.avatar-img {
width: 80px;
height: 80px;
border-radius: 50%;
object-fit: cover;
border: 2px solid var(--border);
}
/* .update-btn { */
/* position: absolute; */
/* right: 10px; */
/* top: 10px; */
/* } */
.lang-grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));
gap: 0.5rem;
margin-top: 0.5rem;
display: grid;
grid-template-columns: repeat(auto-fill, minmax(120px, 1fr));
gap: 0.5rem;
margin-top: 0.5rem;
}
.lang-btn {
background: var(--panel);
border: 1px solid var(--border);
color: var(--text);
margin: 0;
background: var(--panel);
border: 1px solid var(--border);
color: var(--text);
margin: 0;
}
.lang-btn.active {
background: var(--accent);
color: #000;
border-color: var(--accent);
background: var(--accent);
color: #000;
border-color: var(--accent);
}
.logout-btn {
cursor: pointer;
display: flex;
align-items: center;
gap: 10px;
margin-top: 30px;
padding: 10px 20px;
color: var(--text);
background-color: transparent;
border: 1px solid var(--error);
border-radius: var(--radius);
width: fit-content;
transition: all 0.2s ease;
cursor: pointer;
display: flex;
align-items: center;
gap: 10px;
margin-top: 30px;
padding: 10px 20px;
color: var(--text);
background-color: transparent;
border: 1px solid var(--error);
border-radius: var(--radius);
width: fit-content;
transition: all 0.2s ease;
}
.logout-btn:hover {
color: rgba(255, 80, 80, 0.8);
color: rgba(255, 80, 80, 0.8);
}
.logout-btn:hover i {
color: rgba(255, 80, 80, 0.8);
color: rgba(255, 80, 80, 0.8);
}
.logout-btn i {
font-size: 1.25rem;
font-size: 1.25rem;
}
.loading-state {
padding: 2rem;
text-align: center;
color: var(--muted);
padding: 2rem;
text-align: center;
color: var(--muted);
}
@media screen and (max-width: 720px) {
.avatar-display,
.info-display {
justify-content: center;
}
}
</style>

4
src/store.ts
View File

@@ -5,6 +5,7 @@ import { ref, computed } from 'vue'
import { fetchFriendRequests } from './api/friends'
import { fetchRoomInvites } from './api/rooms'
import type { FriendRequest, RoomInvite } from './types'
import { getAvatar } from './api/account'
export const initAuth = authStore.getAuthData
export const getLastRoom = authStore.getLastRoom
@@ -19,7 +20,8 @@ export async function login(email: string, username: string, password: string) {
let user: User = {
uuid: res.uuid,
username: res.username,
email: res.email
email: res.email,
avatar_url: await getAvatar(res.uuid)
};
await authStore.saveAuthData(res.token, user)
return { token: res.token, uuid: res.uuid, isAuthenticated: true }

1
src/types.ts
View File

@@ -2,6 +2,7 @@ export interface User {
uuid: string
username: string
email: string
avatar_url: string
}
export interface LoginResponse {