Wydzielono status indicator do oddzielnego modułu

src/App.scss

@@ -18,19 +18,6 @@
   }
 }
 
-// INDICATOR TOOLTIP ANIMATION
-.tooltip-anim {
-  &-enter-from,
-  &-leave-to {
-    opacity: 0;
-  }
-
-  &-enter-active,
-  &-leave-active {
-    transition: all $animDuration $animType;
-  }
-}
-
 .route {
   margin: 0 0.2em;
 
@@ -99,91 +86,6 @@
 
 }
 
-.indicator {
-  &-wrapper {
-    position: absolute;
-    left: 50%;
-    bottom: 0;
-    transform: translateX(11.6em);
-    z-index: 100;
-
-  }
-
-  &-content {
-    display: flex;
-    position: relative;
-
-  }
-
-  &-svg {
-    width: 1.2em;
-  }
-
-  &-tooltip {
-    position: absolute;
-    top: 50%;
-    left: 100%;
-
-
-    transform: translateY(-50%);
-    padding: 0.5em;
-    margin-left: 1em;
-
-    background-color: #171717;
-    border-radius: 0.75em;
-
-    min-width: 13em;
-    text-align: center;
-    overflow: none;
-
-    font-size: 0.95em;
-
-    &::before {
-      position: absolute;
-      top: 50%;
-      left: 1px;
-
-      transform: translate(-100%, -50%);
-
-      width: 0; 
-      height: 0; 
-      
-      border-top: 10px solid transparent;
-      border-bottom: 10px solid transparent; 
-      border-right: 12px solid #171717;
-
-      content: '';
-    }
-
-    @include midScreen() {
-      left: 50%;
-      top: 100%;
-
-      transform: translate(-50%, 0);
-      margin-left: 0;
-      margin-top: 0.75em;
-
-      &::before {
-        border-left: 10px solid transparent;
-        border-right: 10px solid transparent;
-        border-bottom: 10px solid #171717;
-
-        top: 0;
-        left: 50%;
-
-        transform: translate(-50%, -100%);
-      }
-    }
-
-    @include smallScreen() {
-      min-width: 8em;  
-    }
-
-
-  }
-}
-
-
 .header {
   &_brand {
     position: relative;

src/App.vue

@@ -8,28 +8,8 @@
       </div> -->
       <header class="app_header">
         <div class="header_body">
-          <div class="indicator-wrapper">
+          <status-indicator :dataStatus="dataStatus" />
-            <div class="indicator-content">
-              <object
-                class="indicator-svg"
-                type="image/svg+xml"
-                :data="icons.statusIndicator"
-                ref="status-indicator"
-                @mouseenter="() => tooltipActive = true"
-                @mouseleave="() => tooltipActive = false"
-              ></object>
 
-              <transition name="tooltip-anim">
-                <div class="indicator-tooltip" v-if="tooltipActive">
-                  <b>{{ indicator.status <= 0 ? 'S3' : indicator.status == 1 ? 'S1a' : indicator.status == 2 ? 'S2' : 'S5' }}</b>
-                  <br>
-                  {{ indicator.message }}
-                </div>
-              </transition>
-            </div>
-          </div>
-
-          <!-- <object class="signal-status-indicator" :src="icons.statusIndicator" alt="status-icon" ref="status-indicator"></object> -->
           <span class="header_brand">
             <span>
               <span>S</span>
@@ -111,17 +91,18 @@
 import Clock from '@/components/App/Clock.vue';
 
 import StorageManager from '@/scripts/managers/storageManager';
-import { computed, ComputedRef, defineComponent, provide, ref, watch } from 'vue';
+import { computed, ComputedRef, defineComponent, provide, ref } from 'vue';
 import { GETTERS } from './constants/storeConstants';
 import { StoreData } from './scripts/interfaces/StoreData';
 import { useStore } from './store';
 
 import packageInfo from '.././package.json';
-import { DataStatus } from './scripts/enums/DataStatus';
+import StatusIndicator from './components/App/StatusIndicator.vue';
 
 export default defineComponent({
   components: {
     Clock,
+    StatusIndicator,
   },
 
   setup() {
@@ -163,86 +144,18 @@ export default defineComponent({
     currentLang: 'pl',
 
     icons: {
-      statusIndicator: require('@/assets/signal-status-indicator.svg'),
       en: require('@/assets/icon-en.jpg'),
       pl: require('@/assets/icon-pl.svg'),
       error: require('@/assets/icon-error.svg'),
     },
 
-    indicator: {
-      status: DataStatus.Loading,
-      message: "Ładowanie danych..."
-    },
 
-    tooltipActive: false
   }),
 
   created() {
     this.loadLang();
   },
 
-  watch: {
-    dataStatus(storeData: StoreData) {
-      // if(val == DataStatus.Loaded)
-      //   this.setSignalStatus(DataStatus.Loaded)
-      
-      const dataConnectionStatus = storeData.dataConnectionStatus;
-      const sceneryDataStatus = storeData.sceneryDataStatus;
-      const trainsDataStatus = storeData.trainsDataStatus;
-      const dispatcherDataStatus = storeData.dispatcherDataStatus;
-      const timetableDataStatus = storeData.timetableDataStatus;
-
-      if (dataConnectionStatus == DataStatus.Error) {
-        this.indicator.status = DataStatus.Error;
-        this.indicator.message = "Błąd podczas łączenia z serwisem SWDR!";
-        this.setSignalStatus(DataStatus.Error);
-        return;
-      }
-
-      if (sceneryDataStatus == DataStatus.Error) {
-        this.indicator.status = DataStatus.Error;
-        this.indicator.message = "Nie można pobrać danych o sceneriach!";
-        this.setSignalStatus(DataStatus.Error);
-        return;
-      } 
-
-      if (timetableDataStatus == DataStatus.Warning) {
-        this.indicator.status = DataStatus.Warning;
-        this.indicator.message = "Rozkłady jazdy mogą być niekompletne!";
-        this.setSignalStatus(DataStatus.Warning);
-        return;
-      } 
-
-      if (trainsDataStatus == DataStatus.Warning) {
-        this.indicator.status = DataStatus.Warning;
-        this.indicator.message = "Nie można pobrać danych o pociągach!";
-        this.setSignalStatus(DataStatus.Warning);
-        return;
-      } 
-
-      if (dispatcherDataStatus == DataStatus.Warning) {
-        this.indicator.status = DataStatus.Warning;
-        this.indicator.message = "Nie można pobrać danych o statusach dyżurnych ruchu!";
-        this.setSignalStatus(DataStatus.Warning);
-        return;
-      } 
-
-      this.indicator.status = DataStatus.Loaded;
-      this.indicator.message = "Dane załadowane poprawnie!";
-
-      this.setSignalStatus(DataStatus.Loaded);
-    },
-
-    sceneryDataStatus(val: DataStatus) {
-      if (val == DataStatus.Error) this.setSignalStatus(DataStatus.Error);
-    },
-
-    dispatcherDataStatus(val: DataStatus) {
-      if (val == DataStatus.Warning && this.sceneryDataStatus != DataStatus.Error)
-        this.setSignalStatus(DataStatus.Warning);
-    },
-  },
-
   async mounted() {
     if (StorageManager.getStringValue('version') != this.VERSION) {
       StorageManager.setStringValue('version', this.VERSION);
@@ -253,12 +166,6 @@ export default defineComponent({
     this.updateModalVisible = this.hasReleaseNotes && !StorageManager.getBooleanValue('version_notes_read');
 
     this.updateToNewestVersion();
-
-    const obj = this.$refs['status-indicator'] as HTMLObjectElement;
-
-    // obj.addEventListener('load', () => {
-    //   this.setSignalStatus(DataStatus.Loading);
-    // });
   },
 
   methods: {
@@ -267,49 +174,6 @@ export default defineComponent({
       StorageManager.setBooleanValue('version_notes_read', true);
     },
 
-    setSignalStatus(status: DataStatus) {
-      const obj = this.$refs['status-indicator'] as HTMLObjectElement;
-
-      const green = obj.contentDocument?.querySelector('#green') as SVGElement;
-      const greenBlink = obj.contentDocument?.querySelector('#green-blink') as SVGElement;
-      const redTop = obj.contentDocument?.querySelector('#red-top') as SVGElement;
-      const orange = obj.contentDocument?.querySelector('#orange') as SVGElement;
-      const redBottom = obj.contentDocument?.querySelector('#red-bottom') as SVGElement;
-
-      if(!green || !greenBlink || !redTop || !orange || !redBottom) return;
-
-      if (status == DataStatus.Loaded) {
-        green.style.visibility = 'visible';
-        greenBlink.style.visibility = 'hidden';
-        redTop.style.visibility = 'hidden';
-        orange.style.visibility = 'hidden';
-        redBottom.style.visibility = 'hidden';
-      }
-
-      if (status == DataStatus.Warning) {
-        green.style.visibility = 'hidden';
-        greenBlink.style.visibility = 'hidden';
-        redTop.style.visibility = 'hidden';
-        orange.style.visibility = 'visible';
-        redBottom.style.visibility = 'hidden';
-      }
-
-      if (status == DataStatus.Error) {
-        green.style.visibility = 'hidden';
-        greenBlink.style.visibility = 'hidden';
-        redTop.style.visibility = 'visible';
-        orange.style.visibility = 'hidden';
-        redBottom.style.visibility = 'visible';
-      }
-
-      if (status == DataStatus.Loading) {
-        green.style.visibility = 'hidden';
-        greenBlink.style.visibility = 'visible';
-        redTop.style.visibility = 'hidden';
-        orange.style.visibility = 'hidden';
-        redBottom.style.visibility = 'hidden';
-      }
-    },
   
     changeLang(lang: string) {
       this.$i18n.locale = lang;

src/components/App/StatusIndicator.vue

@@ -0,0 +1,386 @@
+<template>
+  <div class="status-indicator">
+    <div class="indicator-content">
+      <svg
+        width="31"
+        height="90"
+        viewBox="0 0 31 100"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+        class="indicator-svg"
+        @mouseenter="() => (tooltipActive = true)"
+        @mouseleave="() => (tooltipActive = false)"
+      >
+        <g id="status-signal-icon">
+          <path
+            id="Vector 26"
+            d="M4.5 83V99L14 110.5"
+            stroke="#171616"
+            stroke-width="2"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+          />
+          <path
+            id="Vector 27"
+            d="M18.5 89.5L27.5 89.5L27.5 81.5"
+            stroke="#171616"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+          />
+          <rect id="Rectangle 13" x="11" y="83" width="8" height="49" fill="#CACACA" />
+          <rect id="Rectangle 12" width="31" height="90" rx="15.5" fill="#171616" />
+          <rect id="Rectangle 25" x="7" y="88" width="16" height="9.6" fill="white" />
+          <g id="Group 46">
+            <circle id="Ellipse 13" cx="15" cy="74" r="7" fill="#393838" />
+            <circle id="Ellipse 16" cx="15" cy="55" r="7" fill="#393838" />
+            <circle id="Ellipse 17" cx="15" cy="36" r="7" fill="#393838" />
+            <circle id="Ellipse 18" cx="15" cy="17" r="7" fill="#393838" />
+          </g>
+
+          <g v-if="greenLight" filter="url(#filter0_d_843_28)">
+            <circle cx="15" cy="17" r="7" fill="#00FF0A" />
+          </g>
+
+          <g v-if="greenBlinkLight" filter="url(#filter0_d_843_28)">
+            <circle cx="15" cy="17" r="7" fill="#00FF0A" />
+
+            <animate attributeType="XML" attributeName="opacity" values="1;0;1" dur="1s" repeatCount="indefinite" />
+          </g>
+
+          <g v-if="redTopLight" filter="url(#filter1_d_843_28)">
+            <circle cx="15" cy="36" r="7" fill="#F40000" />
+          </g>
+
+          <g v-if="orangeLight" filter="url(#filter2_d_843_28)">
+            <circle cx="15" cy="55" r="7" fill="#FFB800" />
+          </g>
+          <g v-if="redBottomLight" filter="url(#filter3_d_843_28)">
+            <circle cx="15" cy="74" r="7" fill="#F40000" />
+
+            <animate attributeType="XML" attributeName="opacity" values="1;0;1" dur="1s" repeatCount="indefinite" />
+          </g>
+        </g>
+
+        <defs>
+          <filter
+            id="filter0_d_843_28"
+            x="3"
+            y="5"
+            width="24"
+            height="24"
+            filterUnits="userSpaceOnUse"
+            color-interpolation-filters="sRGB"
+          >
+            <feFlood flood-opacity="0" result="BackgroundImageFix" />
+            <feColorMatrix
+              in="SourceAlpha"
+              type="matrix"
+              values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+              result="hardAlpha"
+            />
+            <feOffset />
+            <feGaussianBlur stdDeviation="2.5" />
+            <feComposite in2="hardAlpha" operator="out" />
+            <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 1 0 0 0 0 0.04 0 0 0 1 0" />
+            <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_843_28" />
+            <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_843_28" result="shape" />
+          </filter>
+          <filter
+            id="filter1_d_843_28"
+            x="3"
+            y="24"
+            width="24"
+            height="24"
+            filterUnits="userSpaceOnUse"
+            color-interpolation-filters="sRGB"
+          >
+            <feFlood flood-opacity="0" result="BackgroundImageFix" />
+            <feColorMatrix
+              in="SourceAlpha"
+              type="matrix"
+              values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+              result="hardAlpha"
+            />
+            <feOffset />
+            <feGaussianBlur stdDeviation="2.5" />
+            <feColorMatrix type="matrix" values="0 0 0 0 0.770833 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0" />
+            <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_843_28" />
+            <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_843_28" result="shape" />
+          </filter>
+          <filter
+            id="filter2_d_843_28"
+            x="3"
+            y="43"
+            width="24"
+            height="24"
+            filterUnits="userSpaceOnUse"
+            color-interpolation-filters="sRGB"
+          >
+            <feFlood flood-opacity="0" result="BackgroundImageFix" />
+            <feColorMatrix
+              in="SourceAlpha"
+              type="matrix"
+              values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+              result="hardAlpha"
+            />
+            <feOffset />
+            <feGaussianBlur stdDeviation="2.5" />
+            <feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.72 0 0 0 0 0 0 0 0 1 0" />
+            <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_843_28" />
+            <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_843_28" result="shape" />
+          </filter>
+          <filter
+            id="filter3_d_843_28"
+            x="3"
+            y="62"
+            width="24"
+            height="24"
+            filterUnits="userSpaceOnUse"
+            color-interpolation-filters="sRGB"
+          >
+            <feFlood flood-opacity="0" result="BackgroundImageFix" />
+            <feColorMatrix
+              in="SourceAlpha"
+              type="matrix"
+              values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+              result="hardAlpha"
+            />
+            <feOffset />
+            <feGaussianBlur stdDeviation="2.5" />
+            <feColorMatrix type="matrix" values="0 0 0 0 0.770833 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0" />
+            <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_843_28" />
+            <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_843_28" result="shape" />
+          </filter>
+        </defs>
+      </svg>
+      <!-- 
+        <object
+          class="indicator-svg"
+          type="image/svg+xml"
+          :data="icons.statusIndicator"
+          ref="status-indicator"
+          @mouseenter="() => (tooltipActive = true)"
+          @mouseleave="() => (tooltipActive = false)"
+        ></object> -->
+
+      <transition name="tooltip-anim">
+        <div class="indicator-tooltip" v-if="tooltipActive">
+          <b>{{
+            indicator.status <= 0 ? 'S3' : indicator.status == 1 ? 'S1a' : indicator.status == 2 ? 'S2' : 'S5'
+          }}</b>
+          <br />
+          {{ indicator.message }}
+        </div>
+      </transition>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { DataStatus } from '@/scripts/enums/DataStatus';
+import { StoreData } from '@/scripts/interfaces/StoreData';
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+  props: ['dataStatus'],
+
+  data() {
+    return {
+      icons: {
+        statusIndicator: require('@/assets/signal-status-indicator.svg'),
+      },
+      tooltipActive: false,
+      indicator: {
+        status: DataStatus.Loading,
+        message: 'Ładowanie danych...',
+      },
+
+      greenLight: false,
+      greenBlinkLight: false,
+      redTopLight: false,
+      orangeLight: false,
+      redBottomLight: false,
+    };
+  },
+
+  mounted() {
+    this.setSignalStatus(DataStatus.Loading);
+  },
+
+  watch: {
+    dataStatus(storeData: StoreData) {
+      // if(val == DataStatus.Loaded)
+      //   this.setSignalStatus(DataStatus.Loaded)
+
+      const dataConnectionStatus = storeData.dataConnectionStatus;
+      const sceneryDataStatus = storeData.sceneryDataStatus;
+      const trainsDataStatus = storeData.trainsDataStatus;
+      const dispatcherDataStatus = storeData.dispatcherDataStatus;
+      const timetableDataStatus = storeData.timetableDataStatus;
+
+      if (dataConnectionStatus == DataStatus.Error) {
+        this.indicator.status = DataStatus.Error;
+        this.indicator.message = 'Błąd podczas łączenia z serwisem SWDR!';
+        this.setSignalStatus(DataStatus.Error);
+        return;
+      }
+
+      if (sceneryDataStatus == DataStatus.Error) {
+        this.indicator.status = DataStatus.Error;
+        this.indicator.message = 'Nie można pobrać danych o sceneriach!';
+        this.setSignalStatus(DataStatus.Error);
+        return;
+      }
+
+      if (trainsDataStatus == DataStatus.Warning) {
+        this.indicator.status = DataStatus.Warning;
+        this.indicator.message = 'Nie można pobrać danych o pociągach!';
+        this.setSignalStatus(DataStatus.Warning);
+        return;
+      }
+
+      if (dispatcherDataStatus == DataStatus.Warning) {
+        this.indicator.status = DataStatus.Warning;
+        this.indicator.message = 'Nie można pobrać danych o statusach dyżurnych ruchu!';
+        this.setSignalStatus(DataStatus.Warning);
+        return;
+      }
+
+      if (timetableDataStatus == DataStatus.Warning) {
+        this.indicator.status = DataStatus.Warning;
+        this.indicator.message = 'Rozkłady jazdy mogą być niekompletne!';
+        this.setSignalStatus(DataStatus.Warning);
+        return;
+      }
+
+      this.indicator.status = DataStatus.Loaded;
+      this.indicator.message = 'Dane załadowane poprawnie!';
+
+      this.setSignalStatus(DataStatus.Loaded);
+    },
+  },
+
+  methods: {
+    setSignalStatus(status: DataStatus) {
+      this.greenLight = false;
+      this.greenBlinkLight = false;
+      this.redTopLight = false;
+      this.orangeLight = false;
+      this.redBottomLight = false;
+
+      if (status == DataStatus.Loaded) {
+        this.greenLight = true;
+      }
+
+      if (status == DataStatus.Warning) {
+        this.orangeLight = true;
+      }
+
+      if (status == DataStatus.Error) {
+        this.redTopLight = true;
+        this.redBottomLight = true;
+      }
+
+      if (status == DataStatus.Loading) {
+        this.greenBlinkLight = true;
+      }
+    },
+  },
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/responsive.scss';
+
+// INDICATOR TOOLTIP ANIMATION
+.tooltip-anim {
+  &-enter-from,
+  &-leave-to {
+    opacity: 0;
+  }
+
+  &-enter-active,
+  &-leave-active {
+    transition: all 100ms ease-in-out;
+  }
+}
+
+.status-indicator {
+  position: absolute;
+  left: 50%;
+  bottom: 0;
+  transform: translateX(11.6em);
+  z-index: 100;
+}
+
+.indicator {
+  &-content {
+    display: flex;
+    position: relative;
+  }
+
+  &-svg {
+    width: 1.2em;
+  }
+
+  &-tooltip {
+    position: absolute;
+    top: 50%;
+    left: 100%;
+
+    transform: translateY(-50%);
+    padding: 0.5em;
+    margin-left: 1em;
+
+    background-color: #171717;
+    border-radius: 0.75em;
+
+    min-width: 13em;
+    text-align: center;
+    overflow: none;
+
+    font-size: 0.95em;
+
+    &::before {
+      position: absolute;
+      top: 50%;
+      left: 1px;
+
+      transform: translate(-100%, -50%);
+
+      width: 0;
+      height: 0;
+
+      border-top: 10px solid transparent;
+      border-bottom: 10px solid transparent;
+      border-right: 12px solid #171717;
+
+      content: '';
+    }
+
+    @include midScreen() {
+      left: 50%;
+      top: 100%;
+
+      transform: translate(-50%, 0);
+      margin-left: 0;
+      margin-top: 0.75em;
+
+      &::before {
+        border-left: 10px solid transparent;
+        border-right: 10px solid transparent;
+        border-bottom: 10px solid #171717;
+
+        top: 0;
+        left: 50%;
+
+        transform: translate(-50%, -100%);
+      }
+    }
+
+    @include smallScreen() {
+      min-width: 8em;
+    }
+  }
+}
+</style>