From 603a067025c890b9e6a623ec6f11be26897697e2 Mon Sep 17 00:00:00 2001
From: Neeraj Sharma <neeraj.sharma@viithiisys.com>
Date: Wed, 27 Mar 2019 19:05:54 +0530
Subject: [PATCH] implemented change and forgot password funcatinallity

---
 src/pages/Authentication/Login.vue          | 10 +++++-----
 src/pages/Authentication/changepassword.vue | 11 ++---------
 src/pages/Authentication/forgetpassword.vue | 25 +++++++++++++++----------
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/pages/Authentication/Login.vue b/src/pages/Authentication/Login.vue
index d0aff90..2e3e0b7 100644
--- a/src/pages/Authentication/Login.vue
+++ b/src/pages/Authentication/Login.vue
@@ -1,6 +1,6 @@
 <template>
   <v-app id="login">
-    <v-toolbar color="grey lighten">
+    <v-toolbar  class="fixcolor">
       <v-toolbar-items>
         <!-- <img src="/static/ana@2x.png" height="36" alt="ana"> -->
         <h3 class="white--text my-3 ml-4">School-Management</h3>
@@ -18,7 +18,7 @@
         >{{ text }}</v-snackbar>
         <v-layout align-center justify-center>
           <v-flex xs12 sm10 md6 lg4>
-            <v-toolbar color="black" dark>
+            <v-toolbar class="fixcolor" dark>
               <v-spacer></v-spacer>
               <v-toolbar-title>School Login</v-toolbar-title>
               <v-spacer></v-spacer>
@@ -47,7 +47,7 @@
                   </v-form>
                    <v-layout row wrap>
                   <v-flex xs6>
-                      <v-checkbox :label="`Remember me`" v-model="remember"></v-checkbox>
+                      <!-- <v-checkbox :label="`Remember me`" v-model="remember"></v-checkbox> -->
                     </v-flex>
                     <v-flex xs6>
                      <h5  class="right mt-4"> <router-link class="link" to="/forgetpassword" style="border-bottom: 2px solid #aaa;">Forgot Password</router-link></h5>
@@ -57,7 +57,7 @@
               </v-card-text>
               <v-layout>
               <v-flex sm12 class="my-3">
-                <v-btn style="margin: auto;display: block;" round color="black" dark large @click="login" :loading="loading">Login</v-btn>           
+                <v-btn style="margin: auto;display: block;b" class="fixcolor" round dark large @click="login" :loading="loading">Login</v-btn>           
               </v-flex>
                </v-layout>
                <v-layout>
@@ -67,7 +67,7 @@
         </v-layout>
       </v-container>
     </v-content>
-    <v-footer class="pa-4" color="grey darken-2"></v-footer>
+    <v-footer class="pa-4"  style="background:linear-gradient(90deg,#f58753 30%,#f15e5f 110%)"></v-footer>
   </v-app>
 </template>
 
diff --git a/src/pages/Authentication/changepassword.vue b/src/pages/Authentication/changepassword.vue
index c7deb1d..a5a5fc5 100644
--- a/src/pages/Authentication/changepassword.vue
+++ b/src/pages/Authentication/changepassword.vue
@@ -1,16 +1,10 @@
 <template>
   <v-app id="login">
-    <!-- <v-toolbar color="grey lighten">
-      <v-toolbar-items>
-    <img src="/static/ana@2x.png" height="36" alt="ana">
-    </v-toolbar-items>
-  </v-toolbar> -->
-    <!-- <v-content>  -->
     <app-toolbar class="app--toolbar"></app-toolbar> 
       <v-container fluid fill-height>
         <v-layout>
-          <v-flex xs12 sm8 md8 lg5 offset-sm2 offset-lg3>
-          <v-toolbar color="black" dark>
+          <v-flex xs12 sm8 md8 lg5 offset-sm2 offset-lg3 class="mt-5">
+          <v-toolbar class="fixcolors mt-5" dark>
           <v-spacer></v-spacer>
           <v-toolbar-title>Change Password</v-toolbar-title>
           <v-spacer></v-spacer>
@@ -22,7 +16,6 @@
             <v-form class="mt-3" >
             <v-text-field 
              :rules="[rules.required]"
-           
              v-model="adminChangePasswordcredentials.oldPassword"
              label="Old Password">
             </v-text-field>
diff --git a/src/pages/Authentication/forgetpassword.vue b/src/pages/Authentication/forgetpassword.vue
index a1a9b48..333580b 100644
--- a/src/pages/Authentication/forgetpassword.vue
+++ b/src/pages/Authentication/forgetpassword.vue
@@ -1,6 +1,6 @@
 <template>
   <v-app id="login">
-    <v-toolbar color="grey lighten">
+    <v-toolbar class="fixcolors">
       <v-toolbar-items>
         <!-- <img src="/static/ana@2x.png" height="36" alt="ana" /> -->
         <h3 class="white--text my-3 ml-4">School-Management</h3>
@@ -23,7 +23,7 @@
                       <v-container fluid class="content">
                         <v-layout align-center justify-center fill-height>
                           <v-flex xs12 sm8 md7 lg8>
-                            <v-toolbar color="black" dark>
+                            <v-toolbar class="fixcolors" dark>
                               <v-spacer></v-spacer>
                               <v-toolbar-title>Forget Password</v-toolbar-title>
                               <v-spacer></v-spacer>
@@ -33,7 +33,7 @@
                                 <h5 class="text-xs-center"> Not to Worry! Enter to your registered Email ID. </h5>
                                 <h5 class="text-xs-center"> We'll send you a reset.</h5>
                                 <v-flex lg6 sm6 xs10 offset-sm3 offset-xs1 offset-lg3>
-                                  <v-form class="mt-4">
+                                 <v-form ref="form" v-model="valid" lazy-validation>
                                     <div class="custom-input-align">
                                       <v-text-field 
                                        class="text-md-center"
@@ -47,7 +47,7 @@
                               </v-card-text>
                               <v-card-actions>
                                 <v-flex text-xs-center>
-                                  <v-btn round class="mt-1 button" color="black" dark large @click="reset">Send Request</v-btn>
+                                  <v-btn round class="mt-1 button fixcolors" dark large @click="reset">Send Request</v-btn>
                                 </v-flex>
                               </v-card-actions>
                               <v-snackbar
@@ -72,7 +72,7 @@
                     <v-container fluid fill-height>
                       <v-layout align-center justify-center>
                         <v-flex xs12 sm8 md7 lg8>
-                          <v-toolbar color="black" dark>
+                          <v-toolbar class="fixcolors" dark>
                             <v-spacer></v-spacer>
                             <v-toolbar-title>Forget Password</v-toolbar-title>
                             <v-spacer></v-spacer>
@@ -106,7 +106,7 @@
                             </v-card-text>
                             <v-card-actions>
                               <v-flex text-xs-center>
-                                <v-btn round class="mt-1 button" color="black" dark large @click="resetPassword">Send Request</v-btn>
+                                <v-btn round class="mt-1 button fixcolors" dark large @click="resetPassword">Send Request</v-btn>
                               </v-flex>
                             </v-card-actions>
                             <v-snackbar
@@ -126,7 +126,7 @@
                   </v-container>
                 </v-content>
                 <v-btn
-            color="black"
+            color="primary"
             dark
             @click="e2 = 1"
           >
@@ -140,7 +140,7 @@
       </v-flex>
      </v-layout>
     </v-container>
-   <v-footer class="pa-4" color="grey darken-2">
+   <v-footer class="pa-4 fixcolors">
   </v-footer>
  </v-app>
 </template>
@@ -165,9 +165,12 @@ export default {
     forgetemail:'',
     password:'',
     changepassword:'',
+    valid: true,
     emailRules: [
-        v => !!v || "Email is required"
-
+      v => !!v || "E-mail is required",
+      v =>
+        /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w{2,3})+$/.test(v) ||
+        "E-mail must be valid"
     ],
     rules: {
         required: value => !!value || "password is Required.",
@@ -182,6 +185,7 @@ export default {
 
   methods: {
     reset () {
+      if (this.$refs.form.validate()) {
       http().get('/schoolForgotPassword?email='+ this.forgetemail)
         .then(response => {
           // console.log("response=====>",response.data.data.token);
@@ -196,6 +200,7 @@ export default {
            this.snackbar= true;
            this.loading = false;
        })
+     }
     },
     resetPassword(){
       let forgotPassword = {
-- 
2.0.0