Added icon change

frontend/app/components/managers/ToastManager.vue

@@ -51,12 +51,12 @@ emitter.on('toast', data => {
 <style scoped lang="scss">
 .toast-container {
     height: 100%;
-    background-color: var(--color-background-soft);
+    background-color: var(--color-toast-background);
     padding: 10px;
     margin-left: 5px;
     border-top-right-radius: 6px;
     border-bottom-right-radius: 6px;
-    transform: translate(2px,0px)
+    flex-grow: 1;
 }
 
 .toast {
@@ -72,6 +72,7 @@ emitter.on('toast', data => {
     border-radius: 6px;
     text-align: center;
 
+    flex-direction: column;
     z-index: 9999999;
 
 
@@ -100,7 +101,7 @@ emitter.on('toast', data => {
     }
     
     &.show {
-        display: block;
+        display: flex;
     }
 
     /* Colors!!!! */

frontend/app/components/partials/EditUserPartial.vue

@@ -0,0 +1,167 @@
+<script setup>
+import { onMounted, ref } from 'vue';
+import { GetUser, LogoutUser } from '@/services/User'
+
+import Server from '@/services/Server'
+
+import { ClearWindows, CreateWindow, CreateChildWindow, ClearWindow } from '../../services/Windows';
+import { backendUrl } from '../../services/BackendURL';
+import Spinner from './Spinner.vue';
+const emitter = useEmitter();
+const loadedIcon = ref(false);
+
+const username = ref("");
+username.value = GetUser().username;
+
+function retrieveAvatar(){
+    let userAvatarDisplay = document.getElementById("upload-image");
+
+    // Hide image + show spinner while loading
+    loadedIcon.value = false;
+
+    Server().get('/user/retrieve-avatar?username=' + GetUser().username)
+    .then((response) => {
+        if(response.data.image){
+            const imgUrl = backendUrl + "public/" + response.data.image;
+
+            // Wait for the image to fully load
+            const img = new Image();
+            img.src = imgUrl;
+
+            img.onload = () => {
+                userAvatarDisplay.src = imgUrl;
+                loadedIcon.value = true;
+            };
+
+            img.onerror = () => {
+                console.log("Image failed to load");
+                loadedIcon.value = true; // fallback to avoid infinite spinner
+            };
+        }
+    })
+    .catch(() => console.log("Internal error"));
+}
+
+function LogOut(){
+    LogoutUser();
+
+    ClearWindows({type: "main_menu"});
+    CreateWindow('login');
+}
+
+function EditProfile(){
+    console.log("User:"); console.log(GetUser());
+    CreateChildWindow('main_menu', 'edit_profile', {
+        user: GetUser()
+    });
+}
+
+function EditSettings(){
+    ClearWindow('main_menu');
+    CreateWindow('settings', {
+        id: 'settings',
+        type: 'settings',
+        title: 'settings.title',
+        back: () => { ClearWindow('settings'); CreateWindow('main_menu');  }
+    });
+}
+
+onMounted(() => {
+    let userAvatarDisplay = document.getElementById("upload-image");
+    let sendAvatarFileUploader = document.getElementById("send-avatar-file-uploader");
+    
+    sendAvatarFileUploader.addEventListener("change", (event) => {
+        const formData = new FormData();
+        const image = event.target.files[0];
+
+        formData.append("image", image);
+
+        Server().post('/user/upload-avatar', formData, {
+            headers: { "Content-Type": "multipart/form-data" }
+        }).then((response) => {
+            retrieveAvatar();
+        }).catch((err) => console.log("Internal error"));
+    });
+
+    userAvatarDisplay.addEventListener("click", (event) => {
+        sendAvatarFileUploader.click();
+    });
+
+    retrieveAvatar();
+});
+</script>
+
+
+<template>
+    <form id="send-avatar-form" enctype="multipart/form-data">
+        <input name="file" type="file" accept="image/*" id="send-avatar-file-uploader">
+    </form>
+
+    <div class="main-user-container">
+        <div class="main-user-container-inner">
+            <div class="user-icon-container">
+                <img class="user-icon" src="/img/def-avatar.jpg" id="upload-image" draggable="false" v-show="loadedIcon">
+                <Spinner v-show="!loadedIcon" :size="30"></Spinner>
+            </div>
+            <div class="main-user-info">
+                <b>{{ username }}</b><br>Hola
+            </div>
+
+            <div class="main-user-actions">
+                <button class="btn-primary button-small sound-click" v-on:click.prevent="EditProfile">{{ $t("main-menu.edit-profile") }}</button>
+                <button class="btn-primary button-small sound-click" v-on:click.prevent="EditSettings">{{ $t("main-menu.settings") }}</button>
+                <button class="btn-primary button-small sound-click" v-on:click.prevent="LogOut">{{ $t("main-menu.log-out") }}</button>
+            </div>
+        </div>
+    </div>
+</template>
+
+
+<style scoped>
+#send-avatar-form {
+    display: none;
+}
+
+.button-small {
+    height: 32px;
+    padding: 10px;
+}
+
+.main-user-container {
+    background-color: var(--color-background-softer);
+    width: 100%;
+    user-select: none;
+}
+
+.main-user-container-inner {
+    padding: 10px;
+    display: flex;
+    align-items: center;
+
+    justify-content: center;
+}
+
+.main-user-info {
+    text-align: left;
+    margin-left: 10px;
+}
+
+.user-icon {
+    width: 40px;
+    height: 40px;
+}
+
+.user-icon-container {
+    width: 40px;
+    height: 40px;
+    overflow: hidden;
+}
+
+.main-user-actions {
+    margin-left: auto;
+
+    button {
+        margin-left: 10px;
+    }
+}
+</style>

frontend/app/components/partials/Spinner.vue

@@ -0,0 +1,33 @@
+<script setup>
+defineProps({
+  size: {
+    type: Number,
+    default: 10
+  }
+})
+</script>
+
+<template>
+  <div class="spinner">
+    <span
+      class="spinner-inner"
+      :style="{ width: size + 'px', height: size + 'px' }"
+    ></span>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.spinner-inner {
+  border: 2px solid white;
+  border-top: 2px solid transparent;
+  border-radius: 50%;
+  display: inline-block;
+  animation: spin 0.7s linear infinite;
+}
+
+@keyframes spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+</style>

frontend/app/components/partials/VersionRender.vue

@@ -0,0 +1,24 @@
+<script setup>
+const config = useRuntimeConfig()
+</script>
+
+
+<template>
+    <div class="version-render">
+        <span>Dragonroll {{ config.public.gitTag }}-{{ config.public.gitCommit }}@{{ config.public.gitBranch }}</span>
+            <br><span>{{ config.public.buildDate }}</span>
+    </div>
+</template>
+
+
+<style scoped>
+.version-render {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    user-select: none;
+}
+span{
+    color: rgb(59, 59, 59);
+}
+</style>

frontend/app/components/windows/LoginWindow.vue

@@ -14,6 +14,7 @@ import WindowHandle from './partials/WindowHandle.vue';
 import { DisplayToast } from '~/services/Toaster';
 import Server from '~/services/Server';
 import { SetUser } from '~/services/User';
+import Spinner from '../partials/Spinner.vue';
 
 const handle = ref(null);
 
@@ -25,6 +26,8 @@ let id = data.type;
 const username = ref("");
 const password = ref("");
 
+const loading = ref(false);
+
 onMounted(() => {
     SetupHandle(id, handle);
     SetSize(id, {width: 450, height: 480});
@@ -32,27 +35,28 @@ onMounted(() => {
     ResetPosition(id, "center");
 });
 
+function ShowMainMenu(){
+    CreateWindow('main_menu');
+    ClearWindow('login');
+}
+
 function login() {
-    Server().post('/user/login', { username: username.value, password: password.value }).then((response) => {
-    const data = response.data;
-    console.log(data);
+    loading.value = true;
+    Server().post('/user/login', { usermail: username.value, password: password.value }).then((response) => {
+        loading.value = false;
+        const data = response.data;
 
-    if(data.status == "error"){
-      DisplayToast('red', "Wrong username or password", 3000)
-    } else {
-      SetUser(data.token);
-
-      ShowMainMenu();
-    }
-  }).catch((error) => {
-    console.log(error);
-    if(error.response.status == 429){
-      // errorMessage.value = error.response.data;
-    } else {
-      // errorMessage.value = "Hi ha hagut un error intern, torna'ho a provar més tard";
-        console.log(error);
-    }
-  });
+        if(data.status == "error"){
+            DisplayToast('red', $t(data.msg), 3000)
+        } else {
+            SetUser(data.token);
+            DisplayToast('green', $t('login.success'), 3000);
+            ShowMainMenu();
+        }
+    }).catch((error) => {
+        loading.value = false;
+        DisplayToast('red', $t("errors.internal"), 3000);
+    });
 }
 
 function toRegister(){
@@ -84,7 +88,14 @@ function toRegister(){
                     <input id="password-field" type="password" :placeholder="$t('login.password-placeholder')" name="password" v-model="password" autocomplete="off" >
                 </div>
                 <div class="form-field">
-                    <button class="btn-primary sound-click">{{$t('login.log-in')}}</button>
+                    <button class="btn-primary sound-click">
+                        <span v-if="loading">
+                            <Spinner />
+                        </span>
+                        <span v-else>
+                            {{$t('login.log-in')}}
+                        </span>
+                    </button>
                 </div>
                 <div class="form-field center">
                     <p>{{$t('login.no-account')}} <a href="#" @click.prevent="toRegister">{{$t('login.register')}}</a></p>

frontend/app/components/windows/MainMenuWindow.vue

@@ -0,0 +1,78 @@
+<script setup>
+import { onMounted, ref } from 'vue';
+import { SetupHandle, SetSize, ResetPosition } from '@/services/Windows';
+
+import WindowHandle from './partials/WindowHandle.vue';
+import VersionRender from '../partials/VersionRender.vue';
+import EditUserPartial from '../partials/EditUserPartial.vue';
+
+const handle = ref(null);
+
+const props = defineProps(['data']);
+const data = props.data;
+
+let id = data.type;
+
+const test = ref(null)
+
+onMounted(() => {
+    SetupHandle(id, handle);
+    SetSize(id, {width: 500, height: 460});
+    ResetPosition(id, "center");
+});
+</script>
+
+
+<template>
+    <div class="window-wrapper" :id="'window-wrapper-' + id">
+        <WindowHandle :window="id" ref="handle"></WindowHandle>
+
+        <EditUserPartial></EditUserPartial>
+        <!-- Body -->
+         <h1>{{ $t("main-menu.main-menu")}}</h1>
+
+        <div class="button-container">
+            <button class="btn-primary button-expand sound-click" v-on:click="OpenCampaigns" ref="campaignButton">{{ $t("main-menu.campaigns") }}</button>
+        </div>
+        <VersionRender></VersionRender>
+
+    </div>
+</template>
+
+
+<style scoped>
+h1 {
+    margin-top: 20px;
+    font-family: MrEavesRemake;
+}
+
+.button-expand {
+    width: 100%;
+}
+
+.button-container {
+    display: flex;
+    width: 100%;
+    padding: 20px;
+
+    flex-direction: column;
+}
+
+p {
+  user-select: none;
+}
+
+.window-wrapper {
+    display: flex;
+    align-items: center;
+    user-select: none;
+}
+
+.splash-image {
+    width: 600px;
+    height: 250px;
+    user-select: none;
+}
+</style>
+
+

frontend/app/components/windows/RegisterWindow.vue

@@ -1,8 +1,12 @@
 <script setup>
 import { onMounted, ref } from 'vue';
-import { SetupHandle, SetSize, ResetPosition } from '@/services/Windows';
+import { SetupHandle, SetSize, ResetPosition, CreateWindow, ClearWindow } from '@/services/Windows';
 
 import WindowHandle from './partials/WindowHandle.vue';
+import Spinner from '../partials/Spinner.vue';
+import { DisplayToast } from '~/services/Toaster';
+import Server from '~/services/Server';
+import { errorMessages } from 'vue/compiler-sfc';
 
 const handle = ref(null);
 
@@ -11,13 +15,81 @@ const data = props.data;
 
 let id = data.type;
 
-const test = ref(null)
+
+const username = ref("");
+const password = ref("");
+const passwordConfirm = ref("");
+const email = ref("");
+const name = ref("");
+
+const firstTime = ref(false);
+const loading = ref(false);
+
+const images = [
+    "https://cdn.aranroig.com/art/miirym/miirym.jpg",
+    "https://cdn.aranroig.com/art/nozt/nozt.jpg",
+    "https://cdn.aranroig.com/art/knocking/knocking.jpg",
+    "https://cdn.aranroig.com/art/valentin/valentin.jpg",
+]
+
+const splashSource = ref("");
 
 onMounted(() => {
     SetupHandle(id, handle);
-    SetSize(id, {width: 500, height: 380});
+    SetSize(id, {width: 500});
     ResetPosition(id, "center");
+
+    // Pick random image
+    const randomIndex = Math.floor(Math.random() * images.length);
+    splashSource.value = images[randomIndex];
+    firstTime.value = data.firstTime;
 });
+
+function toLogin(){
+    CreateWindow('login');
+    ClearWindow('register');
+}
+
+function register(){
+    if(username.value.length < 3){
+        DisplayToast('red', $t('register.errors.username-empty'), 3000);
+        return;
+    }
+
+    if(email.value.length < 5 || !email.value.includes('@')){
+        DisplayToast('red', $t('register.errors.email-empty'), 3000);
+        return;
+    }
+
+    if(name.value.length == 0){
+        DisplayToast('red', $t('register.errors.name-empty'), 3000);
+        return;
+    }
+
+    if(password.value !== passwordConfirm.value){
+        DisplayToast('red', $t('register.errors.passwords-no-match'), 3000);
+        return;
+    }
+
+    loading.value = true;
+    Server().post('/user/register', {
+        username: username.value,
+        email: email.value,
+        name: name.value,
+        password: password.value
+    }).then((response) => {
+        DisplayToast('green', $t('register.success'), 3000);
+        toLogin();
+    }).catch((error) => {
+        if(error.response && error.response.data && error.response.data.message){
+            DisplayToast('red', $t(register.error.response.data.message), 3000);
+        } else {
+            DisplayToast('red', $t("errors.internal"), 3000);
+        }
+    }).finally(() => {
+        loading.value = false;
+    });
+}
 </script>
 
 
@@ -26,17 +98,134 @@ onMounted(() => {
         <WindowHandle :window="id" ref="handle"></WindowHandle>
 
         <!-- Body -->
-        <div ref="test"></div>
+        <div class="vert-expand">
+            <div class="image-container">
+                <div class="image-crop">
+                    <img :src="splashSource" class="main-image">
+                </div>
+                <picture class="overlay-image">
+                    <source media="(prefers-color-scheme: dark)" srcset="/img/logo-splash.png">
+                    <source media="(prefers-color-scheme: light)" srcset="/img/logo-splash-light.png">
+                    <img alt="Dragonroll logo" src="/img/logo-splash.png" draggable="false" width="250px">
+                </picture>
+            </div>
+            <form v-on:submit.prevent="register">
+                <p class="green" v-if="firstTime">{{ $t('register.first-register-message') }}</p>
+                <h2>{{ $t('register.welcome') }}</h2>
+                <p>{{ $t('register.message') }}</p>
+                <div class="form-field">
+                    <label for="username">{{$t('register.username')}}</label>
+                    <input id="username-field" type="text" :placeholder="$t('register.username-placeholder')" name="username" v-model="username" autocomplete="off" >
+                </div>
+                <div class="form-field">
+                    <label for="email">{{$t('register.email')}}</label>
+                    <input id="email-field" type="text" :placeholder="$t('register.email-placeholder')" name="email" v-model="email" autocomplete="off" >
+                </div>
+                <div class="form-field">
+                    <label for="name">{{$t('register.name')}}</label>
+                    <input id="name-field" type="text" :placeholder="$t('register.name-placeholder')" name="name" v-model="name" autocomplete="off" >
+                </div>
+                <div class="form-field">
+                    <label for="password">{{$t('register.password')}}</label>
+                    <div class="two-rows expand">
+                        <input id="password-field" type="password" :placeholder="$t('register.password-placeholder')" name="password" v-model="password" autocomplete="off" >
+                        <input id="password-field" type="password" :placeholder="$t('register.password-confirm-placeholder')" name="password" v-model="passwordConfirm" autocomplete="off" >
+                    </div>
+                </div>
+                <div class="form-field">
+                    <button class="btn-primary sound-click">
+                        <span v-if="loading">
+                            <Spinner />
+                        </span>
+                        <span v-else>
+                            {{$t('register.register')}}
+                        </span>
+                    </button>
+                </div>
+                <div class="form-field center" v-if="!firstTime">
+                    <p>{{$t('register.have-account')}} <a href="#" @click.prevent="toLogin">{{$t('register.login')}}</a></p>
+                </div>
+            </form>
+            
+        </div>
 
     </div>
 </template>
 
 
 <style scoped>
+p {
+  user-select: none;
+}
+
+.expand {
+    width: 100%;
+    
+    display: flex;
+    flex-direction: row;
+
+    > * {
+        flex-grow: 1;
+    }
+}
+
+.vert-expand {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: 100%;
+}
+
 .window-wrapper {
+    user-select: none;
+
     display: flex;
     align-items: center;
 }
+
+.splash-image {
+    width: 450px;
+}
+
+form {
+  margin-left: 30px;
+  margin-right: 30px;
+}
+
+label {
+    text-align: left;
+}
+
+.center {
+    text-align: center;
+}
+
+.image-container {
+    position: relative;
+    display: inline-block;
+    margin-bottom: 10px;
+    pointer-events: none;
+}
+
+.image-crop {
+    height: 200px;       /* adjust as needed */
+    width: 500px;        /* adjust as needed */
+    overflow: hidden;
+    position: relative;
+}
+
+.main-image {
+    position: absolute;
+    width: 500px;        /* adjust as needed */
+    top: 0px;          /* adjust as needed */
+}
+.overlay-image {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    width: 250px; /* adjust as needed */
+}
+
 </style>