From 4413a8d9358a612b9bd5067b6eb15d3ec6dbc5cb Mon Sep 17 00:00:00 2001 From: Jatinder Singh Date: Tue, 16 Oct 2018 18:18:58 +0530 Subject: [PATCH] changes --- index.html | 1 + src/components/AppFab.vue | 2 +- src/components/AppToolbar.vue | 4 +- src/pages/Dashboard.vue | 374 +++++++++++++++++++++++++++++++++++++++--- src/pages/Login.vue | 11 +- src/pages/Provider.vue | 10 +- src/pages/changepassword.vue | 9 +- src/pages/forgetpassword.vue | 18 +- src/pages/notification.vue | 47 +++--- src/pages/questions.vue | 11 +- static/css/custom.css | 7 + 11 files changed, 417 insertions(+), 77 deletions(-) create mode 100644 static/css/custom.css diff --git a/index.html b/index.html index e0627f0..204a7c1 100644 --- a/index.html +++ b/index.html @@ -10,6 +10,7 @@ + diff --git a/src/components/AppFab.vue b/src/components/AppFab.vue index fd88516..205c9b2 100644 --- a/src/components/AppFab.vue +++ b/src/components/AppFab.vue @@ -1,6 +1,6 @@ + + @@ -181,31 +185,56 @@ + + + + + + + + + + + + + - + + + + + + + + > + + + + + + + + - - + required + > + + + clear Add @@ -232,7 +261,6 @@ export default { LName: '', Email: '', DOB: '', - clear: '', search: '', dialog: false, dialog1: false, @@ -240,6 +268,9 @@ export default { valid: true, isActive: true, newActive: false, + // pagination: { + // rowsPerPage: 5 + // }, rules: { required: value => !!value || 'This field is Required.', min: v => @@ -249,12 +280,13 @@ export default { v.length > 0) || 'Please enter a date in the format dd/mm/yyyy' }, - nameRules: [v => !!v || 'Name is required'], + nameRules: [v => !!v || ' First Name is required'], email: '', emailRules: [ v => !!v || 'E-mail is required', v => /.+@.+/.test(v) || 'E-mail must be valid' ], + lnameRules: [v => !!v || ' Last Name is required'], headers: [ { text: 'No', @@ -280,7 +312,287 @@ export default { LName: 'kumar', Email: 'aasi@gmail.com', DOB: '16/09/1997' - } + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, + { + No: 1, + Name: 'Amit', + LName: 'goyal', + Email: 'jsi@gmail.com', + DOB: '22/09/1996' + }, + { + No: 2, + Name: 'Sumit', + LName: 'kumar', + Email: 'aasi@gmail.com', + DOB: '16/09/1997' + }, ], editedIndex: -1, editedItem: { @@ -296,6 +608,14 @@ export default { Email: '' } }), + // computed: { + // pages () { + // if (this.pagination.rowsPerPage == null || + // this.pagination.totalItems == null + // ) return 0; + // return Math.ceil(this.pagination.totalItems / this.pagination.rowsPerPage); + // } + // }, methods: { editItem (item) { this.editedIndex = this.desserts.indexOf(item); @@ -357,15 +677,15 @@ export default { } }, mail () { - this.editedIndex = this.desserts.indexOf(); + // this.editedIndex = this.desserts.indexOf(); }, download () { - this.editedIndex = this.desserts.indexOf(); + // this.editedIndex = this.desserts.indexOf(); + }, clear () { this.$refs.form.reset(); }, - save () { if (this.editedIndex > -1) { Object.assign(this.desserts[this.editedIndex], this.editedItem); @@ -374,7 +694,7 @@ export default { } this.close(); } - } + }, }; \ No newline at end of file diff --git a/src/pages/Provider.vue b/src/pages/Provider.vue index 459bbdc..12f166e 100644 --- a/src/pages/Provider.vue +++ b/src/pages/Provider.vue @@ -10,6 +10,7 @@ prepend-icon="search" v-model="search" label="Find Yours Users" + color="black" > @@ -127,7 +128,7 @@ {{ props.item.No }} {{ props.item.Name+' '+props.item.LName }} {{ props.item.Email }} - + - + - - + + @@ -222,6 +223,7 @@ export default { Email: 'aasi@gmail.com', DOB: '16/09/1997' } + ]; }, diff --git a/src/pages/changepassword.vue b/src/pages/changepassword.vue index e70fe43..a886867 100644 --- a/src/pages/changepassword.vue +++ b/src/pages/changepassword.vue @@ -21,8 +21,7 @@ @@ -30,15 +29,13 @@ diff --git a/src/pages/forgetpassword.vue b/src/pages/forgetpassword.vue index 24d529b..d54ae8a 100644 --- a/src/pages/forgetpassword.vue +++ b/src/pages/forgetpassword.vue @@ -22,9 +22,17 @@
Not to Worry! Enter to your registered Email ID.
We'll send you a reset.
- - - + +
+ +
@@ -33,8 +41,8 @@ -
You will recieve an email to continue
- Send Request + + Send Request Push Notification - + color="black" + > - - + + @@ -30,6 +31,7 @@ send + + @@ -69,22 +69,31 @@ export default { text: 'User List', align: 'left', sortable: false, - value: 'Name' + }, - // { text: '', value: '', sortable: false }, - // { text: '', value: '', sortable: false }, - // { text: '', value: '', sortable: false }, - // { text: '', value: '', sortable: false }, - // { text: '', value: '', sortable: false }, - // { text: '', value: '', sortable: false } ], desserts: [ { - value: true, Name: 'ajay', - } + }, + { + Name: 'amrit', + }, + { + Name: 'ajay', + }, + { + Name: 'ajay', + }, ] }; + }, + methods: { + toggleAll () { + if (this.selected.length) this.selected = []; + else this.selected = this.desserts.slice(); + + } } }; diff --git a/src/pages/questions.vue b/src/pages/questions.vue index 1583171..39439e1 100644 --- a/src/pages/questions.vue +++ b/src/pages/questions.vue @@ -85,10 +85,6 @@ Diagnosis 1,Diagnosis 2,Diagnosis 3 Save Edit

- - - - @@ -97,11 +93,6 @@ :items="desserts" class="elevation-1" > -