viithiisys / School-Management-dashboard

Browse Code »

Commit 654e1501d9b3a39f2aaa0361b547a83900dee64e

Authored by Neeraj Sharma 2019-08-28 02:05:46 -0400

1 parent 99ffa9511f

Exists in master and in 3 other branches

remove school-manegement name and we fix intract logo in header

Showing 4 changed files with 6 additions and 7 deletions Show diff stats

src/components/pageHeader/AppDrawer.vue

Diff comments View file @654e150

 <template>
   <v-navigation-drawer
     id="appDrawer"
     :mini-variant.sync="mini"
     fixed
     :dark="$vuetify.dark"
     app
     v-model="drawer"
     width="260"
     >
     <v-toolbar style="background:#39b982"  >
-      <img v-bind:src="computeLogo" height="30" class="imgLogo" alt="ana">
+      <img v-bind:src="computeLogo" height="40" width="150" class="imgLogo" alt="ana">
-      <h5 class="white--text my-3 ml-2">School Management</h5>
      <v-toolbar-title class="ml-0 pl-3" >
       </v-toolbar-title>
     </v-toolbar>
     <vue-perfect-scrollbar class="drawer-menu--scroll" :settings="scrollSettings">
       <v-list dense expand>
         <template v-for="(item, i) in menus">
             <!--group with subitems-->
             <v-list-group v-if="item.items" :key="item.name" :group="item.group" :prepend-icon="item.icon" no-action="no-action">
               <v-list-tile slot="activator" ripple="ripple">
                 <v-list-tile-content>
                   <v-list-tile-title>{{ item.title }}</v-list-tile-title>
                 </v-list-tile-content>
               </v-list-tile>
               <template v-for="(subItem, i) in item.items">
                 <!--sub group-->
                 <v-list-group v-if="subItem.items" :key="subItem.name" :group="subItem.group" sub-group="sub-group">
                   <v-list-tile slot="activator" ripple="ripple">
                     <v-list-tile-content>
                       <v-list-tile-title>{{ subItem.title }}</v-list-tile-title>
                     </v-list-tile-content>
                   </v-list-tile>
                   <v-list-tile v-for="(grand, i) in subItem.children" :key="i" :to="genChildTarget(item, grand)" :href="grand.href" ripple="ripple">
                     <v-list-tile-content>
                       <v-list-tile-title>{{ grand.title }}</v-list-tile-title>
                     </v-list-tile-content>
                   </v-list-tile>
                 </v-list-group>
                 <!--child item-->
                 <v-list-tile v-else :key="i" :to="genChildTarget(item, subItem)" :href="subItem.href" :disabled="subItem.disabled" :target="subItem.target" ripple="ripple">
                   <v-list-tile-content>
                     <v-list-tile-title><span>{{ subItem.title }}</span></v-list-tile-title>
                   </v-list-tile-content>
                   <!-- <v-circle class="white--text pa-0 circle-pill" v-if="subItem.badge" color="red" disabled="disabled">{{ subItem.badge }}</v-circle> -->
                   <v-list-tile-action v-if="subItem.action">
                     <v-icon :class="[subItem.actionClass || 'success--text']">{{ subItem.action }}</v-icon>
                   </v-list-tile-action>
                 </v-list-tile>
               </template>
             </v-list-group>
             <v-subheader v-else-if="item.header" :key="i">{{ item.header }}</v-subheader>
             <v-divider v-else-if="item.divider" :key="i"></v-divider>
             <!--top-level link-->
             <v-list-tile v-else :to="!item.href ? { name: item.name } : null" :href="item.href" ripple="ripple" :disabled="item.disabled" :target="item.target" rel="noopener" :key="item.name">
               <v-list-tile-action v-if="item.icon">
                 <v-icon>{{ item.icon }}</v-icon>
               </v-list-tile-action>
               <v-list-tile-content>
                 <v-list-tile-title>{{ item.title }}</v-list-tile-title>
               </v-list-tile-content>
               <!-- <v-circle class="white--text pa-0 chip--x-small" v-if="item.badge" :color="item.color || 'primary'" disabled="disabled">{{ item.badge }}</v-circle> -->
               <v-list-tile-action v-if="item.subAction">
                 <v-icon class="success--text">{{ item.subAction }}</v-icon>
               </v-list-tile-action>
               <!-- <v-circle class="caption blue lighten-2 white--text mx-0" v-else-if="item.chip" label="label" small="small">{{ item.chip }}</v-circle> -->
             </v-list-tile>
         </template>
       </v-list>
     </vue-perfect-scrollbar>
   </v-navigation-drawer>
 </template>
 <script>
 import menu from '@/api/menu';
 import VuePerfectScrollbar from 'vue-perfect-scrollbar';
 export default {
   name: 'app-drawer',
   components: {
     VuePerfectScrollbar,
   },
   props: {
     expanded: {
       type: Boolean,
       default: true
     },
   },
   data: () => ({
     mini: false,
     drawer: true,
     menus: menu,
     scrollSettings: {
       maxScrollbarLength: 160
     }
   }),
   computed: {
     computeGroupActive () {
       return true;
     },
     computeLogo () {
-      return '/static/icon.jpeg';
+      return '/static/icon.png';
     },
     sideToolbarColor () {
       return this.$vuetify.options.extra.sideNav;
     }
   },
   created () {
     window.getApp.$on('APP_DRAWER_TOGGLED', () => {
       this.drawer = (!this.drawer);
     });
   },
   methods: {
     genChildTarget (item, subItem) {
       if (subItem.href) return;
       if (subItem.component) {
         return {
           name: subItem.component,
         };
       }
       return { name: `${item.group}/${(subItem.name)}` };
     },
   }
 };
 </script>
 <style lang="stylus">
 // @import '../../node_modules/vuetify/src/stylus/settings/_elevations.styl';
 #appDrawer
   overflow: hidden
   .drawer-menu--scroll
     height: calc(100vh - 48px)
     overflow: auto
 .v-list--dense .v-list__tile:not(.v-list__tile--avatar) {
     height: 60px;
     font-size:17px;
 }
 .v-list__tile__action {
   min-width:36px;
 }
 .v-list__tile.primary--text {
     color:black !important;
     border-left: 4px solid black;
     border-radius: 4px;
 }
 @media screen and (max-width: 420px) {
 .v-list--dense .v-list__tile:not(.v-list__tile--avatar) {
     font-size: 14px;
 }
 .imgLogo{
   height: 22px;
   width:  20px;;
 }
 }
 </style>
 <style scoped>
 .theme--light .v-icon, .application .theme--light.v-icon {
     color: #39b982;
 }
 </style>

src/pages/Authentication/Login.vue

Diff comments View file @654e150

 <template>
   <v-app id="login">
     <v-toolbar  class="fixcolors">
       <v-toolbar-items>
-        <img src="/static/icon.jpeg" height="36" alt="logo">
+        <img src="/static/icon.png" height="40" width="140" alt="logo">
-        <h3 class="white--text my-3 ml-5 logoSchool">School-Management</h3>
+        <!-- <h3 class="white--text my-3 ml-5 logoSchool">School-Management</h3> -->
       </v-toolbar-items>
     </v-toolbar>
     <v-content>
       <v-container fluid fill-height>
         <v-snackbar
           :timeout="timeout"
           :top="y === 'top'"
           :right="x === 'right'"
           :vertical="mode === 'vertical'"
           v-model="snackbar"
           :color="color"
         >{{ text }}</v-snackbar>
         <v-layout align-center justify-center>
           <v-flex xs12 sm10 md6 lg4>
             <v-toolbar class="fixcolors" dark>
               <v-spacer></v-spacer>
               <v-toolbar-title>School Login</v-toolbar-title>
               <v-spacer></v-spacer>
             </v-toolbar>
             <v-card class="elevation-1 pa-1">
               <v-card-text>
                 <v-flex xs12 sm12 md12 lg12>
                   <v-form ref="form" v-model="valid" lazy-validation>
                     <v-text-field
                       v-model="userLogincredentials.email"
                       :rules="nameRules"
                       label="Username"
                       required
                     ></v-text-field>
                     <v-text-field
                       :rules="[rules.required]"
                       v-model="userLogincredentials.password"
                       :append-icon="e1 ? 'visibility_off' : 'visibility'"
                       :append-icon-cb="() => (e1 = !e1)"
                       :type="e1 ? 'password' : 'text'"
                       name="input-10-1"
                       label="Password"
+                      @keyup.enter="login"
                       counter
                     ></v-text-field>
                   </v-form>
                    <v-layout row wrap>
                   <v-flex xs6>
                       <!-- <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>
                   </v-flex>
                    </v-layout>
                 </v-flex>
               </v-card-text>
               <v-layout>
               <v-flex sm12 class="my-3">
                 <v-btn style="margin: auto;display: block;b" class="fixcolors" round dark large @click="login" :loading="loading">Login</v-btn>
               </v-flex>
                </v-layout>
                <v-layout>
               </v-layout>
             </v-card>
           </v-flex>
         </v-layout>
       </v-container>
     </v-content>
     <v-footer class="pa-4 fixcolors"></v-footer>
   </v-app>
 </template>
 <script>
 import http from "@/Services/http.js";
 export default {
   data() {
     return {
       snackbar: false,
       y: "top",
       x: "right",
       mode: "",
       timeout: 3000,
       text: "",
       e1: true,
       loading: false,
       remember: false,
       valid: false,
       userLogincredentials: {},
       nameRules: [
         v => !!v || "Username is required"
       ],
       password: "",
       email:"",
       rules: {
         required: value => !!value || "password is Required.",
         // min: v =>
         //   (/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*])(?=.{8,})/.test(
         //     v
         //   ) &&
         //     v.length >= 6) ||
         //   "Min 4 characters upper case lower case symbol required"
       }
     };
   },
   methods: {
     login() {
      this.loading = true;
       var userdata = {
         email: this.userLogincredentials.email,
         password: this.userLogincredentials.password,
         role:"ADMIN"
       };
       http()
         .post("/schoolLogin", userdata)
         .then(response => {
           this.$store.dispatch("setToken", response.data.data.token);
           this.$store.dispatch("Id", response.data.data.id);
           this.loading = false;
           this.$router.push("/teachers");
         })
         .catch(error => {
           this.text = error.response.data.message
           this.snackbar = true;
           this.loading = false;
         });
     }
   },
   computed: {
     color() {
       return this.loading ? "success" : "error";
     }
   }
 };
 </script>
 <style scoped lang="css">
 #login {
   width: 100%;
   position: absolute;
   top: 0;
   left: 0;
   content: "";
   z-index: 0;
 }
 </style>
 <style scoped>
 img {
   position: absolute;
   top: 13px;
   left: 8px;
 }
 .v-btn--large {
   padding: 0px 84px;
 }
 .link{
   text-decoration:none;
 }
 a {
   color: #696969;
 }
  .forget{
   margin-top:20px;
 }
 .mt-4 {
     margin-top: 21px !important;
 }
 @media screen and (max-width: 600px) {
  .forget{
   margin-top:none;
   margin-left:18px;
 }
 img{
 top: 21px;
 left: 10px;
 height: 24px;
 width: 33px;
 }
 .logoSchool{
 font-size: 18px;
 margin-top: 20px !important;
 }
 h5 {
     font-size: 14px !important;
 }
 }
 </style>

src/pages/Authentication/forgetpassword.vue

Diff comments View file @654e150

 <template>
   <v-app id="login">
     <v-toolbar class="fixcolors">
       <v-toolbar-items>
-       <img src="/static/icon.jpeg" height="36" alt="logo">
+       <img src="/static/icon.png" height="40"  width="140" alt="logo">
-        <h3 class="white--text my-3 ml-5 logoSchool">School Management</h3>
       </v-toolbar-items>
     </v-toolbar>
     <v-container fluid>
       <v-layout align-center justify-center fill-height>
         <v-flex xs12 sm8 md7 lg8>
           <div>
             <v-app>
               <v-stepper v-model="e2">
                 <v-stepper-header>
                   <v-stepper-step :complete="e2 > 1" step="1">Fill Your Email</v-stepper-step>
                   <v-divider></v-divider>
                   <v-stepper-step step="2">Last Step of Forget Password</v-stepper-step>
                 </v-stepper-header>
                 <v-stepper-items>
                   <v-stepper-content step="1">
                     <v-content>
                       <v-container fluid class="content">
                         <v-layout align-center justify-center fill-height>
                           <v-flex xs12 sm8 md7 lg8>
                             <v-toolbar class="fixcolors" dark>
                               <v-spacer></v-spacer>
                               <v-toolbar-title>Forget Password</v-toolbar-title>
                               <v-spacer></v-spacer>
                             </v-toolbar>
                             <v-card class="elevation-1 pa-1">
                               <v-card-text>
                                 <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 ref="form" v-model="valid" lazy-validation>
                                     <div class="custom-input-align">
                                       <v-text-field
                                        class="text-md-center"
                                        :rules="emailRules"
                                        v-model="forgetemail"
                                        label="Enter Your email ID"
                                        required></v-text-field>
                                     </div>
                                   </v-form>
                                 </v-flex>
                               </v-card-text>
                               <v-card-actions>
                                 <v-flex text-xs-center>
                                   <v-btn round class="mt-1 button fixcolors" dark large @click="reset">Send Request</v-btn>
                                 </v-flex>
                               </v-card-actions>
                               <v-snackbar
                                      :timeout="timeout"
                                      :top="y === 'top'"
                                      :right="x === 'right'"
                                      :vertical="mode === 'vertical'"
                                      v-model="snackbar"
                                      :color= color
                              >
                             {{ text }}
                              </v-snackbar>
                             </v-snackbar>
                           </v-card>
                         </v-flex>
                       </v-layout>
                     </v-container>
                   </v-content>
                 </v-stepper-content>
                 <v-stepper-content step="2">
                   <v-content>
                     <v-container fluid fill-height>
                       <v-layout align-center justify-center>
                         <v-flex xs12 sm8 md7 lg8>
                           <v-toolbar class="fixcolors" dark>
                             <v-spacer></v-spacer>
                             <v-toolbar-title>Forget Password</v-toolbar-title>
                             <v-spacer></v-spacer>
                           </v-toolbar>
                           <v-card class="elevation-1 pa-1">
                             <v-card-text>
                               <h5 class="text-xs-center"> Not to Worry! Enter to your registered Email ID And New Password. </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">
                                   <div class="custom-input-align">
                                     <v-text-field
                                      class="text-md-center"
                                      v-model="email"
                                      :rules="emailRules"
                                      label="Enter Your email ID"
                                      required></v-text-field>
                                     <v-text-field
                                     :rules="[rules.required,rules.min]"
                                     v-model="changepassword"
                                     :append-icon="e1 ? 'visibility_off' : 'visibility'"
                                     :append-icon-cb="() => (e1 = !e1)"
                                     :type="e1 ? 'password' : 'text'"
                                     name="input-10-1"
                                     label="Password"
                                     counter
                                    ></v-text-field>
                                   </div>
                                 </v-form>
                               </v-flex>
                             </v-card-text>
                             <v-card-actions>
                               <v-flex text-xs-center>
                                 <v-btn round class="mt-1 button fixcolors" dark large @click="resetPassword">Send Request</v-btn>
                               </v-flex>
                             </v-card-actions>
                             <v-snackbar
                                 :timeout="timeout"
                                 :top="y === 'top'"
                                 :right="x === 'right'"
                                 :vertical="mode === 'vertical'"
                                 v-model="snackbar"
                                 :color= color
                             >
                             {{ text }}
                            </v-snackbar>
                           </v-snackbar>
                         </v-card>
                       </v-flex>
                     </v-layout>
                   </v-container>
                 </v-content>
                 <v-btn
             color="primary"
             dark
             @click="e2 = 1"
           >
             Back
           </v-btn>
               </v-stepper-content>
             </v-stepper-items>
           </v-stepper>
          </v-app>
        </div>
       </v-flex>
      </v-layout>
     </v-container>
    <v-footer class="pa-4 fixcolors">
   </v-footer>
  </v-app>
 </template>
 <script>
 import http from '@/Services/http.js';
 export default {
   data: () => ({
     e1: true,
     e2:0,
     snackbar: false,
     y: 'top',
     x: 'right',
     mode: '',
     timeout: 4000,
     text: '',
     loading: false,
     email: '',
     forgetemail:'',
     password:'',
     changepassword:'',
     valid: true,
     emailRules: [
       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.",
         min: v =>
           (/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*])(?=.{8,})/.test(
             v
           ) &&
             v.length >= 6) ||
           "Min 4 characters upper case lower case symbol required"
       }
   }),
   methods: {
     reset () {
       if (this.$refs.form.validate()) {
       http().get('/schoolForgotPassword?email='+ this.forgetemail)
         .then(response => {
           // console.log("response=====>",response.data.data.token);
           this.$store.dispatch("setToken", response.data.data.token);
           this.loading = true;
           this.e2 = 2 ;
           if(this.snackbar=true){
               this.text= "Please you Fill Last Step of Forget Password!"
           }
        }).catch(err => {
            this.text="User Not Found or Incorrect Email"
            this.snackbar= true;
            this.loading = false;
        })
      }
     },
     resetPassword(){
       let forgotPassword = {
         resetToken: this.$store.state.token,
         email: this.email,
         password: this.changepassword
       }
       http().post('/schoolResetPassword',forgotPassword)
         .then(response => {
           console.log("response=====>",response);
           this.loading = true;
           if(this.snackbar=true){
               this.text= "Successfully Change your Password"
           }
           setTimeout(() => {
           this.$router.push('/');
        }, 1000);
        }).catch(err => {
            this.text="User Not Found or Incorrect Email"
            this.snackbar= true;
            this.loading = false;
        })
     }
   },
   computed:{
   color(){
     return this.loading ? 'success' : 'error'
 }
 }
 };
 </script>
 <style scoped lang="css">
 .content {
     padding: 100px 0px 100px 0px !important;
 }
   #login {
     height: 50%;
     width: 100%;
     position: absolute;
     top: 0;
     left: 0;
     content: "";
     z-index: 0;
   }
 img{
 position:absolute;
 top:13px;
 left:8px;
 }
 .v-btn--large {
     padding: 0px 74px;
 }
 .button{
   text-transform: none;
 }
 @media screen and (max-width: 472px) {
 .v-btn--large {
     padding:0px 20px !important;
     font-size:13px;
 }
 h5 {
     font-size: 11px;
 }
 }
 @media screen and (max-width: 600px) {
 .theme--light .v-btn, .application .theme--light.v-btn {
     color: white !important;
 }
 img{
 top: 21px;
 left: 10px;
 height: 24px;
 width: 33px;
 }
 .logoSchool{
 font-size: 18px;
 margin-top: 20px !important;
 }
 .content {
     padding: 0px 0px 0px 0px !important;
 }
 }
 </style>

static/icon.jpeg

View file @99ffa95

8.25 KB