From 506be6fd74389ddd3cb2501eb54ed5a87ebc4544 Mon Sep 17 00:00:00 2001 From: Neeraj Sharma Date: Tue, 16 Apr 2019 11:53:34 +0530 Subject: [PATCH] implemet dyamic image api in news and new design implemented, added dyamic selection for showig data of students and timetable, implememted notification apis --- index.html | 3 +- package-lock.json | 7 +- package.json | 1 + src/App.vue | 8 + src/Services/http.js | 6 +- src/api/menu.js | 6 - src/components/pageHeader/AppDrawer.vue | 2 +- src/pages/Authentication/Login.vue | 14 +- src/pages/Authentication/forgetpassword.vue | 2 +- src/pages/Class/addclass.vue | 54 +- src/pages/Event/event.vue | 8 +- src/pages/News/news.vue | 149 +- src/pages/Notification/notification.vue | 8 +- src/pages/Section/section.vue | 25 +- src/pages/Students/students.vue | 189 +- src/pages/Teachers/teachers.vue | 22 +- src/pages/TimeTable/timeTable.vue | 2600 ++++++++++++++------------- src/router/paths.js | 54 +- static/icon/google.png | Bin 0 -> 12734 bytes static/icon/hangouts.png | Bin 0 -> 15266 bytes static/icon/inbox.png | Bin 0 -> 22444 bytes static/icon/keep.png | Bin 0 -> 2146 bytes 22 files changed, 1698 insertions(+), 1460 deletions(-) create mode 100644 static/icon/google.png create mode 100644 static/icon/hangouts.png create mode 100644 static/icon/inbox.png create mode 100644 static/icon/keep.png diff --git a/index.html b/index.html index 7e878a8..12b7c8b 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,8 @@ - + + School Management diff --git a/package-lock.json b/package-lock.json index 12adc29..1511edb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "ana-admin", + "name": "schoolmanagement", "version": "1.0.0", "lockfileVersion": 1, "requires": true, @@ -9295,6 +9295,11 @@ "node-walkdir": "^0.1.0" } }, + "moment": { + "version": "2.24.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", + "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + }, "morgan": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz", diff --git a/package.json b/package.json index 316f7ce..aa11a9c 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "axios": "^0.18.0", "font-awesome": "^4.7.0", "lodash.truncate": "^4.4.2", + "moment": "^2.24.0", "nprogress": "^0.2.0", "quill": "^1.3.6", "vee-validate": "^2.0.9", diff --git a/src/App.vue b/src/App.vue index 68a5acf..76a687c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -78,3 +78,11 @@ export default { min-height:calc(1200px - 64px - 50px - 81px ) + diff --git a/src/Services/http.js b/src/Services/http.js index b01ed34..f4eea22 100644 --- a/src/Services/http.js +++ b/src/Services/http.js @@ -3,12 +3,10 @@ import store from '@/store/store' export default () => { return axios.create({ - // baseURL:'http://d246be2d.ngrok.io/v1', - baseURL:'http://192.168.4.220:3002/v1', - // baseURL:'http://139.59.58.160:8001/v1', + baseURL:'http://192.168.2.221:3002/v1', + // baseURL:'http://139.59.58.160:8001' headers: { Authorization: `Bearer ${store.state.token}` - // Authorization:"Basic YWRtaW46b2ZiaXo=" } }) } diff --git a/src/api/menu.js b/src/api/menu.js index a79cf9a..c8891b6 100644 --- a/src/api/menu.js +++ b/src/api/menu.js @@ -1,11 +1,5 @@ const Menu = [ // { header: 'Apps' }, - // { - // title: 'Dashboard', - // // group: 'apps', - // name: 'dashboard', - // icon: 'view_module', - // }, { title: 'Class', // group: 'apps', diff --git a/src/components/pageHeader/AppDrawer.vue b/src/components/pageHeader/AppDrawer.vue index 1c9b2c4..5d7f685 100644 --- a/src/components/pageHeader/AppDrawer.vue +++ b/src/components/pageHeader/AppDrawer.vue @@ -10,7 +10,7 @@ > -
Technology Succes
+
School Management
 diff --git a/src/pages/Authentication/Login.vue b/src/pages/Authentication/Login.vue index f0d10ce..4af02ed 100644 --- a/src/pages/Authentication/Login.vue +++ b/src/pages/Authentication/Login.vue @@ -1,9 +1,9 @@ @@ -110,8 +110,7 @@ export default { var userdata = { email: this.userLogincredentials.email, password: this.userLogincredentials.password, - role:"ADMIN" - + role:"ADMIN" }; http() .post("/schoolLogin", userdata) @@ -126,7 +125,6 @@ export default { this.snackbar = true; this.loading = false; }); - this.$router.push("/teachers"); } }, computed: { diff --git a/src/pages/Authentication/forgetpassword.vue b/src/pages/Authentication/forgetpassword.vue index 3ec04ec..ee19a1f 100644 --- a/src/pages/Authentication/forgetpassword.vue +++ b/src/pages/Authentication/forgetpassword.vue @@ -3,7 +3,7 @@ logo -

Technology Succes

+

School Management

 diff --git a/src/pages/Class/addclass.vue b/src/pages/Class/addclass.vue index 63097f0..bea3f45 100644 --- a/src/pages/Class/addclass.vue +++ b/src/pages/Class/addclass.vue @@ -73,9 +73,9 @@ color="success" >{{ text }} - + - Edit Class +

Edit Class

 @@ -86,16 +86,15 @@ - + - + > @@ -113,9 +112,9 @@ - + - Profile +

Class Profile

 close @@ -163,8 +162,8 @@ :search="search" >