From 7606aada1577d4e7d2de291ca5421a59a6e3b3c5 Mon Sep 17 00:00:00 2001
From: ingrid <ingrimeg@stud.ntnu.no>
Date: Wed, 26 Apr 2023 15:03:51 +0200
Subject: [PATCH] endret fra user til account
---
cypress/e2e/navbar.cy.js | 8 +-----
src/components/EditAccount.vue | 46 ++++++++++++++++------------------
src/components/EditProfile.vue | 5 ----
src/components/Navbar.vue | 5 ----
src/util/API.js | 3 +--
5 files changed, 23 insertions(+), 44 deletions(-)
diff --git a/cypress/e2e/navbar.cy.js b/cypress/e2e/navbar.cy.js
index 02f37a4..96aee3a 100644
--- a/cypress/e2e/navbar.cy.js
+++ b/cypress/e2e/navbar.cy.js
@@ -1,5 +1,5 @@
describe('Correct navigation links', () => {
-<<<<<<< HEAD
+
it("is sent to error page if page does not exist", () => {
cy.visit('/qwerty')
cy.contains('#msg', '404')
@@ -23,10 +23,4 @@ describe('Navbar on all pages', () => {
cy.get('nav').should('exist')
})
/*TODO: other pages*/
-=======
- /*TODO*/
})
-describe('Navbar on all pages', () => {
- /*TODO*/
->>>>>>> main
-})
\ No newline at end of file
diff --git a/src/components/EditAccount.vue b/src/components/EditAccount.vue
index 988004c..15a6da8 100644
--- a/src/components/EditAccount.vue
+++ b/src/components/EditAccount.vue
@@ -4,15 +4,15 @@
<p class="infoText">OBS: Kontakt admin dersom du ønsker å oppdatere epost</p><br>
- <p>Epost: {{this.user.email}}</p><br>
+ <p>Epost: {{this.account.email}}</p><br>
<label for="fname">Endre fornavn</label><br>
- <input type="text" id="fname" v-model="updatedUser.upFirstname"><br>
+ <input type="text" id="fname" v-model="updatedAccount.upFirstname"><br>
<label for="password">Endre passord</label><br>
- <input type="password" id="password" v-model="updatedUser.upPassword">
+ <input type="password" id="password" v-model="updatedAccount.upPassword">
- <button class="saveBtn" @click="saveAccountSettings">Lagre nytt passord</button>
+ <button class="saveBtn" @click="saveAccountSettings">Lagre profilendringer</button>
</form>
<br>
@@ -38,20 +38,17 @@ import router from "../router";
export default {
name: "EditAccount",
computed: {
- ...mapState(useAuthStore, ['user']),
+ ...mapState(useAuthStore, ['account']),
...mapStores(useAuthStore),
- updatedUser() {
+ updatedAccount() {
return {
- upFirstname: this.user.firstname,
+ upFirstname: this.account.firstname,
upPassword:'',
}
},
iconColor() {
return "#000000"
},
- hasProfileImage() {
- return this.updatedProfile.upImage.length > 0;
- }
},
data() {
return {
@@ -60,31 +57,31 @@ export default {
},
methods: {
saveAccountSettings(){ //passord
- if(this.updatedUser.upPassword.length===0){ //Oppdater ikke passordet dersom man ikke har gjort endringer
- const id = this.user.id;
+ if(this.updatedAccount.upPassword.length===0){ //Oppdater ikke passordet dersom man ikke har gjort endringer
+ const id = this.account.id;
API.updateAccount(
id,{
- firstname:this.updatedUser.upFirstname,
+ firstname:this.updatedAccount.upFirstname,
password:null,
}
- ).then((savedUser)=>{
- useAuthStore().setUser(savedUser);
+ ).then((savedAccount)=>{
+ useAuthStore().setAccount(savedAccount);
alert("Bruker oppdatert.")
}).catch((error)=> {
console.log(error)
})
} else {
- const id = this.user.id;
+ const id = this.account.id;
API.updateAccount(
id,{
- firstname:this.updatedUser.upFirstname,
- password:this.updatedUser.upPassword,
+ firstname:this.updatedAccount.upFirstname,
+ password:this.updatedAccount.upPassword,
}
- ).then((savedUser)=>{
- useAuthStore().setUser(savedUser);
- alert("Bruker oppdatert.")
+ ).then((savedAccount)=>{
+ useAuthStore().setAccount(savedAccount);
+ alert("Konto oppdatert.")
}).catch((error)=> {
console.log(error)
})
@@ -95,12 +92,11 @@ export default {
alert("Du må bekrefte at du vil slette konto ved å huke av boksen")
}
else {
- const id = this.user.id;
+ const id = this.account.id;
API.deleteAccount(
id
- ).then((savedUser)=>{
- useAuthStore().setUser(savedUser);
- alert("Bruker oppdatert.")
+ ).then(()=>{
+ router.push('/login')
}).catch((error)=> {
alert("Det oppsto en feil ved sletting av bruker")
console.log(error)
diff --git a/src/components/EditProfile.vue b/src/components/EditProfile.vue
index 5da9e4f..1efe19b 100644
--- a/src/components/EditProfile.vue
+++ b/src/components/EditProfile.vue
@@ -92,17 +92,12 @@ export default {
useAuthStore().setProfile(savedProfile);
alert("profil oppdatert.")
}).catch((error)=> {
- console.log(this.updatedProfile.imageUrl)
console.log(error)
})
},
chooseProfilePicture(){
alert("skriv inn bildelenke i feltet, og oppdater innstillinger")
},
- deleteUser(){
- alert("(Denne knappen gjør ingen ting) bruker slettet")
- //API.deleteAccount(this.user.id, token).then
- },
changeProfile(){
router.push("/selectProfile");
}
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index 101a77e..b981828 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -25,13 +25,8 @@
</RouterLink>
</li>
<li>
-<<<<<<< HEAD
<RouterLink :to="'/profileSettings'" :aria-label="'link to settings page'">
<Icon id="settingsIcon" icon="mdi:cog" :color="iconColor" :style="{ fontSize: iconSize }"/>
-=======
- <RouterLink :to="'/'" :aria-label="'link to settings page'">
- <Icon icon="mdi:cog" :color="iconColor" :style="{ fontSize: iconSize }"/>
->>>>>>> main
</RouterLink>
</li>
</ul>
diff --git a/src/util/API.js b/src/util/API.js
index 24ba90b..8a9b450 100644
--- a/src/util/API.js
+++ b/src/util/API.js
@@ -115,7 +115,6 @@ export const API = {
.catch(err => {console.log(err)})
})
.catch(() => {throw new Error()})
- }
},
/**
@@ -159,7 +158,7 @@ export const API = {
headers: { Authorization: `Bearer ${authStore.token}` },
})
.then((response) => {
- authStore.setUser(response.data)
+ authStore.setAccount(response.data)
return response.data;
}).catch(() => {
throw new Error("Error when updating account: ");
--
GitLab