♻️ change the throwing of event overlay data #35

JAGFx · Oct 17, 2020 · b388e75 · b388e75
1 parent 484a3ff
commit b388e75
Show file tree

Hide file tree

Showing 19 changed files with 232 additions and 150 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -132,15 +132,15 @@ export default {
       this.$updateTelemetry( { ...data } );
     },
     log( log ) {
-      const event = _event.filterInputEvent( log );
+      this.$updateEvent( log );
 
-      if ( event !== false ) {
-        //console.log( log );
-        this.$store.dispatch( 'events/emitEvent', {
-          eventName: event.eventName,
-          rawData:   event.rawData
-        } );
-      }
+      /*if ( event !== false ) {
+       //console.log( log );
+       this.$store.dispatch( 'events/emitEvent', {
+       eventName: event.eventName,
+       rawData:   event.rawData
+       } );
+       }*/
     }
   }
 };

diff --git a/src/components/Elements/EventOverlayElement.vue b/src/components/Elements/EventOverlayElement.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="event-overlay">
-    <b-overlay :show="isOnProcessing" :variant="'dark'" no-wrap>
+    <b-overlay :show="eventProcessing" :variant="'dark'" no-wrap>
       <template v-slot:overlay class="d-flex justify-content-around align-items-center flex-column">
         <component v-bind:is="currentRawDataComponent"></component>
       </template>
@@ -25,7 +25,7 @@ import EventOverlayTruckCruiseControlIncrease
                                 from '@/components/Elements/EventOverlayElement/EventOverlayTruckCruise-control-increase';
 import EventOverlayTruckDamage  from '@/components/Elements/EventOverlayElement/EventOverlayTruckDamage';
 import EventOverlayTruckWarning from '@/components/Elements/EventOverlayElement/EventOverlayTruckWarning';
-import { mapGetters }           from 'vuex';
+//import { mapGetters }           from 'vuex';
 import _event                   from '../../utils/_event';
 
 export default {
@@ -44,13 +44,13 @@ export default {
     EventOverlayTruckWarning,
     EventOverlayTruckDamage
   },
-  computed:   {
-    ...mapGetters( {
-      isOnProcessing: 'events/isOnProcessing',
-      event:          'events/event'
-    } ),
+  computed: {
+    //...mapGetters( {
+    //  isOnProcessing: 'events/isOnProcessing',
+    //  event:          'events/event'
+    //} ),
     currentRawDataComponent() {
-      const eventComponentName = _event.eventNameToComponent( this.event );
+      const eventComponentName = _event.eventNameToComponent( this.eventName );
 
       try {
         require( './EventOverlayElement/' + eventComponentName );

diff --git a/src/components/Elements/EventOverlayElement/EventOverlayBase.vue b/src/components/Elements/EventOverlayElement/EventOverlayBase.vue
@@ -1,36 +1,36 @@
 <template>
 	<div>
-		<div :class="event.replace('.', '-')" class="item d-flex justify-content-center align-items-center">
+    <div :class="eventName.replace('.', '-')" class="item d-flex justify-content-center align-items-center">
 					<span class="ico m-4 p-3 d-flex justify-content-center align-items-center">
-						<i :class="eventsText()[ event ].icon"></i>
+						<i :class="eventsText()[ eventName ].icon"></i>
 					</span>
-			<div class="event d-flex justify-content-between align-items-start flex-column">
-				<span class="title">{{ eventsText()[ event ].title }}</span>
-				<small class="sub-title font-italic">{{ eventsText()[ event ].subtitle }}</small>
-			</div>
-		</div>
+      <div class="event d-flex justify-content-between align-items-start flex-column">
+        <span class="title">{{ eventsText()[ eventName ].title }}</span>
+        <small class="sub-title font-italic">{{ eventsText()[ eventName ].subtitle }}</small>
+      </div>
+    </div>
     <slot></slot>
-	</div>
+  </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
+//import { mapGetters } from 'vuex';
 import eventsText     from '../../../data/events.json';
 
 export default {
-  name:     'EventOverlayBase',
-  methods:  {
+  name:    'EventOverlayBase',
+  methods: {
     eventsText() {
       //console.log( this.event, eventsText );
       return eventsText;
     }
-  },
-  computed: {
-    ...mapGetters( {
-      event: 'events/event'
-      } )
-    }
-  };
+  }
+  //computed: {
+  //...mapGetters( {
+  //  event: 'events/event'
+  //  } )
+  //}
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/components/Elements/EventOverlayElement/EventOverlayDefault.vue b/src/components/Elements/EventOverlayElement/EventOverlayDefault.vue
@@ -3,27 +3,27 @@
 </template>
 
 <script>
-import { mapGetters }   from 'vuex';
+//import { mapGetters }   from 'vuex';
 import eventsText       from '../../../data/events.json';
 import EventOverlayBase from './EventOverlayBase';
 
 export default {
-  name:         'EventOverlayDefault',
-  components:   {
+  name:       'EventOverlayDefault',
+  components: {
     EventOverlayBase
   },
-  methods:      {
+  methods:    {
     eventsText() {
       //console.log( this.event, eventsText );
       return eventsText;
     }
-  },
-    computed:   {
-      ...mapGetters( {
-        event: 'events/event'
-      } )
-    }
-  };
+  }
+  //computed:   {
+  //  ...mapGetters( {
+  //    event: 'events/event'
+  //  } )
+  //}
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/components/Elements/EventOverlayElement/EventOverlayGameFerry.vue b/src/components/Elements/EventOverlayElement/EventOverlayGameFerry.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { mapGetters }   from 'vuex';
+//import { mapGetters }   from 'vuex';
 import eventsText       from '../../../data/events.json';
 import EventOverlayBase from './EventOverlayBase';
 
@@ -32,14 +32,14 @@ export default {
     eventsText() {
       return eventsText;
     }
-  },
-		computed: {
-			...mapGetters( {
-				event:   'events/event',
-				rawData: 'events/rawData'
-			} )
-		}
-	};
+  }
+  //computed: {
+  //	...mapGetters( {
+  //		event:   'events/event',
+  //		rawData: 'events/rawData'
+  //	} )
+  //}
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/components/Elements/EventOverlayElement/EventOverlayGameFine.vue b/src/components/Elements/EventOverlayElement/EventOverlayGameFine.vue
@@ -3,15 +3,15 @@
     <hr class="m-0 mb-4">
     <div class="data d-flex justify-content-around align-items-center">
       <div class="item px-3 py-1 mx-1 d-flex justify-content-between align-items-center flex-column">
-        <span class="title">{{ rawData.fine.offence.name }}</span>
-        <span class="data">- {{ unit_currency( rawData.fine.amount ) }}</span>
+        <span class="title">{{ eventRawData.fine.offence.name }}</span>
+        <span class="data">- {{ unit_currency( eventRawData.fine.amount ) }}</span>
       </div>
     </div>
   </EventOverlayBase>
 </template>
 
 <script>
-import { mapGetters }   from 'vuex';
+//import { mapGetters }   from 'vuex';
 import eventsText       from '../../../data/events.json';
 import EventOverlayBase from './EventOverlayBase';
 
@@ -24,14 +24,14 @@ export default {
     eventsText() {
       return eventsText;
     }
-  },
-		computed: {
-			...mapGetters( {
-				event:   'events/event',
-				rawData: 'events/rawData'
-			} )
-		}
-	};
+  }
+  //computed: {
+  //	...mapGetters( {
+  //		event:   'events/event',
+  //		rawData: 'events/rawData'
+  //	} )
+  //}
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/components/Elements/EventOverlayElement/EventOverlayGameTollgate.vue b/src/components/Elements/EventOverlayElement/EventOverlayGameTollgate.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import { mapGetters }   from 'vuex';
+//import { mapGetters }   from 'vuex';
 import eventsText       from '../../../data/events.json';
 import EventOverlayBase from './EventOverlayBase';
 
@@ -21,14 +21,14 @@ export default {
     eventsText() {
       return eventsText;
     }
-  },
-		computed: {
-			...mapGetters( {
-				event:   'events/event',
-				rawData: 'events/rawData'
-			} )
-		}
-	};
+  }
+  //computed: {
+  //	...mapGetters( {
+  //		event:   'events/event',
+  //		rawData: 'events/rawData'
+  //	} )
+  //}
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/components/Elements/EventOverlayElement/EventOverlayGameTrain.vue b/src/components/Elements/EventOverlayElement/EventOverlayGameTrain.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { mapGetters }   from 'vuex';
+//import { mapGetters }   from 'vuex';
 import eventsText       from '../../../data/events.json';
 import EventOverlayBase from './EventOverlayBase';
 
@@ -32,14 +32,14 @@ export default {
     eventsText() {
       return eventsText;
     }
-  },
-		computed: {
-			...mapGetters( {
-				event:   'events/event',
-				rawData: 'events/rawData'
-			} )
-		}
-	};
+  }
+  //computed: {
+  //	...mapGetters( {
+  //		event:   'events/event',
+  //		rawData: 'events/rawData'
+  //	} )
+  //}
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/components/Elements/EventOverlayElement/EventOverlayJobDelivered.vue b/src/components/Elements/EventOverlayElement/EventOverlayJobDelivered.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import { mapGetters }   from 'vuex';
+//import { mapGetters }   from 'vuex';
 import eventsText       from '../../../data/events.json';
 import EventOverlayBase from './EventOverlayBase';
 
@@ -34,14 +34,14 @@ export default {
     eventsText() {
       return eventsText;
     }
-  },
-		computed: {
-			...mapGetters( {
-				event:   'events/event',
-				rawData: 'events/rawData'
-			} )
-		}
-	};
+  }
+  //computed: {
+  //	...mapGetters( {
+  //		event:   'events/event',
+  //		rawData: 'events/rawData'
+  //	} )
+  //}
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/components/Elements/EventOverlayElement/EventOverlayNavigationSpeed-limit.vue b/src/components/Elements/EventOverlayElement/EventOverlayNavigationSpeed-limit.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import { mapGetters }   from 'vuex';
+//import { mapGetters }   from 'vuex';
 import eventsText       from '../../../data/events.json';
 import EventOverlayBase from './EventOverlayBase';
 
@@ -24,14 +24,14 @@ export default {
     eventsText() {
       return eventsText;
     }
-  },
-		computed: {
-			...mapGetters( {
-				event:   'events/event',
-				rawData: 'events/rawData'
-			} )
-		}
-	};
+  }
+  //computed: {
+  //	...mapGetters( {
+  //		event:   'events/event',
+  //		rawData: 'events/rawData'
+  //	} )
+  //}
+};
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/components/Elements/EventOverlayElement/EventOverlayTrailersDamage.vue b/src/components/Elements/EventOverlayElement/EventOverlayTrailersDamage.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { mapGetters }   from 'vuex';
+//import { mapGetters }   from 'vuex';
 import eventsText       from '../../../data/events.json';
 import EventOverlayBase from './EventOverlayBase';
 
@@ -28,14 +28,14 @@ export default {
     eventsText() {
       return eventsText;
     }
-  },
-		computed: {
-			...mapGetters( {
-				event:   'events/event',
-				rawData: 'events/rawData'
-			} )
-		}
-	};
+  }
+  //computed: {
+  //	...mapGetters( {
+  //		event:   'events/event',
+  //		rawData: 'events/rawData'
+  //	} )
+  //}
+};
 </script>
 
 <style lang="scss" scoped>