mirror of
https://github.com/Spythere/genera-tor.git
synced 2026-05-02 21:18:12 +00:00
Poprawki stylistyczne
This commit is contained in:
@@ -25,7 +25,7 @@ ms-icon-144x144.png,1658609937000,aede59be6881a13db2df2635cc1e7b258a39f5ab107713
|
||||
ms-icon-150x150.png,1658609937021,e2c169c428949765d1e695b05a48f4b982ae2fa3068e426ed41447eba0e19234
|
||||
ms-icon-310x310.png,1658609937042,9680db857d251ecdb422aa8c1cc186ffe67e74c2b6655067e7d7fc2e324476c3
|
||||
ms-icon-70x70.png,1658609936980,e61ef4f24726f3f017de2ece28c2701413764d02310881d0d99642d18582a14a
|
||||
index.html,1666561621786,36e822f3ffb70e1a608d6164ed984211da7531bbf07224ffa38d2dc701c7ca49
|
||||
assets/icon-save.5a12487e.svg,1666561621785,5c75b0d4e35cdaf019c7292f7fd98c2e60466ae6f8b30d49b96cf2380c08299c
|
||||
assets/index.fd5b13f0.css,1666561621786,a884024f41b950250886378f2d0f739d35a511cc0e5be1ee14a1cce97bb5c50a
|
||||
assets/index.62948ee3.js,1666561621786,d3290e5f59b80ea4a97d83ad1453f96ac6b136c2e66941d0aee3ee9ddc765012
|
||||
index.html,1666564269542,70d2f2079501d80e601fb45c73b19c76e5045940ac64e346376c6551b644b851
|
||||
assets/icon-save.5a12487e.svg,1666564269543,5c75b0d4e35cdaf019c7292f7fd98c2e60466ae6f8b30d49b96cf2380c08299c
|
||||
assets/index.c14514ca.css,1666564269543,584a9268e2ca5f0c8bbb8912cfe018dd5e249a16cadacccf3f96dd60db73e221
|
||||
assets/index.72b72171.js,1666564269543,654c54634cbe11c57aa1d03001d33e3cde14fa2a56516f0b3816c92920cad2c2
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
"pinia": "^2.0.14",
|
||||
"vue": "^3.2.37",
|
||||
"vue-router": "^4.0.0-0",
|
||||
"vue-tsc": "^1.0.8"
|
||||
"vue-tsc": "^1.0.9"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vitejs/plugin-vue": "^3.0.0",
|
||||
|
||||
@@ -68,13 +68,12 @@ export default defineComponent({
|
||||
background-color: white;
|
||||
color: black;
|
||||
|
||||
height: 925px;
|
||||
max-height: 95vh;
|
||||
overflow: auto;
|
||||
|
||||
font-size: 15px;
|
||||
|
||||
box-shadow: 0 0 15px 2px white;
|
||||
|
||||
h2 {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
||||
@@ -28,11 +28,12 @@ import { useStore } from '../store/store';
|
||||
import saveIcon from '../assets/icon-save.svg';
|
||||
import orderStorageMixin from '../mixins/orderStorageMixin';
|
||||
import orderFooterMixin from '../mixins/orderFooterMixin';
|
||||
import orderValidationMixin from '../mixins/orderValidationMixin';
|
||||
|
||||
export default defineComponent({
|
||||
name: 'OrderMessage',
|
||||
|
||||
mixins: [orderStorageMixin, orderFooterMixin],
|
||||
mixins: [orderStorageMixin, orderValidationMixin],
|
||||
|
||||
data() {
|
||||
return {
|
||||
@@ -78,26 +79,13 @@ export default defineComponent({
|
||||
}, 5000);
|
||||
},
|
||||
|
||||
verifyHeader() {
|
||||
const header = this.store[this.store.chosenOrderType].header;
|
||||
const fieldsToCorrect = [];
|
||||
|
||||
if (!header.orderNo) fieldsToCorrect.push('numer rozkazu');
|
||||
if (!header.trainNo) fieldsToCorrect.push('numer pociągu / manewru');
|
||||
if (!header.date) fieldsToCorrect.push('data');
|
||||
|
||||
return fieldsToCorrect;
|
||||
},
|
||||
|
||||
copyMessage() {
|
||||
if (!navigator.clipboard)
|
||||
return this.showActionMonit(
|
||||
'Ups! Twoja przeglądarka musi być dosyć przestarzała, ponieważ nie obsługuje zapisu do schowka! :/'
|
||||
);
|
||||
|
||||
const headerFieldsToCorrect = this.verifyHeader();
|
||||
const footerFieldsToCorrect = this.verifyFooter();
|
||||
const fieldsToCorrect = [...headerFieldsToCorrect, ...footerFieldsToCorrect];
|
||||
const fieldsToCorrect = this.verifyOrderFields();
|
||||
|
||||
if (fieldsToCorrect.length > 0)
|
||||
return this.showActionMonit(
|
||||
|
||||
@@ -193,7 +193,7 @@ th {
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 250px;
|
||||
height: 285px;
|
||||
|
||||
padding: 0.5em;
|
||||
|
||||
|
||||
+13
-11
@@ -64,13 +64,13 @@ export default defineComponent({
|
||||
@import '../styles/global.scss';
|
||||
|
||||
.sidebar {
|
||||
position: fixed;
|
||||
top: 50%;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
|
||||
z-index: 999;
|
||||
|
||||
transform: translateY(-50%);
|
||||
transform: translate(-100%, 0);
|
||||
}
|
||||
|
||||
.sidebar_content {
|
||||
@@ -91,14 +91,14 @@ export default defineComponent({
|
||||
align-items: center;
|
||||
|
||||
color: white;
|
||||
background-color: #00000073;
|
||||
background-color: #1d1d1d;
|
||||
width: 50px;
|
||||
height: 85px;
|
||||
|
||||
.bar {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
left: 0;
|
||||
|
||||
height: 100%;
|
||||
width: 4px;
|
||||
@@ -118,7 +118,7 @@ export default defineComponent({
|
||||
}
|
||||
|
||||
&:focus-visible {
|
||||
background-color: #6d6d6d73;
|
||||
background-color: #6d6d6d;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -140,17 +140,18 @@ button.option-save {
|
||||
.sidebar {
|
||||
left: 50%;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
|
||||
transform: translate(-50%, 0);
|
||||
transform: translate(-50%, -100%);
|
||||
}
|
||||
|
||||
.sidebar_content {
|
||||
grid-template-rows: 1fr;
|
||||
grid-template-columns: repeat(3, 1fr);
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
||||
& > button {
|
||||
height: 60px;
|
||||
width: 60px;
|
||||
height: 40px;
|
||||
width: 100px;
|
||||
|
||||
.bar {
|
||||
width: 100%;
|
||||
@@ -160,3 +161,4 @@ button.option-save {
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
@@ -9,21 +9,6 @@ export default defineComponent({
|
||||
},
|
||||
|
||||
methods: {
|
||||
verifyFooter() {
|
||||
const footer = this.store.orderFooter;
|
||||
|
||||
const fieldsToCorrect = [];
|
||||
|
||||
if (!footer.stationName) fieldsToCorrect.push('stacja');
|
||||
if (!footer.checkpointName) fieldsToCorrect.push('posterunek');
|
||||
if (!footer.hour) fieldsToCorrect.push('godzina');
|
||||
if (!footer.minutes) fieldsToCorrect.push('minuta');
|
||||
if (!footer.dispatcherName && !footer.secondaryDispatcherName)
|
||||
fieldsToCorrect.push('dyżurny ruchu (lub z polecenia dyżurnego ruchu)');
|
||||
|
||||
return fieldsToCorrect;
|
||||
},
|
||||
|
||||
generateFooter() {
|
||||
const footer = this.store.orderFooter;
|
||||
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
import { defineComponent } from 'vue';
|
||||
import { useStore } from '../store/store';
|
||||
|
||||
export default defineComponent({
|
||||
setup() {
|
||||
return {
|
||||
store: useStore(),
|
||||
};
|
||||
},
|
||||
|
||||
methods: {
|
||||
verifyOrderFields() {
|
||||
const header = this.store[this.store.chosenOrderType].header;
|
||||
const footer = this.store.orderFooter;
|
||||
|
||||
const fieldsToCorrect = [];
|
||||
|
||||
if (!header.orderNo) fieldsToCorrect.push('numer rozkazu');
|
||||
if (!header.trainNo) fieldsToCorrect.push('numer pociągu / manewru');
|
||||
if (!header.date) fieldsToCorrect.push('data');
|
||||
|
||||
if (!footer.stationName) fieldsToCorrect.push('stacja');
|
||||
if (!footer.checkpointName) fieldsToCorrect.push('posterunek');
|
||||
if (!footer.hour) fieldsToCorrect.push('godzina');
|
||||
if (!footer.minutes) fieldsToCorrect.push('minuta');
|
||||
if (!footer.dispatcherName && !footer.secondaryDispatcherName)
|
||||
fieldsToCorrect.push('dyżurny ruchu (lub z polecenia dyżurnego ruchu)');
|
||||
|
||||
return fieldsToCorrect;
|
||||
},
|
||||
},
|
||||
});
|
||||
+4
-2
@@ -1,10 +1,10 @@
|
||||
<template>
|
||||
<!-- <OrderHelper v-if="store.helperModalOpen" /> -->
|
||||
<SideBar />
|
||||
|
||||
<div class="home">
|
||||
<div class="home_container">
|
||||
<div class="order_container">
|
||||
<SideBar />
|
||||
<OrderVue />
|
||||
</div>
|
||||
|
||||
@@ -108,7 +108,7 @@ export default defineComponent({
|
||||
width: 100%;
|
||||
|
||||
@media screen and (max-width: 650px) {
|
||||
padding-top: 85px;
|
||||
padding-top: 5em;
|
||||
padding-bottom: 5em;
|
||||
}
|
||||
}
|
||||
@@ -116,6 +116,8 @@ export default defineComponent({
|
||||
.order_container {
|
||||
width: 100%;
|
||||
max-width: 550px;
|
||||
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.message_container {
|
||||
|
||||
@@ -12,36 +12,36 @@
|
||||
resolved "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-3.0.0.tgz"
|
||||
integrity sha512-yWP34ArFh/jAeNUDkkLz/kVRLjf5ppJiq4L36f64Cp6dIrMQeYZGDP9xxdemlXfZR9ylN9JgHUl3GzfqOtgYDg==
|
||||
|
||||
"@volar/language-core@1.0.8":
|
||||
version "1.0.8"
|
||||
resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.0.8.tgz#ed923e13d626102db6f82be03cfad22b0e5fdeae"
|
||||
integrity sha512-uxYSOqBk8ZFSzGjUIPOBEFPOg8F3CE6cLO5meK95DODGIlUlPytGiy9sy8QZ9w7RpUH4XMOX3MH/G48SLgP07A==
|
||||
"@volar/language-core@1.0.9":
|
||||
version "1.0.9"
|
||||
resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.0.9.tgz#d12456b294d1e5b3928b22e5214c8e7141ee2ce1"
|
||||
integrity sha512-5Fty3slLet6svXiJw2YxhYeo6c7wFdtILrql5bZymYLM+HbiZtJbryW1YnUEKAP7MO9Mbeh+TNH4Z0HFxHgIqw==
|
||||
dependencies:
|
||||
"@volar/source-map" "1.0.8"
|
||||
"@volar/source-map" "1.0.9"
|
||||
"@vue/reactivity" "^3.2.40"
|
||||
muggle-string "^0.1.0"
|
||||
|
||||
"@volar/source-map@1.0.8":
|
||||
version "1.0.8"
|
||||
resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.0.8.tgz#3e1a6f9ae652b665e6f3eef7c6291b48ac1aa6e6"
|
||||
integrity sha512-uKMe+alyfl1Abs5SviKejFoe7x9g6jDPVpVt63Tet4qn1Ziy7tFsvtCpM2Y1Ko5qw2nLIeloLslPqm9/gmbBLQ==
|
||||
"@volar/source-map@1.0.9":
|
||||
version "1.0.9"
|
||||
resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.0.9.tgz#00aa951d3d7f9b842f84e28ab2a1831ab3b5b95a"
|
||||
integrity sha512-fazB/vy5ZEJ3yKx4fabJyGNI3CBkdLkfEIRVu6+1P3VixK0Mn+eqyUIkLBrzGYaeFM3GybhCLCvsVdNz0Fu/CQ==
|
||||
dependencies:
|
||||
muggle-string "^0.1.0"
|
||||
|
||||
"@volar/typescript@1.0.8":
|
||||
version "1.0.8"
|
||||
resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.0.8.tgz#45674506471c3ee8cfabb0d98f75f8e2b2f18936"
|
||||
integrity sha512-2oY1Apvzcs/5tAn7p1tRlDxNgal5ezaK0h9cutcWALeimsaQBAEE2NAirCrLMHl8DneuDce0tzJqHaQeHw9RmQ==
|
||||
"@volar/typescript@1.0.9":
|
||||
version "1.0.9"
|
||||
resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.0.9.tgz#9c0a8b5d79c0a03413755499d211c1c8001ac0cc"
|
||||
integrity sha512-dVziu+ShQUWuMukM6bvK2v2O446/gG6l1XkTh2vfkccw1IzjfbiP1TWQoNo1ipTfZOtu5YJGYAx+o5HNrGXWfQ==
|
||||
dependencies:
|
||||
"@volar/language-core" "1.0.8"
|
||||
"@volar/language-core" "1.0.9"
|
||||
|
||||
"@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==
|
||||
"@volar/vue-language-core@1.0.9":
|
||||
version "1.0.9"
|
||||
resolved "https://registry.yarnpkg.com/@volar/vue-language-core/-/vue-language-core-1.0.9.tgz#9eb7c30652c80f210fca071aeeea794873835eda"
|
||||
integrity sha512-tofNoR8ShPFenHT1YVMuvoXtXWwoQE+fiXVqSmW0dSKZqEDjWQ3YeXSd0a6aqyKaIbvR7kWWGp34WbpQlwf9Ww==
|
||||
dependencies:
|
||||
"@volar/language-core" "1.0.8"
|
||||
"@volar/source-map" "1.0.8"
|
||||
"@volar/language-core" "1.0.9"
|
||||
"@volar/source-map" "1.0.9"
|
||||
"@vue/compiler-dom" "^3.2.40"
|
||||
"@vue/compiler-sfc" "^3.2.40"
|
||||
"@vue/reactivity" "^3.2.40"
|
||||
@@ -49,13 +49,13 @@
|
||||
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==
|
||||
"@volar/vue-typescript@1.0.9":
|
||||
version "1.0.9"
|
||||
resolved "https://registry.yarnpkg.com/@volar/vue-typescript/-/vue-typescript-1.0.9.tgz#47ae4424283ec42c0b3321a4efbd4c505de3fe16"
|
||||
integrity sha512-ZLe4y9YNbviACa7uAMCilzxA76gbbSlKfjspXBzk6fCobd8QCIig+VyDYcjANIlm2HhgSCX8jYTzhCKlegh4mw==
|
||||
dependencies:
|
||||
"@volar/typescript" "1.0.8"
|
||||
"@volar/vue-language-core" "1.0.8"
|
||||
"@volar/typescript" "1.0.9"
|
||||
"@volar/vue-language-core" "1.0.9"
|
||||
|
||||
"@vue/compiler-core@3.2.37":
|
||||
version "3.2.37"
|
||||
@@ -634,13 +634,13 @@ vue-template-compiler@^2.7.10:
|
||||
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==
|
||||
vue-tsc@^1.0.9:
|
||||
version "1.0.9"
|
||||
resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.0.9.tgz#7d388ec3097bc9c1789d5745a97c608217af4873"
|
||||
integrity sha512-vRmHD1K6DmBymNhoHjQy/aYKTRQNLGOu2/ESasChG9Vy113K6CdP0NlhR0bzgFJfv2eFB9Ez/9L5kIciUajBxQ==
|
||||
dependencies:
|
||||
"@volar/vue-language-core" "1.0.8"
|
||||
"@volar/vue-typescript" "1.0.8"
|
||||
"@volar/vue-language-core" "1.0.9"
|
||||
"@volar/vue-typescript" "1.0.9"
|
||||
|
||||
vue@^3.2.37:
|
||||
version "3.2.37"
|
||||
|
||||
Reference in New Issue
Block a user