viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit 29ac0dbb24e52d33f97b75a9c42ecd5764daba46

Authored by Neeraj Sharma
1 parent f9b486fe1c
Exists in master and in 3 other branches amber-development, development, ui-design

something changes

Showing 10 changed files with 46 additions and 28 deletions   Show diff stats
src/Services/http.js
Diff comments   View file @29ac0db
1 1 import axios from 'axios'
2 2 import store from '@/store/store'
3 3  
  4 +const baseDomain = "http://13.234.251.173:8001/v1";
  5 +
  6 +const baseURL = `${baseDomain}`;
  7 +
4 8 export default () => {
5 9 return axios.create({
6 10 // baseURL: 'http://192.168.2.221:3002/v1',
7   - baseURL: 'http://13.234.251.173:8001/v1',
  11 + baseURL,
8 12 headers: {
9 13 Authorization: `Bearer ${store.state.token}`
10 14 }
... ...
src/components/ThemeSettings.vue
Diff comments   View file @29ac0db
... ... @@ -141,7 +141,7 @@ export default {
141 141 watch: {
142 142 themeColor: {
143 143 handler(val) {
144   - console.log(val);
  144 + // console.log(val);
145 145 this.$vuetify.theme.primary = this.colors[val].base;
146 146 },
147 147 immediate: true
... ...
... ... @@ -28,7 +28,6 @@ const options = {
28 28 'https://unpkg.com/kidlat-css/css/kidlat.css'
29 29 ]
30 30 }
31   -
32 31 Vue.use(VueHtmlToPaper, options);
33 32  
34 33 // or, using the defaults with no stylesheet
... ...
src/pages/Administrator/systemAdmin.vue
Diff comments   View file @29ac0db
... ... @@ -991,10 +991,8 @@ export default {
991 991 this.$refs.image.click();
992 992 },
993 993 onFilePicked(e) {
994   - // console.log(e)
995 994 const files = e.target.files;
996 995 this.upload = e.target.files[0];
997   - console.log("imageData-upload========>", this.upload);
998 996 if (files[0] !== undefined) {
999 997 this.imageName = files[0].name;
1000 998 if (this.imageName.lastIndexOf(".") <= 0) {
... ... @@ -1005,9 +1003,6 @@ export default {
1005 1003 fr.addEventListener("load", () => {
1006 1004 this.imageUrl = fr.result;
1007 1005 this.imageFile = files[0]; // this is an image file that can be sent to server...
1008   - // this.imageData.imageUrl = URL.createObjectURL(this.imageFile);
1009   - // console.log("upload=======>", this.imageData.imageUrl);
1010   - console.log("imageFile", this.imageUrl);
1011 1006 });
1012 1007 } else {
1013 1008 this.imageName = "";
... ... @@ -1028,7 +1023,6 @@ export default {
1028 1023 .then(response => {
1029 1024 this.desserts = response.data.data;
1030 1025 this.showLoader = false;
1031   - // console.log("getTeacherList=====>",this.desserts)
1032 1026 })
1033 1027 .catch(error => {
1034 1028 this.showLoader = false;
... ... @@ -1065,7 +1059,6 @@ export default {
1065 1059 let deleteTeachers = {
1066 1060 teacherId: item._id
1067 1061 };
1068   - // console.log("deleteUers",deleteTeachers)
1069 1062 http()
1070 1063 .delete(
1071 1064 "/deleteTeacher",
... ... @@ -1074,7 +1067,6 @@ export default {
1074 1067 }
1075 1068 )
1076 1069 .then(response => {
1077   - // console.log("deleteUers",deleteTeachers)
1078 1070 if ((this.snackbar = true)) {
1079 1071 this.text = "Successfully delete Existing Teacher";
1080 1072 }
... ...
src/pages/Report/progressCardReport.vue
Diff comments   View file @29ac0db
... ... @@ -147,7 +147,7 @@
147 147 <b>RollNo</b>
148 148 </h4>
149 149 </v-flex>
150   - <v-flex sm9 xs7 class="py-1">
  150 + <v-flex sm9 xs6 class="py-1">
151 151 <h4>: {{ value[0].studentId.rollNo }}</h4>
152 152 </v-flex>
153 153 </v-layout>
... ... @@ -157,7 +157,7 @@
157 157 <b>Class</b>
158 158 </h4>
159 159 </v-flex>
160   - <v-flex sm9 xs8 class="py-1">
  160 + <v-flex sm9 xs6 class="py-1">
161 161 <h4>: {{value[0].classId.classNum }}</h4>
162 162 </v-flex>
163 163 </v-layout>
... ...
src/pages/Section/section.vue
Diff comments   View file @29ac0db
... ... @@ -105,17 +105,10 @@
105 105 <v-icon @click="close1">close</v-icon>
106 106 </v-toolbar>
107 107 <v-card>
108   - <v-flex align-center justify-center layout text-xs-center>
109   - <v-avatar size="50px" style="position:absolute; top:20px;">
110   - <img src="/static/icon/user.png" />
111   - </v-avatar>
112   - </v-flex>
113 108 <v-card-text>
114 109 <v-container grid-list-md>
115 110 <v-layout wrap>
116 111 <v-flex>
117   - <br />
118   - <br />
119 112 <v-layout>
120 113 <v-flex xs7 sm6>
121 114 <h5 class="right my-1 hidden-xs-only hidden-sm-only">
... ... @@ -184,10 +177,10 @@
184 177 :search="search"
185 178 >
186 179 <template slot="items" slot-scope="props">
187   - <td id="td" class="text-xs-center">{{ props.index + 1}}</td>
188   - <td id="td" class="text-xs-center">{{ props.item.classData.classNum}}</td>
189   - <td id="td" class="text-xs-center">{{ props.item.name}}</td>
190   - <td id="td" class="text-xs-center">{{ props.item.session}}</td>
  180 + <td id="td" class="text-xs-center">{{ props.index + 1 }}</td>
  181 + <td id="td" class="text-xs-center">{{ props.item.classData.classNum }}</td>
  182 + <td id="td" class="text-xs-center">{{ props.item.name }}</td>
  183 + <td id="td" class="text-xs-center">{{ props.item.session }}</td>
191 184  
192 185 <td class="text-xs-center">
193 186 <span>
... ... @@ -340,7 +333,8 @@
340 333  
341 334 <script>
342 335 import http from "@/Services/http.js";
343   -import Util from "@/util";
  336 +// import { apiCollection } from "@/schoolApi/apiCollection";
  337 +// const getSectionData = apiCollection.get("posts");
344 338  
345 339 export default {
346 340 data: () => ({
... ... @@ -413,9 +407,10 @@ export default {
413 407 }
414 408 }),
415 409 methods: {
416   - getSectionList() {
  410 + async getSectionList() {
  411 + // const { data } = await getSectionData.get();
417 412 this.showLoader = true;
418   - http()
  413 + await http()
419 414 .get("/getAllSections", {
420 415 headers: { Authorization: "Bearer " + this.token }
421 416 })
... ...
src/pages/Students/students.vue
Diff comments   View file @29ac0db
... ... @@ -1697,6 +1697,7 @@
1697 1697 import http from "@/Services/http.js";
1698 1698 import moment from "moment";
1699 1699 import countryList from "@/script/country.js";
  1700 +import parent from '@/script/parents.js'
1700 1701  
1701 1702 export default {
1702 1703 data: () => ({
... ...
src/schoolApi/apiCollection.js
Diff comments   View file @29ac0db
... ... @@ -0,0 +1,12 @@
  1 +// import schoolApi from "./schoolApi";
  2 +// // import GitHubRepository from "./gitHubRepository";
  3 +
  4 +// const repositories = {
  5 +// posts: schoolApi
  6 +// // gitHub: GitHubRepository
  7 +// // other repositories ...
  8 +// };
  9 +
  10 +// export const apiCollection = {
  11 +// get: name => repositories[name]
  12 +// };
0 13 \ No newline at end of file
... ...
src/schoolApi/schoolApi.js
Diff comments   View file @29ac0db
... ... @@ -0,0 +1,16 @@
  1 +// import http from "@/Services/http.js";
  2 +
  3 +// const resource = "/getAllSections";
  4 +// export default {
  5 +// get() {
  6 +// return http().get(`${resource}`)
  7 +// },
  8 +
  9 +// // getPost(postId) {
  10 +// // return Repository.get(`${resource}/${postId}`);
  11 +// // },
  12 +
  13 +// // createPost(payload) {
  14 +// // return Repository.post(`${resource}`, payload);
  15 +// // }
  16 +// };
0 17 \ No newline at end of file
... ...
src/script/students.js
Diff comments   View file @29ac0db
1 1 export default () => {
2   -
3 2 const students = [{
4 3 "name": "Rishav Singla",
5 4 "email": "rsingla.rishu@gmail.com",
... ...