🚚 #99 move telemetry logic in javascript modules

Signed-off-by: JAGFx <[email protected]>
JAGFx · Feb 22, 2022 · cda5933 · cda5933
1 parent d6f0b12
commit cda5933
Show file tree

Hide file tree

Showing 32 changed files with 591 additions and 593 deletions.
diff --git a/public/index.html b/public/index.html
@@ -17,52 +17,5 @@
 			<strong>We're sorry, but the client doesn't work properly without JavaScript enabled. Please enable it to
 				continue.</strong>
 		</noscript>
-
 	</body>
-	<script>
-		/*$( function () {
-		 var noSleep = new NoSleep();
-
-		 $( 'html' ).on( 'click', '#overlay', function () {
-		 //console.log( 'Plop' );
-		 var elem = document.querySelector( 'html' );
-
-		 /!* View in fullscreen *!/
-		 function openFullscreen() {
-		 if ( elem.requestFullscreen ) {
-		 elem.requestFullscreen();
-		 } else if ( elem.mozRequestFullScreen ) { /!* Firefox *!/
-		 elem.mozRequestFullScreen();
-		 } else if ( elem.webkitRequestFullscreen ) { /!* Chrome, Safari and Opera *!/
-		 elem.webkitRequestFullscreen();
-		 } else if ( elem.msRequestFullscreen ) { /!* IE/Edge *!/
-		 elem.msRequestFullscreen();
-		 }
-
-		 noSleep.enable();
-		 }
-
-		 /!* Close fullscreen *!/
-		 function closeFullscreen() {
-		 if ( document.exitFullscreen ) {
-		 document.exitFullscreen();
-		 } else if ( document.mozCancelFullScreen ) { /!* Firefox *!/
-		 document.mozCancelFullScreen();
-		 } else if ( document.webkitExitFullscreen ) { /!* Chrome, Safari and Opera *!/
-		 document.webkitExitFullscreen();
-		 } else if ( document.msExitFullscreen ) { /!* IE/Edge *!/
-		 document.msExitFullscreen();
-		 }
-
-		 noSleep.disable();
-		 }
-
-		 if ( !document.webkitIsFullScreen ) {
-		 openFullscreen();
-		 } else {
-		 closeFullscreen();
-		 }
-		 } );
-		 } );*/
-	</script>
 </html>
diff --git a/src/App.vue b/src/App.vue
@@ -8,11 +8,11 @@
   >
     <HistoryOverlay />
     <Overlay />
-    <TelemetryEventOverlay v-if="appReady" />
-    <Header v-if="appReady" />
+    <TelemetryEventOverlay v-if="$telemetryDataIsEnough()" />
+    <Header v-if="$telemetryDataIsEnough()" />
     <component
       :is="currentSkinComponent()"
-      v-if="appReady"
+      v-if="$telemetryDataIsEnough()"
       v-show="!menuIsDisplayed"
     />
   </main>

diff --git a/src/components/dashboards/DafXFDashboard.vue b/src/components/dashboards/DafXFDashboard.vue
@@ -31,7 +31,7 @@
         />
         <div class="truck-speedRounded wrapper-area">
           <span>{{
-            unit_speed(telemetry.truck.speed, true, false) | $toFixed(0)
+            $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
           }}</span>
         </div>
         <Cadran
@@ -69,8 +69,10 @@
         />
         <div class="truck-odometer wrapper-area">
           <span>{{
-            unit_length(telemetry.truck.odometer, 'km', true, false)
-              | $toFixed(0)
+            $toFixed(
+              unit_length(telemetry.truck.odometer, 'km', true, false),
+              0
+            )
           }}</span>
         </div>
         <!--				<div class="truck-cruiseControlSpeedRounded wrapper-area"><span>{{ telemetry.truck.cruiseControl.kph }}</span></div>-->
@@ -111,7 +113,7 @@
         <div class="trailer-mass wrapper-area">
           <span>
             {{
-              unit_weight(telemetry.job.cargo.mass, true, false) | $toFixed(1)
+              $toFixed(unit_weight(telemetry.job.cargo.mass, true, false), 1)
             }}
             <span class="ton">{{
               unit_weight(telemetry.job.cargo.mass, false)
@@ -132,8 +134,11 @@
         />
         <div class="game-time wrapper-area">
           <span>{{
-            $gameTime()
-              | $dateTimeLocalized(DATE_FORMAT_SHORT, TIME_FORMAT_SHORT)
+            $dateTimeLocalized(
+              $gameTime(),
+              DATE_FORMAT_SHORT,
+              TIME_FORMAT_SHORT
+            )
           }}</span>
         </div>
       </div>

diff --git a/src/components/dashboards/DefaultDashboard.vue b/src/components/dashboards/DefaultDashboard.vue
@@ -31,7 +31,7 @@
         />
         <div class="truck-speedRounded wrapper-area">
           <span>{{
-            unit_speed(telemetry.truck.speed, true, false) | $toFixed(0)
+            $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
           }}</span>
         </div>
         <div class="truck-speedRounded-unit wrapper-area">
@@ -72,8 +72,10 @@
         />
         <div class="truck-odometer wrapper-area">
           <span>{{
-            unit_length(telemetry.truck.odometer, 'km', true, false)
-              | $toFixed(0)
+            $toFixed(
+              unit_length(telemetry.truck.odometer, 'km', true, false),
+              0
+            )
           }}</span>
         </div>
         <div class="truck-cruiseControlSpeedRounded wrapper-area">
@@ -114,7 +116,7 @@
           class="trailer-attached"
         />
         <div class="trailer-mass">
-          {{ unit_weight(telemetry.job.cargo.mass, true, false) | $toFixed(1)
+          {{ $toFixed(unit_weight(telemetry.job.cargo.mass, true, false), 1)
           }}<span class="ton">{{
             unit_weight(telemetry.job.cargo.mass, false)
           }}</span>
@@ -128,8 +130,11 @@
             <th>{{ $t('Time') }}:</th>
             <td>
               <span class="game-time">{{
-                $gameTime()
-                  | $dateTimeLocalized(DATE_FORMAT_LONG, TIME_FORMAT_SHORT)
+                $dateTimeLocalized(
+                  $gameTime(),
+                  DATE_FORMAT_LONG,
+                  TIME_FORMAT_SHORT
+                )
               }}</span>
             </td>
           </tr>

diff --git a/src/components/dashboards/ManTGXDashboard.vue b/src/components/dashboards/ManTGXDashboard.vue
@@ -31,7 +31,7 @@
         />
         <div class="truck-speedRounded wrapper-area">
           <span>{{
-            unit_speed(telemetry.truck.speed, true, false) | $toFixed(0)
+            $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
           }}</span>
         </div>
         <Cadran
@@ -91,8 +91,10 @@
         />
         <div class="truck-odometer wrapper-area">
           <span>{{
-            unit_length(telemetry.truck.odometer, 'km', true, false)
-              | $toFixed(0)
+            $toFixed(
+              unit_length(telemetry.truck.odometer, 'km', true, false),
+              0
+            )
           }}</span>
         </div>
         <!--				<div class="truck-cruiseControlSpeedRounded wrapper-area"><span>{{ telemetry.truck.cruiseControl.kph }}</span></div>-->
@@ -129,8 +131,7 @@
         <!--				<div :class="{'yes': trailer.attached}" class="trailer-attached"></div>-->
         <div class="trailer-mass wrapper-area">
           <span
-            >{{
-              unit_weight(telemetry.job.cargo.mass, true, false) | $toFixed(0)
+            >{{ $toFixed(unit_weight(telemetry.job.cargo.mass, true, false), 0)
             }}<span class="ton">{{
               unit_weight(telemetry.job.cargo.mass, false)
             }}</span></span
@@ -155,8 +156,11 @@
         </div>
         <div class="game-time wrapper-area">
           <span>{{
-            $gameTime()
-              | $dateTimeLocalized(DATE_FORMAT_SHORT, TIME_FORMAT_SHORT)
+            $dateTimeLocalized(
+              $gameTime(),
+              DATE_FORMAT_SHORT,
+              TIME_FORMAT_SHORT
+            )
           }}</span>
         </div>
         <div

diff --git a/src/components/dashboards/MercedesAtegoDashboard.vue b/src/components/dashboards/MercedesAtegoDashboard.vue
@@ -31,7 +31,7 @@
         />
         <div class="truck-speedRounded wrapper-area">
           <span>{{
-            unit_speed(telemetry.truck.speed, true, false) | $toFixed(0)
+            $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
           }}</span>
         </div>
         <Cadran
@@ -78,8 +78,10 @@
         />
         <div class="truck-odometer wrapper-area">
           <span>{{
-            unit_length(telemetry.truck.odometer, 'km', true, false)
-              | $toFixed(0)
+            $toFixed(
+              unit_length(telemetry.truck.odometer, 'km', true, false),
+              0
+            )
           }}</span>
         </div>
         <!--				<div class="truck-cruiseControlSpeedRounded wrapper-area"><span>{{ telemetry.truck.cruiseControl.kph }}</span></div>-->
@@ -115,7 +117,7 @@
           class="trailer-attached"
         />
         <!--				<div class="trailer-mass wrapper-area">-->
-        <!--					<span>{{ unit_weight( telemetry.job.cargo.mass, true, false ) | $toFixed( 1 ) }}<span class="ton">{{ unit_weight( telemetry.job.cargo.mass, false ) }}</span></span></div>-->
+        <!--					<span>{{ $toFixed(unit_weight( telemetry.job.cargo.mass, true, false ),  1 ) }}<span class="ton">{{ unit_weight( telemetry.job.cargo.mass, false ) }}</span></span></div>-->
         <!--				<div class="trailer-name">{{ telemetry.job.cargo.name }}</div>-->
         <div
           :class="{ yes: telemetry.truck.fuel.warning.enabled }"
@@ -138,8 +140,11 @@
         <!--				<div class="truck-batteryVoltage">{{ telemetry.truck.engine.batteryVoltage.warning.factor.toFixed(0) }}</div>-->
         <div class="game-time wrapper-area">
           <span>{{
-            $gameTime()
-              | $dateTimeLocalized(DATE_FORMAT_SHORT, TIME_FORMAT_SHORT)
+            $dateTimeLocalized(
+              $gameTime(),
+              DATE_FORMAT_SHORT,
+              TIME_FORMAT_SHORT
+            )
           }}</span>
         </div>
         <!--				<div :class="{ 'yes': telemetry.truck.brakes.airPressure.emergency.enabled }" class="truck-airPressureEmergencyOn"></div>-->

diff --git a/src/components/dashboards/RdInfoDashboard.vue b/src/components/dashboards/RdInfoDashboard.vue
@@ -27,7 +27,7 @@
           'minAngle' : -111,
           'maxAngle': 110,
         }"></Cadran>-->
-        <!--				<div class="truck-speedRounded wrapper-area"><span>{{ telemetry.truck.speed unit_speed( telemetry.truck.speed, true, false ) | $toFixed( 0 )  }}</span></div>-->
+        <!--				<div class="truck-speedRounded wrapper-area"><span>{{ $toFixed(telemetry.truck.speed unit_speed( telemetry.truck.speed, true, false ),  0 )  }}</span></div>-->
         <!--<Cadran v-bind="{
           'classCSS': 'truck-engineRpm',
           'type': 'meter',
@@ -117,8 +117,14 @@
         </div>
         <div class="truck-fuelAverageConsumption">
           {{
-            unit_consumption(telemetry.truck.fuel.avgConsumption, true, false)
-              | $toFixed(1)
+            $toFixed(
+              unit_consumption(
+                telemetry.truck.fuel.avgConsumption,
+                true,
+                false
+              ),
+              1
+            )
           }}
         </div>
         <div class="_fuelAvg">
@@ -163,12 +169,14 @@
         />
         <div class="navigation-speedLimit">
           {{
-            unit_speed(telemetry.navigation.speedLimit, true, false)
-              | $toFixed(0)
+            $toFixed(
+              unit_speed(telemetry.navigation.speedLimit, true, false),
+              0
+            )
           }}
         </div>
 
-        <!--				<div class="truck-odometer wrapper-area"><span>{{ unit_length( telemetry.truck.odometer, 'km', true, false ) | $toFixed( 0 ) }}</span></div>-->
+        <!--				<div class="truck-odometer wrapper-area"><span>{{ $toFixed(unit_length( telemetry.truck.odometer, 'km', true, false ),  0 ) }}</span></div>-->
         <!--				<div class="truck-cruiseControlSpeedRounded wrapper-area"><span>{{ telemetry.truck.cruiseControl.kph }}</span></div>-->
         <div class="truck-displayedGear wrapper-area">
           <span>{{
@@ -181,8 +189,11 @@
 
         <div class="job-remainingTime wrapper-area">
           <span v-if="$jobRemainingTimeToDueDate()">{{
-            telemetry.job.expectedDeliveryTimestamp.value
-              | $dateTimeLocalized(DATE_FORMAT_LONG, TIME_FORMAT_SHORT)
+            $dateTimeLocalized(
+              telemetry.job.expectedDeliveryTimestamp.value,
+              DATE_FORMAT_LONG,
+              TIME_FORMAT_SHORT
+            )
           }}</span>
           <span v-else>{{
             $jobRemainingTimeDelivery(telemetry.job.deliveryTime.unix)
@@ -207,7 +218,7 @@
 
         <!--				<div :class="{'yes': telemetry.trailer.attached}" class="trailer-attached"></div>-->
         <!--				<div class="trailer-mass wrapper-area">-->
-        <!--					<span>{{ unit_weight( telemetry.job.cargo.mass, true, false ) | $toFixed( 1 ) }}<span class="ton">{{ unit_weight( telemetry.job.cargo.mass, false ) }}</span></span></div>-->
+        <!--					<span>{{ $toFixed(unit_weight( telemetry.job.cargo.mass, true, false ),  1 ) }}<span class="ton">{{ unit_weight( telemetry.job.cargo.mass, false ) }}</span></span></div>-->
         <!--				<div class="trailer-name">{{ telemetry.job.cargo.name }}</div>-->
         <!--				<div :class="{ 'yes': telemetry.truck.fuel.warning.enabled }" class="truck-fuelWarningOn"></div>-->
         <!--				<div :class="{ 'yes': telemetry.truck.brakes.airPressure.warning.enabled }" class="truck-airPressureWarningOn"></div>-->

diff --git a/src/components/dashboards/TestDashboard.vue b/src/components/dashboards/TestDashboard.vue
@@ -2,7 +2,7 @@
   <Dashboard class="test wrapper">
     <div class="speed">
       <span class="value">{{
-        unit_speed(telemetry.truck.speed, true, false) | $toFixed(0)
+        $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
       }}</span>
       <small class="unit">{{ unit_speed(telemetry.truck.speed, false) }}</small>
     </div>

diff --git a/src/components/dashboards/VolvoFHDashboard.vue b/src/components/dashboards/VolvoFHDashboard.vue
@@ -31,7 +31,7 @@
         />
         <div class="truck-speedRounded wrapper-area">
           <span>{{
-            unit_speed(telemetry.truck.speed, true, false) | $toFixed(0)
+            $toFixed(unit_speed(telemetry.truck.speed, true, false), 0)
           }}</span>
         </div>
         <Cadran
@@ -74,8 +74,10 @@
         }"></Cadran>-->
         <div class="truck-odometer wrapper-area">
           <span>{{
-            unit_length(telemetry.truck.odometer, 'km', true, false)
-              | $toFixed(0)
+            $toFixed(
+              unit_length(telemetry.truck.odometer, 'km', true, false),
+              0
+            )
           }}</span>
         </div>
         <!--				<div class="truck-cruiseControlSpeedRounded wrapper-area"><span>{{ telemetry.truck.cruiseControl.kph }}</span></div>-->
@@ -115,8 +117,7 @@
         />
         <div class="trailer-mass wrapper-area">
           <span
-            >{{
-              unit_weight(telemetry.job.cargo.mass, true, false) | $toFixed(1)
+            >{{ $toFixed(unit_weight(telemetry.job.cargo.mass, true, false), 1)
             }}<span class="ton">{{
               unit_weight(telemetry.job.cargo.mass, false)
             }}</span></span
@@ -127,8 +128,11 @@
         </div>
         <div class="game-time wrapper-area">
           <span>{{
-            $gameTime()
-              | $dateTimeLocalized(DATE_FORMAT_SHORT, TIME_FORMAT_SHORT)
+            $dateTimeLocalized(
+              $gameTime(),
+              DATE_FORMAT_SHORT,
+              TIME_FORMAT_SHORT
+            )
           }}</span>
         </div>
         <div

diff --git a/src/components/dashboards/jagfx/Zone/JagfxJob.vue b/src/components/dashboards/jagfx/Zone/JagfxJob.vue
@@ -37,8 +37,11 @@
           <i class="icon-time" />
         </div>
         <span v-if="$hasJob() && $jobRemainingTimeToDueDate()">{{
-          jobDeliveryTime
-            | $dateTimeLocalized(DATE_FORMAT_LONG, TIME_FORMAT_SHORT)
+          $dateTimeLocalized(
+            $jobDeliveryTime(),
+            DATE_FORMAT_LONG,
+            TIME_FORMAT_SHORT
+          )
         }}</span>
         <span v-else-if="$hasJob() && !$jobRemainingTimeToDueDate()">{{
           $jobRemainingTimeDelivery(