Renamed description to message

src/components/CommunityComponents/CommunityHome.vue

@@ -132,7 +132,6 @@ export default {
       this.items = await GetListingsInCommunity(this.communityID);
       for (var i = 0; i < this.items.length; i++) {
         let images = await getItemPictures(this.items[i].listingID);
-        //console.log(images);
         if (images.length > 0) {
           this.items[i].img = images[0].picture;
         }

src/components/CommunityComponents/CommunityRequestForm.vue

@@ -10,25 +10,25 @@
     </div>
 
 
-    <!-- Description -->
-    <div class="mt-6" :class="{ error: v$.description.$errors.length }">
+    <!-- message -->
+    <div class="mt-6" :class="{ error: v$.message.$errors.length }">
       <label
         class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-400"
-        id="descriptionLabel"
+        id="messageLabel"
         > Melding til administrator av gruppa: </label
       >
       <textarea
-        id="description"
+        id="message"
         rows="4"
-        v-model="description"
+        v-model="message"
         class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light"
         required
       ></textarea>
 
-      <!-- error message for description -->
+      <!-- error message for message -->
       <div
         class="text-error"
-        v-for="(error, index) of v$.description.$errors"
+        v-for="(error, index) of v$.message.$errors"
         :key="index"
       >
         <div class="text-error text-sm">
@@ -64,7 +64,7 @@ export default {
 
   validations() {
     return {
-        description: {
+        message: {
           required: helpers.withMessage(
             () => "Meldingen kan ikke være tom",
             required
@@ -79,7 +79,7 @@ export default {
   },
   data() {
     return {
-        description: "",
+        message: "",
         communityId: null,
         community: {},
     };
@@ -92,7 +92,7 @@ export default {
         this.communityID = await this.$router.currentRoute.value.params
         .communityID;
 
-      await axios.post(process.env.VUE_APP_BASEURL+ `communities/${this.communityID}/private/join`, {message: this.description, }, {headers: tokenHeader()} );
+      await axios.post(process.env.VUE_APP_BASEURL+ `communities/${this.communityID}/private/join`, {message: this.message, }, {headers: tokenHeader()} );
     },
      getCommunityFromAPI: async function () {
       this.communityID = await this.$router.currentRoute.value.params

src/components/FormComponents/NewPasswordForm.vue

@@ -134,12 +134,19 @@ export default {
         return;
       }
 
-      const newPasswordInfo = {
-        token: this.token,
-        newPassword: this.password,
-      };
+      const newPassword = this.user.password;
 
-      const newPasswordResponse = doNewPassword(newPasswordInfo);
+      const newPasswordResponse = await doNewPassword(newPassword);
+
+      if (newPasswordResponse != null) {
+        console.log("New password set");
+        this.$store.commit("saveToken", newPasswordResponse);
+        await this.$router.push("/");
+      } else {
+        console.log("Couldn't set new password");
+      }
+
+      /*
 
       if (newPasswordResponse.newPasswordSet === true) {
         //console.log("New password set");
@@ -149,6 +156,8 @@ export default {
       } else {
         //console.log("Something went wrong");
       }
+
+      */
     },
     validate() {
       this.$refs.form.validate();

src/utils/apiutil.js

@@ -84,15 +84,22 @@ export function getAverageRating(userid) {
       console.error(error);
     });
 }
-export function doNewPassword() {
-  //m
-  //add newPasswordInfo to input
-  const auth = { newPasswordSet: false };
-  //return axios
-  //.post(API_URL + "newPassword", newPasswordInfo)
-  //.then((response) => {auth.newPasswordSet = true;return auth;})
-  //.catch((error) => {//console.log(error);return auth;});
-  return auth; //remove after axios is added
+export async function doNewPassword(password) {
+  let res = await axios({
+    method: "put",
+    url: API_URL + "user/profile/password",
+    headers: tokenHeader(),
+    data: {
+      password: password,
+    },
+  })
+    .then((response) => {
+      return response;
+    })
+    .catch((error) => {
+      console.log(error);
+    });
+  return res.data;
 }
 
 export function postNewItem(itemInfo) {