Merge wersji 0.3.0 alpha

Wersja 0.3.0 alpha

.firebase/hosting.ZGlzdA.cache

@@ -0,0 +1,31 @@
+android-icon-144x144.png,1658609936712,aede59be6881a13db2df2635cc1e7b258a39f5ab107713fadaf3eebec62d4110
+android-icon-36x36.png,1658609936631,2c7bfa33d306a96824a570be7bf125dc71a9a47675a3b6796957d52f325b41e1
+android-icon-192x192.png,1658609936732,9638f0d6d0dfe1fab2fb6f2dd132626d44010adbf7c06aad3b1244a1e3cfe906
+android-icon-48x48.png,1658609936652,8819d530581ce67a5b4dd77cbb7444a3cb30e358af1af37ad82cfa36c08b5ebd
+android-icon-72x72.png,1658609936672,041b7fbd037073a949111199dd62a417249e50b3b5d2ced8eb6825c223498d30
+android-icon-96x96.png,1658609936692,1d815184449fa432867480fe8422e3da660e53ae05132173a49d7f50cdc436ad
+apple-icon-120x120.png,1658609936854,67b1201208ff3fb541590d7a29da605c9fe8a2a8b3c36879603c13a9bbfad162
+apple-icon-144x144.png,1658609936874,aede59be6881a13db2df2635cc1e7b258a39f5ab107713fadaf3eebec62d4110
+apple-icon-114x114.png,1658609936834,cc38f2ff66144e1f036f3bd08b675ad05f53feed4d663e81f9814d605636cbd3
+apple-icon-152x152.png,1658609936896,46ae5f5f9df50c4c25370a3d2f0d42a92fd9f1361589417dd0fe71a7eee4dc60
+apple-icon-180x180.png,1658609936917,8692818f09315e37c1ba6f1009cd1a1be16f4cbb163947e08d326e80e7ff1504
+apple-icon-57x57.png,1658609936753,9c0134415ddca313dea44cae62bb3bba802b27a4b4d1bd68c7dbe756eb9e9fe9
+apple-icon-60x60.png,1658609936773,c518fdccbc238cfbb6392aac34a99e2d3deb88291e30b8bf2734717ba011fb26
+apple-icon-72x72.png,1658609936794,041b7fbd037073a949111199dd62a417249e50b3b5d2ced8eb6825c223498d30
+apple-icon-76x76.png,1658609936814,9a5af3b668ef19b654a0dc8810c3c21c55ea764c503f7799099937baf458412a
+apple-icon-precomposed.png,1658609936938,ef8b2aa4473012f6cbf0eab9aff385a16dcfab72bb340b8b0f34075bf8454dc1
+apple-icon.png,1658609936960,ef8b2aa4473012f6cbf0eab9aff385a16dcfab72bb340b8b0f34075bf8454dc1
+browserconfig.xml,1658609936584,cd6445d8fe791d1cae6328c3eee28a97d3e7e1bf501c62d8f2108f5087e7d730
+favicon-16x16.png,1658609937063,901b523b550a6b6c06fdaab794312df23540a73aa21f8362adeb3612b977ad7b
+favicon-32x32.png,1658609937085,dc28bc1572c28dc3ac9aa81d38e1ec60d493519e7d62ebdb51e46d2373f66991
+favicon.ico,1658609936555,430715a10935493850fedc5c8d16aef816fa97a16fdaca89f0ec0c4eefe28a78
+favicon-96x96.png,1658609937106,1d815184449fa432867480fe8422e3da660e53ae05132173a49d7f50cdc436ad
+index.html,1666364202599,8853620e894b9344fda372d5e86c903dc6ba1f1477a46d8fe99adf16cefd72a1
+manifest.json,1658609936611,46e7f5e409f1e10cb0007bcdd51eb6031ff1bd4a61d07513a4d2b80f6cc5381f
+ms-icon-144x144.png,1658609937000,aede59be6881a13db2df2635cc1e7b258a39f5ab107713fadaf3eebec62d4110
+ms-icon-70x70.png,1658609936980,e61ef4f24726f3f017de2ece28c2701413764d02310881d0d99642d18582a14a
+ms-icon-150x150.png,1658609937021,e2c169c428949765d1e695b05a48f4b982ae2fa3068e426ed41447eba0e19234
+assets/icon-save.5a12487e.svg,1666364202599,5c75b0d4e35cdaf019c7292f7fd98c2e60466ae6f8b30d49b96cf2380c08299c
+assets/index.4785c605.css,1666364202599,54d582b36380fcf2b8d5342f2d6831c8b7b5490e490c512f27216e6507b9053d
+ms-icon-310x310.png,1658609937042,9680db857d251ecdb422aa8c1cc186ffe67e74c2b6655067e7d7fc2e324476c3
+assets/index.d0f8d15f.js,1666364202599,788b8e9fab4a1047223de761bb2167000a04c101d9d464ef4ed0cb5fe5667950

package.json

@@ -1,22 +1,23 @@
 {
   "name": "genera-tor",
-  "version": "0.2.0a",
+  "version": "0.3.0a",
   "private": true,
   "scripts": {
     "dev": "vite --port 8080",
+    "deploy": "yarn build && firebase deploy --only hosting",
     "build": "vue-tsc --noEmit && vite build",
     "preview": "vite preview"
   },
   "dependencies": {
     "pinia": "^2.0.14",
     "vue": "^3.2.37",
-    "vue-router": "^4.0.0-0"
+    "vue-router": "^4.0.0-0",
+    "vue-tsc": "^1.0.8"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^3.0.0",
     "sass": "^1.53.0",
     "typescript": "^4.7.4",
-    "vite": "^3.0.0",
+    "vite": "^3.0.0"
-    "vue-tsc": "^0.38.4"
   }
 }

src/components/Order.vue

@@ -19,6 +19,12 @@ import OrderSVue from './OrderS.vue';
 import OrderFooter from './OrderFooter.vue';
 import OrderOVue from './OrderO.vue';
 
+const orderComponents = {
+  orderN: OrderNVue,
+  orderS: OrderSVue,
+  orderO: OrderOVue,
+};
+
 export default defineComponent({
   components: { OrderNVue, OrderSVue, OrderFooter },
 
@@ -32,16 +38,7 @@ export default defineComponent({
 
   computed: {
     chosenOrderComponent() {
-      switch (this.store.chosenOrderType) {
+      return orderComponents[this.store.chosenOrderType];
-        case 'orderN':
-          return OrderNVue;
-        case 'orderS':
-          return OrderSVue;
-        case 'orderO':
-          return OrderOVue;
-        default:
-          return OrderNVue;
-      }
     },
   },
 });
@@ -68,12 +65,11 @@ export default defineComponent({
 }
 
 .order {
-  max-width: 550px;
   background-color: white;
   color: black;
 
   max-height: 95vh;
-  overflow-y: auto;
+  overflow: auto;
 
   font-size: 15px;
 
@@ -121,6 +117,19 @@ input {
   font-size: 0.9em;
   text-align: center;
   color: black;
+
+  &:focus-visible {
+    border-bottom: 2px solid $accentCol;
+  }
+}
+
+input[type='checkbox'],
+input[type='radio'],
+textarea,
+select {
+  &:focus-visible {
+    outline: 2px solid $accentCol;
+  }
 }
 
 select {
@@ -169,3 +178,4 @@ select {
   }
 }
 </style>
+

src/components/OrderHelper.vue

@@ -0,0 +1,53 @@
+<template>
+  <div class="order-helper g-modal">
+    <div class="modal-bg" @click="store.helperModalOpen = false"></div>
+
+    <div class="content modal-content">
+      <h2>Rozkazy pisemne - zastosowania w TD2</h2>
+
+      <hr />
+      <b>Rozkaz pisemny "S" (dot. semaforów)</b>
+      <p>Rozkaz pisemny "S" jest stosowany w następujących sytuacjach:</p>
+
+      <ul>
+        <li v-for="data in orderHelperData.orderS">{{ data }}</li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useStore } from '../store/store';
+import orderHelperData from '../data/orderHelperData.json';
+
+export default defineComponent({
+  setup() {
+    return {
+      store: useStore(),
+      orderHelperData,
+    };
+  },
+});
+</script>
+
+<style lang="scss" scoped>
+.content {
+  width: 100%;
+  max-width: 800px;
+
+  height: 100vh;
+  max-height: 800px;
+
+  margin: 1em;
+  padding: 1em;
+  background-color: #2b2b2b;
+
+  text-align: center;
+}
+
+ul {
+  text-align: left;
+  list-style: inside;
+}
+</style>

src/components/OrderList.vue

@@ -3,7 +3,10 @@
     <h3>Zapisane rozkazy pisemne ({{ localOrderList.length }})</h3>
 
     <transition-group name="list" tag="ul">
-      <li v-for="order in sortedOrderList" :key="order.id">
+      <li class="no-orders-warning" v-if="sortedOrderList.length == 0" :key="-1">Brak zapisanych rozkazów!</li>
+
+      <li v-for="(order, i) in sortedOrderList" :key="order.id">
+        <b class="text--accent">#{{ sortedOrderList.length - i }}&nbsp;</b>
         <b>
           {{ getOrderName(order.orderType) }} nr {{ order.orderBody['header']['orderNo'] }} dla pociągu nr
           {{ order.orderBody['header']['trainNo'] }}
@@ -38,6 +41,7 @@ export default defineComponent({
   setup() {
     return {
       store: useStore(),
+      localStorage: window.localStorage,
     };
   },
 
@@ -84,12 +88,12 @@ export default defineComponent({
   &-move,
   &-enter-active,
   &-leave-active {
-    transition: all 0.5s ease;
+    transition: all 250ms ease;
   }
   &-enter-from,
   &-leave-to {
     opacity: 0;
-    transform: translateX(30px);
+    transform: translateY(30px);
   }
 
   &-leave-active {
@@ -126,5 +130,12 @@ li {
   button {
     margin: 1em 1em 0 0;
   }
+
+  &.no-orders-warning {
+    text-align: center;
+    font-size: 1.2em;
+    cursor: default;
+  }
 }
 </style>
+

src/components/OrderMessage.vue

@@ -3,6 +3,7 @@
     <h3>Wiadomość do wyświetlenia na czacie symulatora:</h3>
 
     <div class="message_body" v-html="fullOrderMessage"></div>
+    <p class="message_info">Po wygenerowaniu rozkazu skopiuj jego treść lub zapisz w pamięci przeglądarki za pomocą przycisków poniżej</p>
 
     <div class="message_actions">
       <button class="g-button action" @click="saveOrder">Zapisz nowy rozkaz</button>
@@ -158,6 +159,11 @@ export default defineComponent({
   -webkit-user-select: none;
 }
 
+.message_info {
+  text-align: center;
+  color: #ccc;
+}
+
 .message_actions {
   display: flex;
   align-items: center;

src/components/OrderN.vue

@@ -36,7 +36,7 @@
             <td>
               <strong>ZEZWALAM</strong> po otrzymaniu
               <select id="select-2a" v-model="order.row2.option1">
-                <option value='sygnału "Nakaz Jazdy"'>sygnału "Nakaz Jazdy"</option>
+                <option :value="`sygnału &quot;Nakaz Jazdy&quot;`">sygnału "Nakaz Jazdy"</option>
                 <option value="tylko tego rozkazu pisemnego">tylko tego rozkazu pisemnego</option>
               </select>
               <div style="margin-top: 0.5rem">

src/components/OrderS.vue

@@ -28,7 +28,7 @@
             <td>
               zezwalam po otrzymaniu
               <select id="select-1a" v-model="order.row1.option1">
-                <option value='sygnału "nakaz jazdy"'>sygnału "nakaz jazdy"</option>
+                <option :value="`sygnału &quot;nakaz jazdy&quot;`">sygnału "nakaz jazdy"</option>
                 <option value="tylko tego rozkazu pisemnego">tylko tego rozkazu pisemnego</option>
               </select>
               <div style="margin-top: 0.5rem">

src/components/SideBar.vue

@@ -5,6 +5,8 @@
         <img :src="saveIcon" alt="save icon" />
       </button> -->
 
+      <!-- <button @click="store.helperModalOpen = true">?</button> -->
+
       <button
         v-for="orderType in orderTypeList"
         :key="orderType.id"
@@ -114,6 +116,10 @@ export default defineComponent({
     &:hover {
       cursor: pointer;
     }
+
+    &:focus-visible {
+      background-color: #6d6d6d73;
+    }
   }
 }
 

src/data/orderHelperData.json

@@ -0,0 +1,15 @@
+{
+  "orderS": [
+    "zezwolenie na przejechanie obok semafora wyjazdowego, wskazującego sygnał „Stój”, sygnał wątpliwy, białe światło bądź nieoświetlonego, o ile nie można podać sygnału zastępczego „Sz”",
+    "zezwolenie na wyjazd ze stacji posiadającej semafory wyjazdowe z toru, przy którym nie ma semafora wyjazdowego",
+    "zezwolenie na przejechanie obok semafora wjazdowego, drogowskazowego lub obsługiwanego semafora odstępowego albo tarczy zaporowej, wskazujących sygnał „Stój”, również sygnał wątpliwy, białe światło, bądź nieoświetlonych, o ile nie można podać sygnału zastępczego „Sz”",
+    "zezwolenie na jazdę manewrową taboru w kierunku szlaku, poza ustaloną granicę przetaczania (wskaźnik W 5) lub poza ostatni rozjazd",
+    "zezwolenie na jazdę w przypadku, gdy pojazd trakcyjny znajduje się poza semaforem wskazującym sygnał zezwalający, którego prowadzący pojazd kolejowy nie widzi,",
+    "zezwolenie na dalszą jazdę zatrzymanego pociągu skierowanego na tor prawy, gdy jego czoło minęło semafor z wyświetlonym wskaźnikiem W 24,",
+    "zezwolenie na dalszą jazdę zatrzymanego pociągu, gdy pociąg przejechał i zatrzymał się za semaforem wskazującym sygnał „Stój”",
+    "polecenie jazdy pociągu do określonego kilometra na szlaku jednotorowym, zatrzymania się i powrotu najpóźniej w nakazanym czasie",
+    "polecenie nieprzewidzianego wewnętrznym rozkładem jazdy zatrzymania na szlaku pociągu, z określeniem celu i czasu postoju,",
+    "informację o tym, że w czasie prowadzenia ruchu pociągów w odstępach posterunków następczych sygnały na samoczynnych semaforach odstępowych są nieważne",
+    "informację o unieważnieniu sygnałów na semaforach SBL"
+  ]
+}

src/mixins/orderFooterMixin.ts

@@ -12,16 +12,19 @@ export default defineComponent({
     generateFooter() {
       const footer = this.store.orderFooter;
 
-      this.store.footerMessage = ' <b>|</b> ';
+      const messageArray = [];
-      if (footer.stationName) this.store.footerMessage += ` Stacja: ${footer.stationName}`;
-      if (footer.checkpointName) this.store.footerMessage += ` Posterunek: ${footer.checkpointName}`;
-      if (footer.hour) this.store.footerMessage += `, godz. ${footer.hour}`;
-      if (footer.minutes) this.store.footerMessage += ` min. ${footer.minutes}`;
-      if (footer.dispatcherName) this.store.footerMessage += `, dyżurny ruchu ${footer.dispatcherName}`;
-      if (footer.secondaryDispatcherName)
-        this.store.footerMessage += `, z polecenia dyżurnego ruchu ${footer.secondaryDispatcherName}`;
 
-      this.store.footerMessage += ' <b>Potwierdzić przyjęcie rozkazu</b>';
+      if (footer.stationName) messageArray.push(`stacja: ${footer.stationName}`);
+      if (footer.checkpointName) messageArray.push(`posterunek: ${footer.checkpointName}`);
+      if (footer.hour) messageArray.push(`godz. ${footer.hour}`);
+      if (footer.minutes) messageArray.push(`min. ${footer.minutes}`);
+      if (footer.dispatcherName) messageArray.push(`dyżurny ruchu ${footer.dispatcherName}`);
+      if (footer.secondaryDispatcherName)
+        messageArray.push(`z polecenia dyżurnego ruchu ${footer.secondaryDispatcherName}`);
+
+      this.store.footerMessage = ` <b>|</b> ${messageArray.join(', ')} <b>|</b> Rozkaz otrzymałem, maszynista: (potwierdzić otrzymanie rozkazu)`;
     },
   },
 });
+
+

src/store/store.ts

@@ -3,6 +3,8 @@ import { defineStore } from 'pinia';
 export const useStore = defineStore('store', {
   state: () => {
     return {
+      helperModalOpen: false,
+
       chosenOrderType: 'orderN' as 'orderO' | 'orderS' | 'orderN',
       chosenLocalOrderId: '',
 

src/styles/global.scss

@@ -15,6 +15,10 @@ html {
   font-weight: 500;
 }
 
+* {
+  box-sizing: border-box;
+}
+
 a {
   color: white;
   text-decoration: none;
@@ -112,3 +116,34 @@ ul {
 ::-webkit-scrollbar-thumb:hover {
   background: #555;
 }
+
+// Modal
+.g-modal {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  z-index: 1000;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  .modal-bg {
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+
+    cursor: pointer;
+
+    background-color: #000000aa;
+  }
+
+  .modal-content {
+    position: relative;
+    z-index: 1001;
+
+    overflow: auto;
+  }
+}

src/views/Home.vue

@@ -1,4 +1,5 @@
 <template>
+  <OrderHelper v-if="store.helperModalOpen" />
   <SideBar />
 
   <div class="home">
@@ -39,9 +40,10 @@ import SideBar from '../components/SideBar.vue';
 import OrderMessage from '../components/OrderMessage.vue';
 import OrderList from '../components/OrderList.vue';
 import { useStore } from '../store/store';
+import OrderHelper from '../components/OrderHelper.vue';
 
 export default defineComponent({
-  components: { OrderVue, SideBar },
+  components: { OrderVue, SideBar, OrderHelper },
 
   data() {
     return {
@@ -60,8 +62,6 @@ export default defineComponent({
 
   methods: {
     selectOrderMode(mode: string) {
-      console.log(mode);
-
       this.store.orderMode = mode;
     },
   },
@@ -92,12 +92,20 @@ export default defineComponent({
   min-height: 100vh;
   overflow-x: auto;
 
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  width: 100%;
+
   .home_container {
     display: flex;
     flex-wrap: wrap;
-    align-items: flex-start;
     justify-content: center;
-    padding: 2em 0;
+    gap: 2em 1em;
+    padding: 0.5em;
+
+    width: 100%;
 
     @media screen and (max-width: 650px) {
       padding-top: 85px;
@@ -106,13 +114,8 @@ export default defineComponent({
   }
 
   .order_container {
-    font-size: 0.9rem;
+    width: 100%;
-    margin-right: 0.5em;
+    max-width: 550px;
-    margin-bottom: 1em;
-
-    @media screen and (max-width: 550px) {
-      margin: 1em;
-    }
   }
 
   .message_container {

yarn.lock

@@ -12,41 +12,52 @@
   resolved "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-3.0.0.tgz"
   integrity sha512-yWP34ArFh/jAeNUDkkLz/kVRLjf5ppJiq4L36f64Cp6dIrMQeYZGDP9xxdemlXfZR9ylN9JgHUl3GzfqOtgYDg==
 
-"@volar/code-gen@0.38.8":
+"@volar/language-core@1.0.8":
-  version "0.38.8"
+  version "1.0.8"
-  resolved "https://registry.npmjs.org/@volar/code-gen/-/code-gen-0.38.8.tgz"
+  resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.0.8.tgz#ed923e13d626102db6f82be03cfad22b0e5fdeae"
-  integrity sha512-e37jd+JwNjBpWiBblsdmYMbJ9bELiuj2yZrsXv1IVKpYNSfvS92ZiYjJqVXHUwpzNeZjFG0RCd5nTpbiebwANw==
+  integrity sha512-uxYSOqBk8ZFSzGjUIPOBEFPOg8F3CE6cLO5meK95DODGIlUlPytGiy9sy8QZ9w7RpUH4XMOX3MH/G48SLgP07A==
   dependencies:
-    "@volar/source-map" "0.38.8"
+    "@volar/source-map" "1.0.8"
+    "@vue/reactivity" "^3.2.40"
+    muggle-string "^0.1.0"
 
-"@volar/source-map@0.38.8":
+"@volar/source-map@1.0.8":
-  version "0.38.8"
+  version "1.0.8"
-  resolved "https://registry.npmjs.org/@volar/source-map/-/source-map-0.38.8.tgz"
+  resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.0.8.tgz#3e1a6f9ae652b665e6f3eef7c6291b48ac1aa6e6"
-  integrity sha512-JZvpjW/z2U3wq5wvwcTounPrRAZuSl4hlVKr3y7y72bKr++6W05OnX7fl/ddw39G/wLHdI2ag5+4JWsSd/EYhg==
+  integrity sha512-uKMe+alyfl1Abs5SviKejFoe7x9g6jDPVpVt63Tet4qn1Ziy7tFsvtCpM2Y1Ko5qw2nLIeloLslPqm9/gmbBLQ==
-
-"@volar/vue-code-gen@0.38.8":
-  version "0.38.8"
-  resolved "https://registry.npmjs.org/@volar/vue-code-gen/-/vue-code-gen-0.38.8.tgz"
-  integrity sha512-iQVNmIu1TqnqTko+l9yeylmZipZ8zNH20XZAK9+48hkv2fEQnnJn5AI2W9Zb2M5DkGMpbYiJk9Fq1vm51YY1+g==
   dependencies:
-    "@volar/code-gen" "0.38.8"
+    muggle-string "^0.1.0"
-    "@volar/source-map" "0.38.8"
-    "@vue/compiler-core" "^3.2.37"
-    "@vue/compiler-dom" "^3.2.37"
-    "@vue/shared" "^3.2.37"
 
-"@volar/vue-typescript@0.38.8":
+"@volar/typescript@1.0.8":
-  version "0.38.8"
+  version "1.0.8"
-  resolved "https://registry.npmjs.org/@volar/vue-typescript/-/vue-typescript-0.38.8.tgz"
+  resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.0.8.tgz#45674506471c3ee8cfabb0d98f75f8e2b2f18936"
-  integrity sha512-7WeFt5piz9I6FKw2cQQCWm+75MxS6xCOGm300iu+hJORlroN2dwWbwj97pQnDGbjQbftCRplUYf0GqmhcOsanQ==
+  integrity sha512-2oY1Apvzcs/5tAn7p1tRlDxNgal5ezaK0h9cutcWALeimsaQBAEE2NAirCrLMHl8DneuDce0tzJqHaQeHw9RmQ==
   dependencies:
-    "@volar/code-gen" "0.38.8"
+    "@volar/language-core" "1.0.8"
-    "@volar/source-map" "0.38.8"
-    "@volar/vue-code-gen" "0.38.8"
-    "@vue/compiler-sfc" "^3.2.37"
-    "@vue/reactivity" "^3.2.37"
 
-"@vue/compiler-core@3.2.37", "@vue/compiler-core@^3.2.37":
+"@volar/vue-language-core@1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@volar/vue-language-core/-/vue-language-core-1.0.8.tgz#2f888309aee80b6853ba5181f82b772e21f3b13e"
+  integrity sha512-cXb7oTybxcm1vpz003agdYQHyxij7UAaSub60d7W1aMWpqb2iaCbVaq9izgQFlrpC4/JnVs+cJPb/Q6fAUVxBg==
+  dependencies:
+    "@volar/language-core" "1.0.8"
+    "@volar/source-map" "1.0.8"
+    "@vue/compiler-dom" "^3.2.40"
+    "@vue/compiler-sfc" "^3.2.40"
+    "@vue/reactivity" "^3.2.40"
+    "@vue/shared" "^3.2.40"
+    minimatch "^5.1.0"
+    vue-template-compiler "^2.7.10"
+
+"@volar/vue-typescript@1.0.8":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@volar/vue-typescript/-/vue-typescript-1.0.8.tgz#34cc253b65d5992cb411d110db56c55037c49956"
+  integrity sha512-6jBvA7iwBkRqS2VQx2gLJgfLcF3hcODyJ6Lmiw2tN8D/LVfFCovvzJgPvIQb9Y4i+rha1Y0cpsYOUt9XW2Z7ZA==
+  dependencies:
+    "@volar/typescript" "1.0.8"
+    "@volar/vue-language-core" "1.0.8"
+
+"@vue/compiler-core@3.2.37":
   version "3.2.37"
   resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz"
   integrity sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==
@@ -56,7 +67,17 @@
     estree-walker "^2.0.2"
     source-map "^0.6.1"
 
-"@vue/compiler-dom@3.2.37", "@vue/compiler-dom@^3.2.37":
+"@vue/compiler-core@3.2.41":
+  version "3.2.41"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.41.tgz#fb5b25f23817400f44377d878a0cdead808453ef"
+  integrity sha512-oA4mH6SA78DT+96/nsi4p9DX97PHcNROxs51lYk7gb9Z4BPKQ3Mh+BLn6CQZBw857Iuhu28BfMSRHAlPvD4vlw==
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/shared" "3.2.41"
+    estree-walker "^2.0.2"
+    source-map "^0.6.1"
+
+"@vue/compiler-dom@3.2.37":
   version "3.2.37"
   resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz"
   integrity sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==
@@ -64,7 +85,15 @@
     "@vue/compiler-core" "3.2.37"
     "@vue/shared" "3.2.37"
 
-"@vue/compiler-sfc@3.2.37", "@vue/compiler-sfc@^3.2.37":
+"@vue/compiler-dom@3.2.41", "@vue/compiler-dom@^3.2.40":
+  version "3.2.41"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.41.tgz#dc63dcd3ce8ca8a8721f14009d498a7a54380299"
+  integrity sha512-xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw==
+  dependencies:
+    "@vue/compiler-core" "3.2.41"
+    "@vue/shared" "3.2.41"
+
+"@vue/compiler-sfc@3.2.37":
   version "3.2.37"
   resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz"
   integrity sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==
@@ -80,6 +109,22 @@
     postcss "^8.1.10"
     source-map "^0.6.1"
 
+"@vue/compiler-sfc@^3.2.40":
+  version "3.2.41"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.41.tgz#238fb8c48318408c856748f4116aff8cc1dc2a73"
+  integrity sha512-+1P2m5kxOeaxVmJNXnBskAn3BenbTmbxBxWOtBq3mQTCokIreuMULFantBUclP0+KnzNCMOvcnKinqQZmiOF8w==
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/compiler-core" "3.2.41"
+    "@vue/compiler-dom" "3.2.41"
+    "@vue/compiler-ssr" "3.2.41"
+    "@vue/reactivity-transform" "3.2.41"
+    "@vue/shared" "3.2.41"
+    estree-walker "^2.0.2"
+    magic-string "^0.25.7"
+    postcss "^8.1.10"
+    source-map "^0.6.1"
+
 "@vue/compiler-ssr@3.2.37":
   version "3.2.37"
   resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz"
@@ -88,6 +133,14 @@
     "@vue/compiler-dom" "3.2.37"
     "@vue/shared" "3.2.37"
 
+"@vue/compiler-ssr@3.2.41":
+  version "3.2.41"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.41.tgz#344f564d68584b33367731c04ffc949784611fcb"
+  integrity sha512-Y5wPiNIiaMz/sps8+DmhaKfDm1xgj6GrH99z4gq2LQenfVQcYXmHIOBcs5qPwl7jaW3SUQWjkAPKMfQemEQZwQ==
+  dependencies:
+    "@vue/compiler-dom" "3.2.41"
+    "@vue/shared" "3.2.41"
+
 "@vue/devtools-api@^6.1.4":
   version "6.2.1"
   resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.2.1.tgz"
@@ -104,13 +157,31 @@
     estree-walker "^2.0.2"
     magic-string "^0.25.7"
 
-"@vue/reactivity@3.2.37", "@vue/reactivity@^3.2.37":
+"@vue/reactivity-transform@3.2.41":
+  version "3.2.41"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.41.tgz#9ff938877600c97f646e09ac1959b5150fb11a0c"
+  integrity sha512-mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A==
+  dependencies:
+    "@babel/parser" "^7.16.4"
+    "@vue/compiler-core" "3.2.41"
+    "@vue/shared" "3.2.41"
+    estree-walker "^2.0.2"
+    magic-string "^0.25.7"
+
+"@vue/reactivity@3.2.37":
   version "3.2.37"
   resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz"
   integrity sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==
   dependencies:
     "@vue/shared" "3.2.37"
 
+"@vue/reactivity@^3.2.40":
+  version "3.2.41"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.41.tgz#0ad3bdf76d76822da1502dc9f394dafd02642963"
+  integrity sha512-9JvCnlj8uc5xRiQGZ28MKGjuCoPhhTwcoAdv3o31+cfGgonwdPNuvqAXLhlzu4zwqavFEG5tvaoINQEfxz+l6g==
+  dependencies:
+    "@vue/shared" "3.2.41"
+
 "@vue/runtime-core@3.2.37":
   version "3.2.37"
   resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz"
@@ -136,11 +207,16 @@
     "@vue/compiler-ssr" "3.2.37"
     "@vue/shared" "3.2.37"
 
-"@vue/shared@3.2.37", "@vue/shared@^3.2.37":
+"@vue/shared@3.2.37":
   version "3.2.37"
   resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz"
   integrity sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==
 
+"@vue/shared@3.2.41", "@vue/shared@^3.2.40":
+  version "3.2.41"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.41.tgz#fbc95422df654ea64e8428eced96ba6ad555d2bb"
+  integrity sha512-W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw==
+
 anymatch@~3.1.2:
   version "3.1.2"
   resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"
@@ -149,11 +225,23 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
@@ -181,6 +269,11 @@ csstype@^2.6.8:
   resolved "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz"
   integrity sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==
 
+de-indent@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
+  integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==
+
 esbuild-android-64@0.14.49:
   version "0.14.49"
   resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.49.tgz#9e4682c36dcf6e7b71b73d2a3723a96e0fdc5054"
@@ -343,6 +436,11 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+he@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
+
 immutable@^4.0.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz"
@@ -386,6 +484,18 @@ magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.8"
 
+minimatch@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
+  integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+muggle-string@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.1.0.tgz#1fda8a281c8b27bb8b70466dbc9f27586a8baa6c"
+  integrity sha512-Tr1knR3d2mKvvWthlk7202rywKbiOm4rVFLsfAaSIhJ6dt9o47W4S+JMtWhd/PW9Wrdew2/S2fSvhz3E2gkfEg==
+
 nanoid@^3.3.4:
   version "3.3.4"
   resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"
@@ -516,12 +626,21 @@ vue-router@^4.0.0-0:
   dependencies:
     "@vue/devtools-api" "^6.1.4"
 
-vue-tsc@^0.38.4:
+vue-template-compiler@^2.7.10:
-  version "0.38.8"
+  version "2.7.13"
-  resolved "https://registry.npmjs.org/vue-tsc/-/vue-tsc-0.38.8.tgz"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz#1520a5aa6d1af51dd0622824e79814f6e8cb7058"
-  integrity sha512-hhyc5SODiekcYNXG08aNg17LogR19o3i14avVejo+Fm45Dqk9Ke6rb0M19HoTKdQGfZBgqg2VUboYxmtAukWeg==
+  integrity sha512-jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog==
   dependencies:
-    "@volar/vue-typescript" "0.38.8"
+    de-indent "^1.0.2"
+    he "^1.2.0"
+
+vue-tsc@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.0.8.tgz#6f24e082878d1f4960dd89fe66fe3b70f6cc2ed5"
+  integrity sha512-+0sJ+QVH7SHLt8mV/uIw4xlHDk1mWigZkMFugfZTv8rlHpM3S2tCVZ0BWEGclT/0rKdO8j+St+mljpvhWPN/eQ==
+  dependencies:
+    "@volar/vue-language-core" "1.0.8"
+    "@volar/vue-typescript" "1.0.8"
 
 vue@^3.2.37:
   version "3.2.37"