diff --git a/index.html b/index.html index d3a4ee4..72b7f45 100644 --- a/index.html +++ b/index.html @@ -1,11 +1,14 @@ - + - + Stacjownik @@ -18,10 +21,6 @@ - - - - @@ -29,18 +28,33 @@ - - + + - - + + - + diff --git a/package.json b/package.json index 258d6b5..0c4834d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stacjownik", - "version": "1.18.2", + "version": "1.18.3", "private": true, "scripts": { "dev": "vite", diff --git a/src/App.scss b/src/App.scss index e47fae8..f97f853 100644 --- a/src/App.scss +++ b/src/App.scss @@ -56,24 +56,17 @@ // CONTAINER .app_container { - display: flex; - flex-flow: column; + // display: flex; + // flex-flow: column; + display: grid; + grid-template-rows: auto 1fr auto; + grid-template-columns: 100%; min-height: 100vh; +} - header { - flex: 0 0 auto; - } - - main { - flex: 1 1 auto; - - padding: 0 0.5em; - } - - footer { - flex: 0 1 0.2em; - } +.app_main { + padding: 0 0.5em; } .warning { diff --git a/src/App.vue b/src/App.vue index e8b19a8..36caa16 100644 --- a/src/App.vue +++ b/src/App.vue @@ -10,7 +10,7 @@
- + @@ -39,12 +39,12 @@ import Clock from './components/App/Clock.vue'; import packageInfo from '.././package.json'; import { regions } from './data/options.json'; -import { useStore } from './store/store'; +import { useStore } from './store/mainStore'; import StatusIndicator from './components/App/StatusIndicator.vue'; import TrainModal from './components/Global/TrainModal.vue'; -import StorageManager from './scripts/managers/storageManager'; import AppHeader from './components/App/AppHeader.vue'; import axios from 'axios'; +import StorageManager from './managers/storageManager'; export default defineComponent({ components: { @@ -72,12 +72,9 @@ export default defineComponent({ window.addEventListener('offline', () => { this.store.isOffline = true; - this.store.apiData = { - stations: [], - dispatchers: [], - trains: [], - connectedSocketCount: 0 - }; + this.store.activeData.activeSceneries = []; + this.store.activeData.trains = []; + this.store.activeData.connectedSocketCount = 0; this.store.setStatuses(); }); diff --git a/src/components/App/AppHeader.vue b/src/components/App/AppHeader.vue index ab2235e..d10da58 100644 --- a/src/components/App/AppHeader.vue +++ b/src/components/App/AppHeader.vue @@ -68,7 +68,7 @@ @@ -34,10 +69,10 @@ $free: #8a8a8a; $ending: #e6c300; $no-limit: #117fc9; $unav: #ff3d5d; -$brb: #e6a100; +$afk: #e6a100; $no-space: #222; $online: #09a116; -$unknown: rgb(185, 60, 60); +$unknown: #b93c3c; .status-badge { border-radius: 1rem; @@ -69,8 +104,8 @@ $unknown: rgb(185, 60, 60); font-size: 0.85em; } - &.brb { - background-color: $brb; + &.afk { + background-color: $afk; color: black; font-size: 0.95em; } @@ -82,7 +117,8 @@ $unknown: rgb(185, 60, 60); font-size: 0.85em; } - &.unknown { + &.unknown, + &.invalid { background-color: $unknown; font-size: 0.95em; } diff --git a/src/components/Global/StockList.vue b/src/components/Global/StockList.vue index eefb1f2..9549550 100644 --- a/src/components/Global/StockList.vue +++ b/src/components/Global/StockList.vue @@ -50,8 +50,8 @@ diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue index bfe9659..8fca022 100644 --- a/src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue +++ b/src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue @@ -22,9 +22,8 @@ @@ -35,7 +34,7 @@ import dateMixin from '../../../mixins/dateMixin'; import routerMixin from '../../../mixins/routerMixin'; import styleMixin from '../../../mixins/styleMixin'; import StationStatusBadge from '../../Global/StationStatusBadge.vue'; -import { OnlineScenery } from '../../../scripts/interfaces/store/storeTypes'; +import { OnlineScenery } from '../../../store/typings'; export default defineComponent({ mixins: [styleMixin, dateMixin, routerMixin], diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoSpawnList.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoSpawnList.vue index fdbecb3..d6a4672 100644 --- a/src/components/SceneryView/SceneryInfo/SceneryInfoSpawnList.vue +++ b/src/components/SceneryView/SceneryInfo/SceneryInfoSpawnList.vue @@ -7,7 +7,11 @@ -
  • +
  • {{ $t('scenery.no-spawns') }}
    • @@ -26,7 +30,7 @@