diff --git a/.env b/.env index 45091ed..33cf802 100644 --- a/.env +++ b/.env @@ -1 +1,4 @@ -VITE_API_BASE_URL=https://45.146.164.63:8080 \ No newline at end of file +# VUE_APP_API_URL=http://31.129.106.67:8080 +# VUE_APP_GEO_URL=http://31.129.106.67:6001 +VUE_APP_API_URL=http://127.0.0.1:8080 +VUE_APP_GEO_URL=http://127.0.0.1:6001 \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 0db1eab..7343946 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,8 +1,8 @@ @@ -22,6 +22,11 @@ export default { WeatherInfo, RouteInfo, }, + data() { + return { + presidentOpen: false, + }; + }, }; diff --git a/src/assets/style/main.css b/src/assets/style/main.css index 2e266ae..4f2f217 100644 --- a/src/assets/style/main.css +++ b/src/assets/style/main.css @@ -18,18 +18,29 @@ body { user-select: none; } -.station-label-no-bg { +.station-label-no-bg, +.station-name-ru { background: transparent !important; border: none !important; box-shadow: none !important; - font-size: 16px; - font-weight: 600; - color: #fff; + /* max-width: 200px; */ padding: 0 !important; /* text-wrap: revert; */ } +.station-name-ru { + font-size: 16px; + font-weight: 600; + color: #fff; +} + +.station-name-en { + font-size: 14px; + color: #ffffffad; + text-align: left; +} + .station-label-no-bg:before { display: none !important; } @@ -40,6 +51,7 @@ body { top: 0; right: 0; height: 100%; + pointer-events: none; } .stopinfo .bg { @@ -48,6 +60,15 @@ body { display: flex; flex-direction: column; justify-content: space-between; + pointer-events: none; +} + +.stopinfo .bg * { + pointer-events: auto; +} + +.stopinfo .container { + margin-bottom: 75px !important; } .container { @@ -118,14 +139,22 @@ body { top: 18px; } +.landmarks-container { + position: absolute; + bottom: 0; +} + .stoparticles { + padding: 0 15px; height: 50px; color: #fff; display: flex; align-items: center; justify-content: center; margin-top: auto; - gap: 45px; + text-align: center; + gap: 15px; + justify-content: space-around; background: rgb(187, 179, 170); background: linear-gradient( 180deg, @@ -150,6 +179,7 @@ body { font-weight: 600; cursor: pointer; margin: 0 15px 15px 15px; + pointer-events: auto; } .stop-buttons-container { @@ -167,6 +197,7 @@ body { cursor: pointer; width: 100%; margin-top: 15px; + pointer-events: auto; } .white { @@ -225,6 +256,7 @@ body { left: 0; height: 100%; width: 350px; + pointer-events: none; } .carrierinfo .bg { @@ -310,7 +342,7 @@ body { .weatherinfo { z-index: 450; width: 225px; - padding: 10px 15px; + padding: 10px 10px; display: flex; flex-direction: column; align-items: center; @@ -336,8 +368,9 @@ body { .weatherinfo .date { text-align: center; - font-size: 18px; - padding: 2px 0 8px 0; + font-size: 15px; + font-weight: lighter; + padding: 0 0 8px 0; width: 100%; border-bottom: 1px solid #ffffff7a; } @@ -346,13 +379,16 @@ body { width: 75px; } +.current-weather { + padding-left: 10px; +} + .current-weather div { text-align: center; - margin-top: 5px; } .temperature-celsius { - font-size: 35px; + font-size: 50px; } .forecast-day { @@ -366,7 +402,7 @@ body { .weather-forecast { width: 100%; - padding: 0 10px; + padding: 0; margin-top: 10px; display: flex; align-items: center; @@ -376,15 +412,22 @@ body { .forecast { display: flex; flex-direction: column; - gap: 7px; + gap: 10px; + width: 90px; +} + +.forecast-day { + font-size: 17px; } .additional-forecast { display: flex; flex-direction: column; border-top: 1px solid #ffffff7a; - padding: 10px 0 0 7px; + padding: 10px 0 0 3px; gap: 7px; + font-size: 18px; + font-weight: bold; } .additional-forecast .humidity, @@ -417,7 +460,7 @@ body { .route-names { display: flex; flex-direction: column; - gap: 15px; + /* gap: 2px; */ padding: 0 10px; } @@ -478,7 +521,7 @@ body { position: absolute; bottom: 10px; left: 310px; - background: rgba(0, 0, 0, 0.4); + background: rgba(0, 0, 0, 0); border: none; color: #fff; font-size: 24px; @@ -487,6 +530,7 @@ body { border-radius: 5px; z-index: 1001; transition: left 0.3s ease; + pointer-events: auto; } .carrierinfo .bg.hidden + .carrier-toggle { @@ -550,21 +594,6 @@ body { overflow-y: auto; } -.carrier-toggle { - position: absolute; - bottom: 10px; - left: 310px; - background: rgba(0, 0, 0, 0.4); - border: none; - color: #fff; - font-size: 24px; - cursor: pointer; - padding: 5px 10px; - border-radius: 5px; - z-index: 1001; - transition: left 0.3s ease; -} - .carrierinfo .bg.hidden + .carrier-toggle { left: 10px; } @@ -576,6 +605,7 @@ body { .bg { transition: transform 0.3s ease; + pointer-events: auto; } .dropdown-name { @@ -680,16 +710,6 @@ li.checked { .stoparticle-option { cursor: pointer; - margin-right: 10px; -} - -.stoparticle-option.selected { - text-decoration: underline; -} - -.stoparticle-option { - cursor: pointer; - margin-right: 10px; } .stoparticle-option.selected { @@ -958,3 +978,21 @@ li.checked { .sight-preview-wrapper { max-height: 300px; } + +.hidden { + display: none !important; +} + +.governor-appeal { + top: 140px; + width: 440px; +} + +.governor-appeal p { + max-height: 400px; + line-height: 22px; +} + +.governor-appeal h3 { + font-size: 22px; +} diff --git a/src/components/carrierinfo.vue b/src/components/carrierinfo.vue index 263bc79..fdef0fa 100644 --- a/src/components/carrierinfo.vue +++ b/src/components/carrierinfo.vue @@ -589,7 +589,6 @@ clip-rule="evenodd" /> - При поддержке Правительства
Санкт-Петербурга
-
+

{{ governorAppealTitle }}

{{ governorAppealText }}

@@ -739,16 +738,17 @@ + diff --git a/src/components/stopinfo.vue b/src/components/stopinfo.vue index 220b988..39118ab 100644 --- a/src/components/stopinfo.vue +++ b/src/components/stopinfo.vue @@ -98,7 +98,7 @@
-
+
- +
{{ sight.name }}
@@ -167,8 +164,9 @@