From c24cb57863d89121db9e6e99396e0b335f2f2607 Mon Sep 17 00:00:00 2001
From: Max <maxwell.dempsey@safelite.com>
Date: Tue, 19 Oct 2021 10:02:55 -0400
Subject: [PATCH] Button and transition updates

---
 src/assets/scss/components/_buttons.scss |  4 ++++
 src/layouts/SelectCar/BaseTemplate.vue   | 12 ++++++------
 src/layouts/SelectCar/SelectMake.vue     |  5 ++---
 src/layouts/SelectCar/SelectModel.vue    |  4 ++--
 src/layouts/SelectCar/SelectStyle.vue    |  4 ++--
 src/layouts/SelectCar/SelectYear.vue     |  5 -----
 src/sharedcomponents/Button.vue          | 20 +++++++++++++++++++-
 src/store/index.js                       |  2 +-
 8 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/assets/scss/components/_buttons.scss b/src/assets/scss/components/_buttons.scss
index 26341f377..71a1118f3 100644
--- a/src/assets/scss/components/_buttons.scss
+++ b/src/assets/scss/components/_buttons.scss
@@ -17,4 +17,8 @@
       z-index: -1;
     }
   }
+  &.btn-funnel {
+    display: flex;
+    justify-content: space-between;
+  }
 }
diff --git a/src/layouts/SelectCar/BaseTemplate.vue b/src/layouts/SelectCar/BaseTemplate.vue
index e89c4f27d..95a39dba5 100644
--- a/src/layouts/SelectCar/BaseTemplate.vue
+++ b/src/layouts/SelectCar/BaseTemplate.vue
@@ -7,10 +7,7 @@
                 </div>
                 <div class="current_car_info mb-4">
                     <transition appear name="fade">
-                        <div v-if="backFunction" class="current_car_info-text" v-on:click="backFunction()">
-                            <p class="text-center text-secondary fs-5">{{ this.currentCarInfo }}</p>
-                        </div>
-                        <div v-else class="current_car_info-text">
+                        <div class="current_car_info-text" v-on:click="backFunction ? backFunction() : null">
                             <p class="text-center text-secondary fs-5">{{ this.currentCarInfo }}</p>
                         </div>
                     </transition>
@@ -40,16 +37,19 @@
 
 <script>
 import Button from '@/sharedcomponents/Button';
+import { mapState } from 'vuex';
 
 export default {
   name: 'SCTemplate',
+  computed: {
+      ...mapState(['slideTransition'])
+  },
   props: {
       currentCarInfo: String,
       neededCarInfo: String,
       attritbutes: Array,
       backFunction: Function,
-      selectAttribute: Function, 
-      slideTransition: String
+      selectAttribute: Function 
   },
   components: {
       Button
diff --git a/src/layouts/SelectCar/SelectMake.vue b/src/layouts/SelectCar/SelectMake.vue
index e5998e137..dcb998224 100644
--- a/src/layouts/SelectCar/SelectMake.vue
+++ b/src/layouts/SelectCar/SelectMake.vue
@@ -6,7 +6,6 @@
             :attritbutes="makes"
             :backFunction="goBack"
             :selectAttribute="selectMake"
-            :transition='slideTransition'
         />
     </div>
 </template>
@@ -18,14 +17,14 @@ import { mapState } from 'vuex';
 export default {
   name: 'SelectCar',
   computed: {
-      ...mapState(['year', 'makes', 'slideTransition'])
+      ...mapState(['year', 'makes'])
   },
   methods: {
       selectMake(make){
           this.$store.dispatch('selectMake', make);
       },
       goBack(){
-          this.$store.state.slideTransition = 'slide_reverse'
+          this.$store.state.slideTransition = 'slide_reverse';
           this.$router.push('/select-year');
       }
   }, 
diff --git a/src/layouts/SelectCar/SelectModel.vue b/src/layouts/SelectCar/SelectModel.vue
index a865d09c5..1a092cb98 100644
--- a/src/layouts/SelectCar/SelectModel.vue
+++ b/src/layouts/SelectCar/SelectModel.vue
@@ -6,7 +6,6 @@
             :attritbutes="models"
             :backFunction="goBack"
             :selectAttribute="selectModel"
-            :transition='slideTransition'
         />
     </div>
 </template>
@@ -18,13 +17,14 @@ import { mapState } from 'vuex'
 export default {
   name: 'SelectCar',
   computed: {
-      ...mapState(['year', 'make', 'models', 'slideTransition'])
+      ...mapState(['year', 'make', 'models'])
   },
   methods: {
       selectModel(model){
           this.$store.dispatch('selectModel', model);
       },
       goBack(){
+          this.$store.state.slideTransition = 'slide_reverse';
           this.$router.push(`/select-make?year=${this.$store.state.year}`);
       }
   }, 
diff --git a/src/layouts/SelectCar/SelectStyle.vue b/src/layouts/SelectCar/SelectStyle.vue
index 42be51a55..95e71acee 100644
--- a/src/layouts/SelectCar/SelectStyle.vue
+++ b/src/layouts/SelectCar/SelectStyle.vue
@@ -5,7 +5,6 @@
             :neededCarInfo="'What style is your ' + model + '?'"
             :attritbutes="styles"
             :backFunction="goBack"
-            :transition='slideTransition'
         />
     </div>
 </template>
@@ -17,10 +16,11 @@ import { mapState } from 'vuex'
 export default {
   name: 'SelectCar',
   computed: {
-      ...mapState(['year', 'make', 'model', 'styles', 'slideTransition'])
+      ...mapState(['year', 'make', 'model', 'styles'])
   },
   methods: {
       goBack(){
+          this.$store.state.slideTransition = 'slide_reverse';
           this.$router.push(`/select-model?year=${this.$store.state.year}&make=${this.$store.state.make}`);
       }
   }, 
diff --git a/src/layouts/SelectCar/SelectYear.vue b/src/layouts/SelectCar/SelectYear.vue
index f6efbddc5..dbee24b48 100644
--- a/src/layouts/SelectCar/SelectYear.vue
+++ b/src/layouts/SelectCar/SelectYear.vue
@@ -5,14 +5,12 @@
             neededCarInfo="What year is your vehicle?"
             :attritbutes="years"
             :selectAttribute="selectYear"
-            :transition='slideTransition'
         />
     </div>
 </template>
 
 <script>
 import baseTemplate from './BaseTemplate';
-import { mapState } from 'vuex';
 import axios from 'axios';
 
 export default {
@@ -22,9 +20,6 @@ export default {
           years: []
       }
   },
-  computed: {
-      ...mapState(['slideTransition'])
-  },
   mounted() {
       axios.get("https://mockey.qa.sagaws.net/service/years").then((response) => {
           this.years = response.data.Result;
diff --git a/src/sharedcomponents/Button.vue b/src/sharedcomponents/Button.vue
index fd8369dc9..fcb8fe50a 100644
--- a/src/sharedcomponents/Button.vue
+++ b/src/sharedcomponents/Button.vue
@@ -3,7 +3,15 @@
     type="button" 
     class="btn"
     v-bind:class="this.buttonType === 'btn-funnel' ? ['btn-funnel', 'border', 'rounded', 'w-100', 'text-start'] : this.buttonType"
-    >{{ this.buttonText }}
+    v-on:click="this.buttonType === 'btn-funnel' ? showLoader() : null"
+    >
+    {{ this.buttonText }}
+
+    <!-- Spinner for funnel Button -->
+    <div v-if="this.buttonType === 'btn-funnel' && this.isLoading" class="spinner-border spinner-border-sm text-success" role="status">
+      <span class="visually-hidden">Loading...</span>
+    </div>
+    
   </button>
 </template>
 
@@ -13,6 +21,16 @@ export default {
   props: {
     buttonText: String,
     buttonType: String
+  }, 
+  data(){
+    return {
+      isLoading: false
+    }
+  },
+  methods: {
+    showLoader(){
+      this.isLoading = true;
+    }
   }
 }
 </script>
diff --git a/src/store/index.js b/src/store/index.js
index 997c292d9..71122e2f0 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -14,7 +14,7 @@ export default createStore({
         year: '',
         make: '',
         model: '',
-        slideTransition: 'none'
+        slideTransition: 'fade'
     },
     mutations: {
         updateYear(state, data){