From 6a680be49ccdae3ae2da50c674976664c6d8b8f9 Mon Sep 17 00:00:00 2001
From: Denis Gukov <denguk@gmail.com>
Date: Fri, 20 Nov 2020 12:37:09 +0500
Subject: [PATCH] feat(fe): add password form component

Added animation for running task status.
---
 web2/src/components/ChangePasswordForm.vue |  49 +++++++++
 web2/src/components/ItemFormBase.js        |   5 +
 web2/src/components/TaskLIst.vue           |   0
 web2/src/components/TaskStatus.vue         |   0
 web2/src/lib/delay.js                      |   2 +-
 web2/src/router/index.js                   |   5 -
 web2/src/views/ChangePassword.vue          | 112 ---------------------
 7 files changed, 55 insertions(+), 118 deletions(-)
 create mode 100644 web2/src/components/ChangePasswordForm.vue
 create mode 100644 web2/src/components/TaskLIst.vue
 create mode 100644 web2/src/components/TaskStatus.vue
 delete mode 100644 web2/src/views/ChangePassword.vue

diff --git a/web2/src/components/ChangePasswordForm.vue b/web2/src/components/ChangePasswordForm.vue
new file mode 100644
index 00000000..9c482313
--- /dev/null
+++ b/web2/src/components/ChangePasswordForm.vue
@@ -0,0 +1,49 @@
+<template>
+  <v-form
+    ref="form"
+    lazy-validation
+    v-model="formValid"
+  >
+    <v-alert
+      :value="formError"
+      color="error"
+      class="pb-2"
+    >{{ formError }}</v-alert>
+
+    <v-text-field
+      v-model="item.password"
+      label="Password"
+      :rules="[v => !!v || 'Email is required']"
+      required
+      :disabled="formSaving"
+    ></v-text-field>
+  </v-form>
+</template>
+<script>
+import ItemFormBase from '@/components/ItemFormBase';
+
+export default {
+  mixins: [ItemFormBase],
+
+  methods: {
+    async loadData() {
+      this.item = {};
+    },
+
+    getItemsUrl() {
+      return null;
+    },
+
+    getSingleItemUrl() {
+      return null;
+    },
+
+    getRequestOptions() {
+      return {
+        method: 'post',
+        url: `/api/users/${this.itemId}/password`,
+      };
+    },
+  },
+};
+</script>
diff --git a/web2/src/components/ItemFormBase.js b/web2/src/components/ItemFormBase.js
index 33048cde..8ad76682 100644
--- a/web2/src/components/ItemFormBase.js
+++ b/web2/src/components/ItemFormBase.js
@@ -70,6 +70,10 @@ export default {
       }
     },
 
+    getRequestOptions() {
+      return {};
+    },
+
     /**
      * Saves or creates item via API.
      * @returns {Promise<null>} null if validation didn't pass or user data if user saved.
@@ -92,6 +96,7 @@ export default {
             : this.getSingleItemUrl(),
           responseType: 'json',
           data: this.item,
+          ...(this.getRequestOptions()),
         })).data;
 
         this.$emit('save', {
diff --git a/web2/src/components/TaskLIst.vue b/web2/src/components/TaskLIst.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/web2/src/components/TaskStatus.vue b/web2/src/components/TaskStatus.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/web2/src/lib/delay.js b/web2/src/lib/delay.js
index 90a4781f..8bd583a0 100644
--- a/web2/src/lib/delay.js
+++ b/web2/src/lib/delay.js
@@ -1,3 +1,3 @@
 export default function delay(milliseconds = 100) {
-  return new Promise(resolve => setTimeout(resolve, milliseconds));
+  return new Promise((resolve) => setTimeout(resolve, milliseconds));
 }
diff --git a/web2/src/router/index.js b/web2/src/router/index.js
index 00a336f5..08144ab0 100644
--- a/web2/src/router/index.js
+++ b/web2/src/router/index.js
@@ -13,7 +13,6 @@ import Team from '../views/project/Team.vue';
 import Users from '../views/Users.vue';
 import Auth from '../views/Auth.vue';
 import New from '../views/project/New.vue';
-import ChangePassword from '../views/ChangePassword.vue';
 
 Vue.use(VueRouter);
 
@@ -74,10 +73,6 @@ const routes = [
     path: '/users',
     component: Users,
   },
-  {
-    path: '/change-password',
-    component: ChangePassword,
-  },
 ];
 
 const router = new VueRouter({
diff --git a/web2/src/views/ChangePassword.vue b/web2/src/views/ChangePassword.vue
deleted file mode 100644
index 07b7070f..00000000
--- a/web2/src/views/ChangePassword.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<template>
-  <v-container
-    fluid
-    fill-height
-    align-center
-    justify-center
-    class="pa-0"
-  >
-    <v-form
-      ref="changePasswordForm"
-      lazy-validation
-      v-model="changePasswordFormValid"
-      style="width: 300px;"
-    >
-
-      <v-alert
-        :value="changePasswordError"
-        color="error"
-        style="margin-bottom: 20px;"
-      >{{ changePasswordError }}</v-alert>
-
-      <v-text-field
-        v-model="newPassword"
-        label="Password"
-        :rules="passwordRules"
-        type="password"
-        counter
-        required
-      ></v-text-field>
-
-      <v-text-field
-        v-model="newPassword2"
-        label="Repeat password"
-        type="password"
-        required
-        counter
-        style="margin-bottom: 20px;"
-      ></v-text-field>
-
-      <div class="text-xs-right">
-        <v-btn
-          color="primary"
-          @click="changePassword"
-          style="margin-right: 0;"
-          align-end
-        >
-          Change password
-        </v-btn>
-      </div>
-    </v-form>
-  </v-container>
-</template>
-
-<script>
-import axios from 'axios';
-import EventBus from '@/event-bus';
-import { getErrorMessage } from '@/lib/error';
-
-export default {
-  data() {
-    return {
-      changePasswordFormValid: false,
-      changePasswordError: null,
-      changePasswordInProgress: false,
-      newPassword: '',
-      newPassword2: '',
-
-      passwordRules: [
-        (v) => !!v || 'Password is required',
-        (v) => v.length >= 6 || 'Password too short. Min 6 characters',
-      ],
-    };
-  },
-
-  methods: {
-    async changePassword() {
-      this.changePasswordError = null;
-
-      if (!this.$refs.changePasswordForm.validate()) {
-        return;
-      }
-
-      if (this.newPassword !== this.newPassword2) {
-        this.changePasswordError = 'Passwords not equal';
-        return;
-      }
-
-      this.changePasswordInProgress = true;
-
-      try {
-        await axios({
-          method: 'post',
-          url: '/v1/session/change-password',
-          data: {
-            token: this.$route.query.token,
-            password: this.newPassword,
-          },
-        });
-        await this.$router.replace('/');
-        EventBus.$emit('i-snackbar', {
-          color: 'success',
-          text: 'Password changed',
-        });
-      } catch (err) {
-        this.changePasswordError = getErrorMessage(err);
-      } finally {
-        this.changePasswordInProgress = false;
-      }
-    },
-  },
-};
-</script>