From 1a9e23f5c994b670e97a3f02b0d3ec2a5b697300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Paj=C4=85k?= Date: Sat, 8 Aug 2020 23:16:53 +0200 Subject: [PATCH] =?UTF-8?q?Doko=C5=84czony=20widok=20poci=C4=85g=C3=B3w,?= =?UTF-8?q?=20zmiany=20w=20wygl=C4=85dzie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 35 ++++ package.json | 1 + public/index.html | 43 ++--- src/App.vue | 50 +++++- src/assets/unknown.png | Bin 0 -> 2320 bytes src/components/states/Loading.vue | 2 +- src/components/ui/List.vue | 1 - src/components/ui/OptionCard.vue | 17 +- src/router/index.ts | 2 +- src/styles/global.scss | 278 +++++++++++++++--------------- src/styles/variables.scss | 3 + src/views/TrainsView.vue | 137 +++++++++++---- 12 files changed, 363 insertions(+), 206 deletions(-) create mode 100644 src/assets/unknown.png diff --git a/package-lock.json b/package-lock.json index f8d448d..ece07d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2466,6 +2466,41 @@ "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==", "dev": true }, + "axios": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", + "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "dev": true, + "requires": { + "follow-redirects": "1.5.10" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "dev": true, + "requires": { + "debug": "=3.1.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, "babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", diff --git a/package.json b/package.json index 111632d..b645602 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "@vue/cli-plugin-typescript": "~4.4.0", "@vue/cli-plugin-vuex": "~4.4.0", "@vue/cli-service": "~4.4.0", + "axios": "^0.19.2", "sass": "^1.26.5", "sass-loader": "^8.0.2", "typescript": "~3.9.3", diff --git a/public/index.html b/public/index.html index 2a842e1..f0e9cc4 100644 --- a/public/index.html +++ b/public/index.html @@ -1,23 +1,26 @@ + + + + + + + Stacjownik + - - - - - - - - Stacjownik - - - - -
- - - - \ No newline at end of file + + +
+ + + diff --git a/src/App.vue b/src/App.vue index aec2a2a..cce4d64 100644 --- a/src/App.vue +++ b/src/App.vue @@ -21,7 +21,7 @@ - SCENERIE* + SCENERIE/ POCIĄGI @@ -30,12 +30,17 @@
- - - + + + + +
- + @@ -86,6 +91,23 @@ export default class App extends Vue { @import "./styles/variables.scss"; @import "./styles/global.scss"; +.view-anim { + &-enter { + transform: translateX(-10%); + opacity: 0; + } + + &-leave-to { + transform: translateX(10%); + opacity: 0; + } + + &-enter-active, + &-leave-active { + transition: all $animDuration $animType; + } +} + .route { margin: 0 0.2em; @@ -100,6 +122,10 @@ export default class App extends Vue { color: white; font-size: calc(1rem + 2.1vw); + + @include smallScreen() { + font-size: 2rem; + } } .container { @@ -115,6 +141,8 @@ export default class App extends Vue { background: #333; padding: 0.15em; + border-radius: 0 0 0.7em 0.7em; + display: flex; justify-content: center; @@ -142,7 +170,6 @@ export default class App extends Vue { display: flex; justify-content: center; - background-color: #222; border-radius: 0.7em; padding: 0.2em; @@ -172,5 +199,16 @@ footer { color: white; max-width: 100%; font-size: calc(0.5rem + 0.5vw); + + flex-direction: column; + + span { + margin: 0.2rem; + + &:nth-child(2) { + color: #888; + font-size: 0.95em; + } + } } diff --git a/src/assets/unknown.png b/src/assets/unknown.png new file mode 100644 index 0000000000000000000000000000000000000000..0aeae088efecd2a30e34f70fb14faa834d5c7027 GIT binary patch literal 2320 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 -
Pobieranie danych o sceneriach...
+
Stój, pobieranie danych...