diff --git a/config/index.js b/config/index.js index a473cb4..23483e2 100644 --- a/config/index.js +++ b/config/index.js @@ -15,7 +15,7 @@ module.exports = { }, // Various Dev Server settings - host: 'localhost', // can be overwritten by process.env.HOST + host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: false, errorOverlay: true, diff --git a/index.html b/index.html index 204a7c1..3b66c65 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ - ana + School Management diff --git a/src/Services/http.js b/src/Services/http.js index cf9e8ce..28ea748 100644 --- a/src/Services/http.js +++ b/src/Services/http.js @@ -3,7 +3,7 @@ import store from '@/store/store' export default () => { return axios.create({ - baseURL:'http://18.208.28.55:3000/v1', + baseURL:'http://192.168.2.203:8001/v1', headers: { Authorization: `Bearer ${store.state.token}` } diff --git a/src/api/menu.js b/src/api/menu.js index ac89bd7..f31215c 100644 --- a/src/api/menu.js +++ b/src/api/menu.js @@ -21,31 +21,29 @@ const Menu = [ // icon: 'email', // }, { - title: 'User', + title: 'Teachers', // group: '', name: 'Dashboard', - icon: 'face', + icon: 'group', }, { - title: 'Health Care Provider', + title: 'Students', // group: 'apps', - name: 'Provider', - icon: 'local_hospital', - }, - { - title: 'Notification', - // group: 'apps', - name: 'notification', - icon: 'add_alert', - }, - { - title: 'Forum Questions', - // group: 'apps', - name: 'questions', - icon: 'live_help', + name: 'Students', + icon: 'school', }, // { + // title: 'Notification', + // name: 'notification', + // icon: 'add_alert', + // }, + // { + // title: 'Forum Questions', + // name: 'questions', + // icon: 'live_help', + // }, + // { // title: 'Widgets', // group: 'widgets', // component: 'widgets', diff --git a/src/components/AppDrawer.vue b/src/components/AppDrawer.vue index a6b4e81..b31b45f 100644 --- a/src/components/AppDrawer.vue +++ b/src/components/AppDrawer.vue @@ -9,7 +9,8 @@ width="260" > - + +

School-Managament

 @@ -96,9 +97,9 @@ export default { computeGroupActive () { return true; }, - computeLogo () { - return '/static/ana@2x.png'; - }, + // computeLogo () { + // return '/static/ana@2x.png'; + // }, sideToolbarColor () { return this.$vuetify.options.extra.sideNav; diff --git a/src/components/AppToolbar.vue b/src/components/AppToolbar.vue index 4a6038d..157b063 100644 --- a/src/components/AppToolbar.vue +++ b/src/components/AppToolbar.vue @@ -8,7 +8,6 @@ -
{{userName}}
@@ -81,9 +80,6 @@ export default { Util.toggleFullScreen(); } }, - mounted(){ - this.userName = this.$store.state.name; -} }; - - - diff --git a/src/pages/Students.vue b/src/pages/Students.vue new file mode 100644 index 0000000..db78d35 --- /dev/null +++ b/src/pages/Students.vue @@ -0,0 +1,889 @@ + + + + \ No newline at end of file diff --git a/src/pages/changepassword.vue b/src/pages/changepassword.vue index 7838bdb..bdcc7fe 100644 --- a/src/pages/changepassword.vue +++ b/src/pages/changepassword.vue @@ -21,22 +21,17 @@ + v-model="adminChangePasswordcredentials.oldPassword" + label="Old Password"> - @@ -93,7 +88,7 @@ export default { confirmPassword: '', rules: { required: value => !!value || 'This password field is Required.', - min: v => (/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*])(?=.{8,})/).test(v) && v.length >= 8 || 'Min 8 characters upper case lower case symbol required' + // min: v => (/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*])(?=.{8,})/).test(v) && v.length >= 8 || 'Min 8 characters upper case lower case symbol required' }, }; }, @@ -101,11 +96,10 @@ export default { reset () { var token = this.$store.state.token; var userdata = { - "currentPassword":this.adminChangePasswordcredentials.currentPassword, + "oldPassword":this.adminChangePasswordcredentials.oldPassword, "newPassword":this.adminChangePasswordcredentials.newPassword, - "confirmPassword":this.adminChangePasswordcredentials.confirmPassword } - http().post('/adminChangePassword',userdata,{headers: {Authorization: 'Bearer '+token}}) + http().put('/schoolChangePassword',userdata,{headers: { Authorization: 'Bearer '+ token }}) .then(response => { this.loading = true; if(this.snackbar=true){ diff --git a/src/pages/forgetpassword.vue b/src/pages/forgetpassword.vue index 85c9554..a436ac6 100644 --- a/src/pages/forgetpassword.vue +++ b/src/pages/forgetpassword.vue @@ -2,7 +2,8 @@ - ana + +

School-Management

 @@ -76,7 +77,7 @@ export default { methods: { reset () { - http().get('/adminForgotPassword?email='+ this.changePassword) + http().get('/schoolForgotPassword?email='+ this.changePassword) .then(response => { console.log("response=====>",response); this.loading = true; diff --git a/src/router/paths.js b/src/router/paths.js index 6595c89..8e84839 100644 --- a/src/router/paths.js +++ b/src/router/paths.js @@ -136,14 +136,14 @@ export default [ // ) // }, { - path: '/Provider', + path: '/students', meta: { }, - name: 'Provider', + name: 'Students', props: (route) => ({ type: route.query.type }), component: () => import( /* webpackChunkName: "routes" */ /* webpackMode: "lazy-once" */ - `@/pages/Provider.vue` + `@/pages/Students.vue` ) }, { diff --git a/src/store/store.js b/src/store/store.js index 6c84a22..ad21ae9 100644 --- a/src/store/store.js +++ b/src/store/store.js @@ -13,9 +13,7 @@ export default new Vuex.Store({ token: null, data: null, isUserLoggedIn: false, - userName: null, - password: null, - name:null + id: null, }, // serve as the one and only way to change the state of the data in the state object mutations: { @@ -31,15 +29,9 @@ export default new Vuex.Store({ setUser (state, data) { state.data = data }, - User (state, userName) { - state.userName = userName + Id (state, id) { + state.id = id }, - password (state, password) { - state.password = password - }, - setName(state,name){ - state.name = name - } }, //Action methods are referred to as being "dispatched" actions: { @@ -49,14 +41,8 @@ export default new Vuex.Store({ setUser ({commit}, data) { commit('setUser', data) }, - User ({commit}, userName) { - commit('User', userName) - }, - password ({commit}, password) { - commit('password', password) - }, - setName({commit},name) { - commit('setName',name) + Id ({commit}, id) { + commit('Id', id) } }