From 3ec77a6915bf51ee709d4bf62e90cd0dfea602d4 Mon Sep 17 00:00:00 2001 From: ingrid <ingrimeg@stud.ntnu.no> Date: Thu, 27 Apr 2023 07:34:53 +0200 Subject: [PATCH] profilbildet kan oppdateres --- src/components/EditProfile.vue | 5 +- src/views/HomeView.vue | 4 +- src/views/ProfileSettings.vue | 83 ++-------------------------------- 3 files changed, 8 insertions(+), 84 deletions(-) diff --git a/src/components/EditProfile.vue b/src/components/EditProfile.vue index c98dcbc..0dd9a84 100644 --- a/src/components/EditProfile.vue +++ b/src/components/EditProfile.vue @@ -2,7 +2,7 @@ <h1><br><br>Profilinnstillinger <br></h1> <div v-if="hasProfileImage" id = "profilepicture-container"> - <img width="100" :src="this.updatedProfile.upImage" alt="profile picture"> + <img width="100" :src="getProfileImage" alt="profile picture"> </div> <div v-else id = "profilepicture-container"> <Icon icon="material-symbols:person" :color=iconColor :style="{ fontSize: '500px'}" /> @@ -71,6 +71,9 @@ export default { }, hasProfileImage() { return this.updatedProfile.upImage.length > 0; + }, + getProfileImage(){ + return this.updatedProfile.upImage; } }, methods: { diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index e568f92..cc7e702 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -1,18 +1,16 @@ <script> import { useAuthStore } from "@/stores/authStore.js"; import { mapState } from 'pinia' + import router from "@/router"; export default { data() { return { } }, - computed: { ...mapState(useAuthStore, ['profile']) } - - } </script> diff --git a/src/views/ProfileSettings.vue b/src/views/ProfileSettings.vue index 0677be6..df3ca19 100644 --- a/src/views/ProfileSettings.vue +++ b/src/views/ProfileSettings.vue @@ -6,9 +6,6 @@ </template> <script setup> - - - import EditProfile from "../components/EditProfile.vue"; import EditAccount from "../components/EditAccount.vue"; </script> @@ -25,89 +22,15 @@ export default { components: {Icon}, computed: { ...mapStores(useAuthStore), - profile() { - let store = useAuthStore(); - - this.currentProfile.name = store.profile.name; - this.currentProfile.isRestricted = store.profile.restricted; - this.currentProfile.image = store.profile.profileImageUrl; - return store.profile - }, - user() { - const store = useAuthStore(); - return store.user - }, iconColor() { return "#000000" }, - hasProfileImage() { - return this.currentProfile.image.length > 0; - } }, - data() { - return { - currentUser: { - newPassword: "", - }, - currentProfile: { - name: "", - isRestricted: true, - image: "", - }, - foodPreferences: [], - allergens: [], - deletionConfirmation: false, + beforeMount() { + if (!useAuthStore().isLoggedIn) { + router.push('/login') } }, - methods: { - saveUserSettings(){ //profilnavn, profilbilde, profilrestriksjoner - const namee = this.currentProfile.name; - const isRestrictede = this.currentProfile.isRestricted; - const profileImageUrle = this.currentProfile.image; - - API.updateProfile( - this.profile.id,{ - name:namee, - profileImageUrl: profileImageUrle, - restricted: isRestrictede, - } - ).then((savedProfile)=>{ - useAuthStore().setProfile(savedProfile); - - }).catch((error)=> { - console.log(error) - }) - - }, - chooseProfilePicture(){ - alert("velgBilde") - }, - saveAccountSettings(){ //passord - if(this.currentUser.newPassword.length===0){ - alert("Det er ikke gjort endringer, og passordet vil ikke bli oppdatert") - } else { - - alert("(Denne knappen gjør ingen ting) konto oppdatert") - } - }, - deleteAccount(){ - if(this.deletionConfirmation===false){ - alert("Du må bekrefte at du vil slette konto ved å huke av boksen") - } - else { - alert("(Denne knappen gjør ingen ting) men account deleted") - //API.deleteAccount(this.user.id, token); - } - - }, - deleteUser(){ - alert("(Denne knappen gjør ingen ting) bruker slettet") - //API.deleteAccount(this.user.id, token).then - }, - changeProfile(){ - router.push("/selectProfile"); - } - } } </script> -- GitLab