From 214bbbf2fe2a1caacae3d4280376aeff5d18fcb2 Mon Sep 17 00:00:00 2001 From: Spythere Date: Fri, 21 Oct 2022 16:57:37 +0200 Subject: [PATCH] =?UTF-8?q?Poprawki=20funkcjonalno=C5=9Bci=20c.d.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .firebase/hosting.ZGlzdA.cache | 31 +++++++++++++++++++++++++++++++ package.json | 1 + src/components/Order.vue | 4 ++-- src/components/OrderList.vue | 5 ++++- src/components/OrderMessage.vue | 6 ++++++ src/mixins/orderFooterMixin.ts | 19 ++++++++++++------- src/views/Home.vue | 23 ++++++++++++----------- 7 files changed, 68 insertions(+), 21 deletions(-) create mode 100644 .firebase/hosting.ZGlzdA.cache diff --git a/.firebase/hosting.ZGlzdA.cache b/.firebase/hosting.ZGlzdA.cache new file mode 100644 index 0000000..e04d016 --- /dev/null +++ b/.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 diff --git a/package.json b/package.json index 76889ef..9fa2800 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "private": true, "scripts": { "dev": "vite --port 8080", + "deploy": "yarn build && firebase deploy --only hosting", "build": "vue-tsc --noEmit && vite build", "preview": "vite preview" }, diff --git a/src/components/Order.vue b/src/components/Order.vue index 37fc81c..afdef0e 100644 --- a/src/components/Order.vue +++ b/src/components/Order.vue @@ -65,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; @@ -179,3 +178,4 @@ select { } } + diff --git a/src/components/OrderList.vue b/src/components/OrderList.vue index 064b37e..493afde 100644 --- a/src/components/OrderList.vue +++ b/src/components/OrderList.vue @@ -5,7 +5,8 @@
  • Brak zapisanych rozkazów!
    • -
  • +
  • + #{{ sortedOrderList.length - i }}  {{ getOrderName(order.orderType) }} nr {{ order.orderBody['header']['orderNo'] }} dla pociągu nr {{ order.orderBody['header']['trainNo'] }} @@ -40,6 +41,7 @@ export default defineComponent({ setup() { return { store: useStore(), + localStorage: window.localStorage, }; }, @@ -136,3 +138,4 @@ li { } } + diff --git a/src/components/OrderMessage.vue b/src/components/OrderMessage.vue index 183da89..93ece84 100644 --- a/src/components/OrderMessage.vue +++ b/src/components/OrderMessage.vue @@ -3,6 +3,7 @@

    Wiadomość do wyświetlenia na czacie symulatora:

    +

    Po wygenerowaniu rozkazu skopiuj jego treść lub zapisz w pamięci przeglądarki za pomocą przycisków poniżej

    @@ -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; diff --git a/src/mixins/orderFooterMixin.ts b/src/mixins/orderFooterMixin.ts index f260b67..ccb23ba 100644 --- a/src/mixins/orderFooterMixin.ts +++ b/src/mixins/orderFooterMixin.ts @@ -12,14 +12,19 @@ export default defineComponent({ generateFooter() { const footer = this.store.orderFooter; - this.store.footerMessage = ' | '; - 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}`; + const messageArray = []; + + 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) - this.store.footerMessage += `, z polecenia dyżurnego ruchu ${footer.secondaryDispatcherName}`; + messageArray.push(`z polecenia dyżurnego ruchu ${footer.secondaryDispatcherName}`); + + this.store.footerMessage = ` | ${messageArray.join(', ')} | Rozkaz otrzymałem, maszynista: (potwierdzić otrzymanie rozkazu)`; }, }, }); + + diff --git a/src/views/Home.vue b/src/views/Home.vue index 1ae0039..c227dea 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -62,8 +62,6 @@ export default defineComponent({ methods: { selectOrderMode(mode: string) { - console.log(mode); - this.store.orderMode = mode; }, }, @@ -94,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; @@ -108,13 +114,8 @@ export default defineComponent({ } .order_container { - font-size: 0.9rem; - margin-right: 0.5em; - margin-bottom: 1em; - - @media screen and (max-width: 550px) { - margin: 1em; - } + width: 100%; + max-width: 550px; } .message_container {