Merge pull request #115 from aimanaisha/development

updated contacts

Author: mayankt18

package-lock.json

@@ -18,7 +18,7 @@
     "connect-history-api-fallback": "^1.6.0",
     "express": "^4.17.1",
     "moment": "^2.27.0",
-    "sass": "^1.26.10",
+    "sass": "^1.55.0",
     "vue": "^2.6.11",
     "vue-carousel": "^0.10.0",
     "vue-disqus": "^3.0.5",
@@ -55,7 +55,6 @@
     "friendly-errors-webpack-plugin": "^1.6.1",
     "html-webpack-plugin": "^2.30.1",
     "node-notifier": "^5.4.3",
-    "node-sass": "^4.14.1",
     "optimize-css-assets-webpack-plugin": "^3.2.1",
     "ora": "^1.2.0",
     "portfinder": "^1.0.26",

package.json

@@ -85,7 +85,6 @@ export default {
     common.getAlumni()
       .then(response => {
         const profiles = response.data
-        console.log(profiles)
         profiles.forEach((member) => {
           if (member.image === null) { member.image = 'static/images/Linux-Avatar.png' }
           this.categorise(member)

src/components/Alumni.vue

@@ -22,7 +22,6 @@ export default {
   },
 
   ready: function () {
-    console.log(this.number)
     this.displayNumber = this.number ? this.number : 0
   },
 

src/components/AnimateNumber.vue

@@ -48,7 +48,6 @@ export default {
         this.blog.sort(function (a, b) { return new Date(b.date_to_show) - new Date(a.date_to_show) })
         this.recents = [...this.blog.slice(0, 3)]
         this.blog.splice(0, 3)
-        console.log(this.blog)
         this.$emit('hideloader', true)
         this.$emit('hideloader', true)
         this.$emit('hideloader', true)

src/components/Blog.vue

@@ -5,25 +5,36 @@
     </h2>
     <div class="row p-0 Contact-us">
       <div class="col-md-12 col-lg-5 m-0 pb-4 pt-4">
-        <div v-for="(contact,index) in contacts" :key="index" class="row d-flex justify-content-center">
+        <div
+          v-for="(contact, index) in contacts"
+          :key="index"
+          class="row d-flex justify-content-center"
+        >
           <div class="col-11 font-weight-bold ">
             <div class="contact-card">
-              {{ contact.name }} <br>
-              <i class="fas fa-phone" /> {{ contact.phone }} <br>
-              <i class="fas fa-envelope" /> {{ contact.mail }} <br>
+              {{ contact.name }} <br />
+              <i class="fas fa-phone" /> {{ contact.phone_number }} <br />
+              <i class="fas fa-envelope" /> {{ contact.email }} <br />
             </div>
           </div>
         </div>
       </div>
       <div class="col-sm-12 col-lg-7 p-0">
-        <div class="Contact-footer--right" style="background-image: url('static/images/map.jpeg')">
+        <div
+          class="Contact-footer--right"
+          style="background-image: url('static/images/map.jpeg')"
+        >
           <div class="Contact-footer--right-content">
             <div class="row mt-2">
               <div class="col-1 p-0 mr-2">
                 <i class="fas fa-map-marker-alt fa-2x" />
               </div>
               <div class="col-10">
-                <p> <strong>GNU/Linux Users' Group<br>  NIT Durgapur</strong></p><p>Durgapur<br>West Bengal 713209</p>
+                <p>
+                  <strong>GNU/Linux Users' Group<br />
+                    NIT Durgapur</strong>
+                </p>
+                <p>Durgapur<br />West Bengal 713209</p>
               </div>
             </div>
           </div>
@@ -33,7 +44,7 @@
   </div>
 </template>
 
-<script>
+<!-- <script>
 export default {
   data () {
     return {
@@ -46,18 +57,38 @@ export default {
     }
   }
 }
+</script> -->
+
+<script>
+import common from '@/services/common.js'
+export default {
+  data () {
+    return {
+      contacts: []
+    }
+  },
+  created () {
+    common.getContact()
+      .then(response => {
+        this.contacts = response.data
+        this.$emit('hideloader', true)
+      })
+      .catch(e => {
+        console.log(e)
+      })
+  }
+}
 </script>
 
 <style scoped>
-
 h2 {
   font-size: 32px;
   text-transform: uppercase;
 }
 .highlighted {
   color: #fa631c;
 }
-.Contact-us{
+.Contact-us {
   background-color: #f5f5f5;
 }
 .contact-card {
@@ -79,7 +110,7 @@ h2 {
   margin: 0;
   padding: 3vh 1vw 3vh;
   width: 100%;
-  float:left;
+  float: left;
   box-sizing: border-box;
   padding-bottom: 20vh;
 }
@@ -102,8 +133,7 @@ h2 {
   pointer-events: none;
   border: solid transparent;
   border-width: 12px;
-  border-color: rgba(218,77,60,0);
+  border-color: rgba(218, 77, 60, 0);
   border-top-color: #444;
 }
-
 </style>

src/components/ContactUs.vue

@@ -222,7 +222,6 @@ export default {
           this.featuredEvents.push(event)
         }
       })
-      console.log(this.featuredEvents)
     }
   }
 }

src/components/Events.vue

@@ -68,7 +68,6 @@ export default {
       .then(response => {
         this.events = response.data
         this.events = this.events.filter(event => event.featured)
-        console.log(this.events)
         this.stopLoader()
       })
       .catch(e => {

src/components/Home.vue

@@ -36,7 +36,6 @@ export default {
     common.getPost(this.$route.query.id)
       .then(response => {
         this.post = response.data
-        console.log(this.post)
         this.$emit('hideloader', true)
         this.$emit('hideloader', true)
         this.$emit('hideloader', true)

src/components/Post.vue

@@ -86,7 +86,6 @@ export default {
     common.getMembers()
       .then(response => {
         const profiles = response.data
-        console.log(profiles)
         profiles.forEach((member) => {
           if (member.image === null) { member.image = 'static/images/Linux-Avatar.png' }
           this.categorise(member)