diff --git a/src/App.vue b/src/App.vue index 16f209f..3d1a1d7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,12 +9,15 @@ -
+
Scenerie online: {{stations.length}} | Maszyniści online: {{ trainCount }}
+
@@ -32,7 +35,10 @@ import Loading from "@/components/states/Loading.vue"; export default Vue.extend({ name: "App", components: { Error, Loading }, - computed: mapGetters({ stations: "getStations" }), + computed: mapGetters({ + stations: "getStations", + trainCount: "getTrainCount" + }), methods: { ...mapActions(["fetchStations"]) @@ -44,7 +50,7 @@ export default Vue.extend({ mounted() { this.fetchStations() - .then(result => console.log(result)) + .then(() => (this.connectionState = 2)) .catch(err => { this.connectionState = 1; this.errorMessage = err.message; @@ -93,54 +99,16 @@ a { } } -ul { - list-style: none; - padding: 0; -} - -.hour { - padding: 0.4em; - border-radius: 1rem; - - &.ending { - background-color: $accentCol; - color: black; - font-size: 0.9em; - } - - &.no-limit { - // background-color: #57ae00; - font-size: 0.85em; - } - - &.not-signed { - background-color: $accent2Col; - font-size: 0.8em; - } - - &.unavailable { - background-color: $accent2Col; - font-size: 0.9em; - } -} - -.text { - &--title { - color: #fdc62f; - font-size: 1em; - } - - &--content { - font-size: 0.8em; - } -} - .app { + color: white; + overflow: hidden; + &-container { display: grid; grid-template-rows: auto auto 1fr auto; grid-template-columns: minmax(0, 1fr); + min-width: 0; min-height: 100vh; } @@ -152,8 +120,6 @@ ul { flex-direction: column; background: #333; - color: white; - & > .brand-name { font-size: calc(1rem + 3.5vw); diff --git a/src/components/ui/Card.vue b/src/components/ui/Card.vue index 160596e..2b8a7f1 100644 --- a/src/components/ui/Card.vue +++ b/src/components/ui/Card.vue @@ -1,11 +1,360 @@ - + \ No newline at end of file diff --git a/src/components/ui/List.vue b/src/components/ui/List.vue index 9acd956..8b0c33b 100644 --- a/src/components/ui/List.vue +++ b/src/components/ui/List.vue @@ -1,11 +1,304 @@ - + \ No newline at end of file diff --git a/src/styles/responsive.scss b/src/styles/responsive.scss index c2e67a0..ff106a7 100644 --- a/src/styles/responsive.scss +++ b/src/styles/responsive.scss @@ -1,5 +1,5 @@ -@mixin midScreen() { - @media only screen and (min-width: 850px) { +@mixin smallScreen() { + @media only screen and (max-width: 850px) { @content; } } diff --git a/src/styles/variables.scss b/src/styles/variables.scss index f363152..5c7bea9 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,5 +1,5 @@ $primaryCol: #333; -$secondaryCol: #fdad17; +$secondaryCol: #01e733; $bgCol: #525252; diff --git a/src/views/Home.vue b/src/views/Home.vue index 6fc0978..6d8b3f1 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -1,15 +1,25 @@