From 4a1f00e54923b0d6fa88c3f9032b3eae341ef638 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20R=C3=B8skaft?= <haakoero@stud.ntnu.no>
Date: Wed, 4 May 2022 09:31:49 +0200
Subject: [PATCH] More change from main

---
 src/components/FormComponents/NewPasswordForm.vue | 2 +-
 src/services/user.service.js                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/FormComponents/NewPasswordForm.vue b/src/components/FormComponents/NewPasswordForm.vue
index 4028053..d32c15d 100644
--- a/src/components/FormComponents/NewPasswordForm.vue
+++ b/src/components/FormComponents/NewPasswordForm.vue
@@ -183,7 +183,7 @@ export default {
         this.message = "";
         this.$store.commit("saveToken", newPasswordResponse.token);
         await this.$router.push("/");
-      } else  if (!newPasswordResponse.correctPassword){
+      } else if (!newPasswordResponse.correctPassword) {
         //The old password was not correct
         this.message = "Det gamle passordet stemmer ikke for denne brukeren";
       } else {
diff --git a/src/services/user.service.js b/src/services/user.service.js
index 59de28f..f07ef8c 100644
--- a/src/services/user.service.js
+++ b/src/services/user.service.js
@@ -7,7 +7,7 @@ const API_URL = process.env.VUE_APP_BASEURL;
 class UserService {
   async getUserFromId(userId) {
     return await axios
-      .get(API_URL + "/users/" + userId + "/profile", {
+      .get(API_URL + "users/" + userId + "/profile", {
         headers: tokenHeader(),
       })
       .then((res) => {
-- 
GitLab