Compare commits
No commits in common. "main" and "we-location-select" have entirely different histories.
main
...
we-locatio
5
package-lock.json
generated
5
package-lock.json
generated
@ -10111,11 +10111,6 @@
|
||||
"minimist": "^1.2.5"
|
||||
}
|
||||
},
|
||||
"moment": {
|
||||
"version": "2.29.1",
|
||||
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
|
||||
"integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
|
||||
},
|
||||
"move-concurrently": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
"@testing-library/react": "^11.1.2",
|
||||
"@testing-library/user-event": "^12.2.2",
|
||||
"axios": "^0.21.0",
|
||||
"moment": "^2.29.1",
|
||||
"react": "^17.0.1",
|
||||
"react-axios": "^2.0.3",
|
||||
"react-dom": "^17.0.1",
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
{
|
||||
"DepartureBoard": {
|
||||
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd",
|
||||
"servertime": "09:38",
|
||||
"serverdate": "2020-12-11",
|
||||
"Departures": [
|
||||
{
|
||||
"name": "Buss MEXP",
|
||||
"sname": "MEXP",
|
||||
"journeyNumber": "22",
|
||||
"type": "BUS",
|
||||
"stopid": "9022014014751002",
|
||||
"stop": "Guddeby",
|
||||
"time": "09:40",
|
||||
"date": "2020-12-11",
|
||||
"journeyid": "9015014621000022",
|
||||
"direction": "Marstrand",
|
||||
"track": "B",
|
||||
"rtTime": "09:44",
|
||||
"rtDate": "2020-12-11",
|
||||
"fgColor": "#006C93",
|
||||
"bgColor": "#FFFFFF",
|
||||
"stroke": "Solid",
|
||||
"accessibility": "wheelChair",
|
||||
"JourneyDetailRef": {
|
||||
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=715722%2F247121%2F629948%2F76401%2F80%3Fdate%3D2020-12-11%26station_evaId%3D14751002%26station_type%3Ddep%26format%3Djson%26"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Buss 927",
|
||||
"sname": "927",
|
||||
"journeyNumber": "2",
|
||||
"type": "BUS",
|
||||
"stopid": "9022014014751002",
|
||||
"stop": "Guddeby",
|
||||
"time": "12:29",
|
||||
"date": "2020-12-11",
|
||||
"journeyid": "9015014692700002",
|
||||
"direction": "Tjuvkil",
|
||||
"track": "B",
|
||||
"rtTime": "12:30",
|
||||
"rtDate": "2020-12-11",
|
||||
"fgColor": "#006C93",
|
||||
"bgColor": "#FFFFFF",
|
||||
"stroke": "Solid",
|
||||
"accessibility": "wheelChair",
|
||||
"JourneyDetailRef": {
|
||||
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=286581%2F125303%2F109682%2F40686%2F80%3Fdate%3D2020-12-11%26station_evaId%3D14751002%26station_type%3Ddep%26format%3Djson%26"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
@ -1,53 +0,0 @@
|
||||
{
|
||||
"DepartureBoard": {
|
||||
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd",
|
||||
"servertime": "09:41",
|
||||
"serverdate": "2020-12-11",
|
||||
"Departures": [
|
||||
{
|
||||
"name": "Buss MEXP",
|
||||
"sname": "MEXP",
|
||||
"journeyNumber": "22",
|
||||
"type": "BUS",
|
||||
"stopid": "9022014014010002",
|
||||
"stop": "Hålta kyrka",
|
||||
"time": "09:47",
|
||||
"date": "2020-12-11",
|
||||
"journeyid": "9015014621000022",
|
||||
"direction": "Marstrand",
|
||||
"track": "B",
|
||||
"rtTime": "09:50",
|
||||
"rtDate": "2020-12-11",
|
||||
"fgColor": "#006C93",
|
||||
"bgColor": "#FFFFFF",
|
||||
"stroke": "Solid",
|
||||
"accessibility": "wheelChair",
|
||||
"JourneyDetailRef": {
|
||||
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=514476%2F180039%2F54148%2F144419%2F80%3Fdate%3D2020-12-11%26station_evaId%3D14010002%26station_type%3Ddep%26format%3Djson%26"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Buss 927",
|
||||
"sname": "927",
|
||||
"journeyNumber": "2",
|
||||
"type": "BUS",
|
||||
"stopid": "9022014014010002",
|
||||
"stop": "Hålta kyrka",
|
||||
"time": "12:38",
|
||||
"date": "2020-12-11",
|
||||
"journeyid": "9015014692700002",
|
||||
"direction": "Tjuvkil",
|
||||
"track": "B",
|
||||
"rtTime": "12:38",
|
||||
"rtDate": "2020-12-11",
|
||||
"fgColor": "#006C93",
|
||||
"bgColor": "#FFFFFF",
|
||||
"stroke": "Solid",
|
||||
"accessibility": "wheelChair",
|
||||
"JourneyDetailRef": {
|
||||
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=667647%2F252325%2F917844%2F236373%2F80%3Fdate%3D2020-12-11%26station_evaId%3D14010002%26station_type%3Ddep%26format%3Djson%26"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
@ -1,53 +0,0 @@
|
||||
{
|
||||
"DepartureBoard": {
|
||||
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd",
|
||||
"servertime": "09:44",
|
||||
"serverdate": "2020-12-11",
|
||||
"Departures": [
|
||||
{
|
||||
"name": "Buss MEXP",
|
||||
"sname": "MEXP",
|
||||
"journeyNumber": "22",
|
||||
"type": "BUS",
|
||||
"stopid": "9022014014614002",
|
||||
"stop": "Stenskärsvägen",
|
||||
"time": "09:52",
|
||||
"date": "2020-12-11",
|
||||
"journeyid": "9015014621000022",
|
||||
"direction": "Marstrand",
|
||||
"track": "B",
|
||||
"rtTime": "09:57",
|
||||
"rtDate": "2020-12-11",
|
||||
"fgColor": "#006C93",
|
||||
"bgColor": "#FFFFFF",
|
||||
"stroke": "Solid",
|
||||
"accessibility": "wheelChair",
|
||||
"JourneyDetailRef": {
|
||||
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=341064%2F122235%2F154456%2F36461%2F80%3Fdate%3D2020-12-11%26station_evaId%3D14614002%26station_type%3Ddep%26format%3Djson%26"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Buss 320",
|
||||
"sname": "320",
|
||||
"journeyNumber": "10",
|
||||
"type": "BUS",
|
||||
"stopid": "9022014014614002",
|
||||
"stop": "Stenskärsvägen",
|
||||
"time": "10:44",
|
||||
"date": "2020-12-11",
|
||||
"journeyid": "9015014632000010",
|
||||
"direction": "Tjuvkil",
|
||||
"track": "B",
|
||||
"rtTime": "10:44",
|
||||
"rtDate": "2020-12-11",
|
||||
"fgColor": "#006C93",
|
||||
"bgColor": "#FFFFFF",
|
||||
"stroke": "Solid",
|
||||
"accessibility": "wheelChair",
|
||||
"JourneyDetailRef": {
|
||||
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=931884%2F318653%2F795430%2F87087%2F80%3Fdate%3D2020-12-11%26station_evaId%3D14614002%26station_type%3Ddep%26format%3Djson%26"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
{
|
||||
"DepartureBoard": {
|
||||
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd",
|
||||
"servertime": "09:45",
|
||||
"serverdate": "2020-12-11",
|
||||
"Departures": [{
|
||||
"name": "Buss 928",
|
||||
"sname": "928",
|
||||
"journeyNumber": "10",
|
||||
"type": "BUS",
|
||||
"stopid": "9022014014225001",
|
||||
"stop": "Skrämmenborg",
|
||||
"time": "15:19",
|
||||
"date": "2020-12-11",
|
||||
"journeyid": "9015014692800010",
|
||||
"direction": "Kärna",
|
||||
"track": "A",
|
||||
"rtTime": "15:19",
|
||||
"rtDate": "2020-12-11",
|
||||
"fgColor": "#006C93",
|
||||
"bgColor": "#FFFFFF",
|
||||
"stroke": "Solid",
|
||||
"accessibility": "wheelChair",
|
||||
"JourneyDetailRef": {
|
||||
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=110424%2F37130%2F997492%2F461938%2F80%3Fdate%3D2020-12-11%26station_evaId%3D14225001%26station_type%3Ddep%26format%3Djson%26"
|
||||
}
|
||||
}]
|
||||
}
|
||||
}
|
||||
@ -1,12 +1,15 @@
|
||||
{
|
||||
"situationNumber": "RT1",
|
||||
"severity":"normal",
|
||||
"title":"Nabbensbergsvägen närmast Edsvägen helt avstängd och trafiken hänvisas istället via Korsebergsvägen. Samtidigt tas den tillfälliga förbifarten bort på Edsvägen och trafiken kommer att ledas förbi den nya cirkulationsplatsen i de två västra körfälten tills arbetet på Nabbensbergsvägen är klart Hastighet: 50km/h",
|
||||
"time":"00:07",
|
||||
"title":"Stannar inte på dessa hållplatser",
|
||||
"affectedStopPoints":[
|
||||
{
|
||||
"gid": "9022014014614001",
|
||||
"name": "Stenskärsvägen"
|
||||
"gid": "9022014014020001",
|
||||
"name": "Ekelöv västra, Kungälv"
|
||||
},
|
||||
{
|
||||
"gid": "9022014014751001",
|
||||
"name": "Guddeby, Kungälv"
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -1,20 +1,11 @@
|
||||
{
|
||||
"situationNumber": "RT2",
|
||||
"severity":"normal",
|
||||
"title":"På grund av renovation av Nordreälvsbron i Kungälv från 10 november, 2019 till sommaren 2022 är det risk för förseningar på vissa Västtrafik bussar.",
|
||||
"time":"00:09",
|
||||
"title":"Försening",
|
||||
"affectedStopPoints":[
|
||||
{
|
||||
"gid": "9022014014751001",
|
||||
"name": "Guddeby"
|
||||
},
|
||||
{
|
||||
"gid": "9022014014010001",
|
||||
"name": "Hålta kyrka"
|
||||
},
|
||||
{
|
||||
"gid": "9022014014614001",
|
||||
"name": "Stenskärsvägen"
|
||||
"gid": "9021014014225000",
|
||||
"name": "Skrämmenborg, Kungälv"
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -1,35 +1,35 @@
|
||||
{
|
||||
"LocationList": {
|
||||
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd",
|
||||
"servertime": "09:34",
|
||||
"serverdate": "2020-12-11",
|
||||
"servertime": "16:48",
|
||||
"serverdate": "2020-12-09",
|
||||
"StopLocation": [
|
||||
{
|
||||
"name": "Guddeby",
|
||||
"id": "9022014014751001",
|
||||
"lat": "57.874665",
|
||||
"lon": "11.903884",
|
||||
"name": "Bollestadsvägen, Kungälv",
|
||||
"id": "9022014014754001",
|
||||
"lat": "57.888940",
|
||||
"lon": "11.885663",
|
||||
"track": "A"
|
||||
},
|
||||
{
|
||||
"name": "Guddeby",
|
||||
"id": "9021014014751000",
|
||||
"lat": "57.874710",
|
||||
"lon": "11.903929"
|
||||
"name": "Bollestadsvägen, Kungälv",
|
||||
"id": "9021014014754000",
|
||||
"lat": "57.889030",
|
||||
"lon": "11.885708"
|
||||
},
|
||||
{
|
||||
"name": "Guddeby",
|
||||
"id": "9022014014751002",
|
||||
"lat": "57.874746",
|
||||
"lon": "11.903965",
|
||||
"name": "Bollestadsvägen, Kungälv",
|
||||
"id": "9022014014754002",
|
||||
"lat": "57.889111",
|
||||
"lon": "11.885753",
|
||||
"track": "B"
|
||||
},
|
||||
{
|
||||
"name": "Stället",
|
||||
"id": "9022014014744001",
|
||||
"lat": "57.869784",
|
||||
"lon": "11.904172",
|
||||
"track": "A"
|
||||
"name": "Bredsten, Kungälv",
|
||||
"id": "9022014014753002",
|
||||
"lat": "57.886450",
|
||||
"lon": "11.889529",
|
||||
"track": "B"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -1,35 +1,35 @@
|
||||
{
|
||||
"LocationList": {
|
||||
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd",
|
||||
"servertime": "09:35",
|
||||
"serverdate": "2020-12-11",
|
||||
"servertime": "16:47",
|
||||
"serverdate": "2020-12-09",
|
||||
"StopLocation": [
|
||||
{
|
||||
"name": "Hålta kyrka",
|
||||
"id": "9022014014010001",
|
||||
"lat": "57.895125",
|
||||
"lon": "11.827854",
|
||||
"name": "Ekelöv västra, Kungälv",
|
||||
"id": "9022014014020001",
|
||||
"lat": "57.892527",
|
||||
"lon": "11.865321",
|
||||
"track": "A"
|
||||
},
|
||||
{
|
||||
"name": "Hålta kyrka",
|
||||
"id": "9021014014010000",
|
||||
"lat": "57.895206",
|
||||
"lon": "11.827647"
|
||||
"name": "Ekelöv västra, Kungälv",
|
||||
"id": "9021014014020000",
|
||||
"lat": "57.892608",
|
||||
"lon": "11.865312"
|
||||
},
|
||||
{
|
||||
"name": "Hålta kyrka",
|
||||
"id": "9022014014010002",
|
||||
"lat": "57.895278",
|
||||
"lon": "11.827440",
|
||||
"name": "Ekelöv västra, Kungälv",
|
||||
"id": "9022014014020002",
|
||||
"lat": "57.892689",
|
||||
"lon": "11.865285",
|
||||
"track": "B"
|
||||
},
|
||||
{
|
||||
"name": "Hålta skola",
|
||||
"id": "9022014014015001",
|
||||
"lat": "57.896015",
|
||||
"lon": "11.824555",
|
||||
"track": "A"
|
||||
"name": "Ekelöv östra, Kungälv",
|
||||
"id": "9022014014021002",
|
||||
"lat": "57.892994",
|
||||
"lon": "11.873923",
|
||||
"track": "B"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -1,35 +1,35 @@
|
||||
{
|
||||
"LocationList": {
|
||||
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd",
|
||||
"servertime": "09:36",
|
||||
"serverdate": "2020-12-11",
|
||||
"servertime": "16:45",
|
||||
"serverdate": "2020-12-09",
|
||||
"StopLocation": [
|
||||
{
|
||||
"name": "Stenskärsvägen",
|
||||
"id": "9022014014614001",
|
||||
"lat": "57.894594",
|
||||
"lon": "11.740128",
|
||||
"name": "Guddeby, Kungälv",
|
||||
"id": "9022014014751001",
|
||||
"lat": "57.874665",
|
||||
"lon": "11.903884",
|
||||
"track": "A"
|
||||
},
|
||||
{
|
||||
"name": "Stenskärsvägen",
|
||||
"id": "9022014014614002",
|
||||
"lat": "57.894729",
|
||||
"lon": "11.739984",
|
||||
"name": "Guddeby, Kungälv",
|
||||
"id": "9021014014751000",
|
||||
"lat": "57.874710",
|
||||
"lon": "11.903929"
|
||||
},
|
||||
{
|
||||
"name": "Guddeby, Kungälv",
|
||||
"id": "9022014014751002",
|
||||
"lat": "57.874746",
|
||||
"lon": "11.903965",
|
||||
"track": "B"
|
||||
},
|
||||
{
|
||||
"name": "Stenskärsvägen",
|
||||
"id": "9021014014614000",
|
||||
"lat": "57.894738",
|
||||
"lon": "11.739858"
|
||||
},
|
||||
{
|
||||
"name": "Tjuvkilsboden",
|
||||
"id": "9022014014615002",
|
||||
"lat": "57.892743",
|
||||
"lon": "11.743490",
|
||||
"track": "B"
|
||||
"name": "Stället, Kungälv",
|
||||
"id": "9022014014744001",
|
||||
"lat": "57.869784",
|
||||
"lon": "11.904172",
|
||||
"track": "A"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -1,34 +1,34 @@
|
||||
{
|
||||
"LocationList": {
|
||||
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd",
|
||||
"servertime": "09:37",
|
||||
"serverdate": "2020-12-11",
|
||||
"servertime": "16:44",
|
||||
"serverdate": "2020-12-09",
|
||||
"StopLocation": [
|
||||
{
|
||||
"name": "Kuröd",
|
||||
"id": "9022014014762001",
|
||||
"lat": "57.856687",
|
||||
"lon": "11.864727",
|
||||
"name": "Skrämmenborg, Kungälv",
|
||||
"id": "9021014014225000",
|
||||
"lat": "57.863528",
|
||||
"lon": "11.867406"
|
||||
},
|
||||
{
|
||||
"name": "Skrämmenborg, Kungälv",
|
||||
"id": "9022014014225001",
|
||||
"lat": "57.863528",
|
||||
"lon": "11.867406",
|
||||
"track": "A"
|
||||
},
|
||||
{
|
||||
"name": "Kuröd",
|
||||
"id": "9021014014762000",
|
||||
"lat": "57.856831",
|
||||
"lon": "11.864260"
|
||||
},
|
||||
{
|
||||
"name": "Kuröd",
|
||||
"name": "Kuröd, Kungälv",
|
||||
"id": "9022014014762002",
|
||||
"lat": "57.856966",
|
||||
"lon": "11.863774",
|
||||
"track": "B"
|
||||
},
|
||||
{
|
||||
"name": "Skrämmenborg",
|
||||
"id": "9021014014225000",
|
||||
"lat": "57.863528",
|
||||
"lon": "11.867406"
|
||||
"name": "Kuröd, Kungälv",
|
||||
"id": "9021014014762000",
|
||||
"lat": "57.856831",
|
||||
"lon": "11.864260"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "Användare 1",
|
||||
"name":"1",
|
||||
"deviceId":"1",
|
||||
"stoppointgid": "9022014014751001"
|
||||
"stoppointgid":"9022014014754001"
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "Användare 2",
|
||||
"name":"2",
|
||||
"deviceId":"2",
|
||||
"stoppointgid": "9022014014010001"
|
||||
"stoppointgid":"9022014014020001"
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "Användare 3",
|
||||
"name":"3",
|
||||
"deviceId":"3",
|
||||
"stoppointgid": "9022014014614001"
|
||||
"stoppointgid":"9022014014751001"
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "Användare 4",
|
||||
"name":"4",
|
||||
"deviceId":"4",
|
||||
"stoppointgid": "9022014014762001"
|
||||
"stoppointgid":"9021014014225000"
|
||||
}
|
||||
46
src/App.js
46
src/App.js
@ -2,12 +2,12 @@ import "./variables.css";
|
||||
import "./App.css";
|
||||
|
||||
import React, { Component } from "react";
|
||||
import { BrowserRouter as Router, Route, Link } from "react-router-dom";
|
||||
import Snackbar from "@material-ui/core/Snackbar";
|
||||
import IconButton from "@material-ui/core/IconButton";
|
||||
import { BrowserRouter as Router, Route } from "react-router-dom";
|
||||
|
||||
import globalData from './GlobalData.js';
|
||||
import BottomMenu from "./components/BottomMenu.js";
|
||||
import NearbyStation from "./components/NearbyStation.js";
|
||||
import Disruption from "./components/Disruption.js";
|
||||
import StationDisruption from "./components/StationDisruption.js";
|
||||
|
||||
import Tickets from "./components/pages/Tickets.js";
|
||||
import TicketsBuy from "./components/pages/TicketsBuy.js";
|
||||
@ -15,21 +15,9 @@ import Travel from "./components/pages/Travel.js";
|
||||
import TrafficInfo from "./components/pages/TrafficInfo.js";
|
||||
|
||||
import "./variables.css";
|
||||
import warningIcon from './img/warning.svg';
|
||||
import closeIcon from './img/close.svg';
|
||||
|
||||
|
||||
class App extends Component {
|
||||
currentPageName = () => {
|
||||
if (globalData.currentPage.constructor !== undefined)
|
||||
return globalData.currentPage.constructor.name;
|
||||
else
|
||||
return "";
|
||||
};
|
||||
|
||||
render() {
|
||||
globalData.root = this;
|
||||
|
||||
return (
|
||||
<Router>
|
||||
<div className="App">
|
||||
@ -40,32 +28,6 @@ class App extends Component {
|
||||
<Route path="/traffic" exact component={TrafficInfo} />
|
||||
|
||||
<BottomMenu />
|
||||
|
||||
<Snackbar
|
||||
anchorOrigin={{ vertical: "bottom", horizontal: "center" }}
|
||||
open={globalData.snackbarVisible}
|
||||
autoHideDuration={3000}
|
||||
onClose={() => globalData.snackbarVisible = false}
|
||||
message={
|
||||
<div id="snackDisruptInfo">
|
||||
<img src={warningIcon} alt="" />
|
||||
<span id="message-id">Trafikstörning upptäckt</span>
|
||||
</div>
|
||||
}
|
||||
action={[
|
||||
<IconButton
|
||||
key="close"
|
||||
aria-label="Close"
|
||||
color="inherit"
|
||||
onClick={() => { globalData.snackbarVisible = false; globalData.root.forceUpdate() }}
|
||||
>
|
||||
{this.currentPageName() !== "TrafficInfo" &&
|
||||
<Link to="/traffic">Visa trafikinfo</Link>
|
||||
}
|
||||
<img src={closeIcon} alt="" />
|
||||
</IconButton>,
|
||||
]}
|
||||
/>
|
||||
</div>
|
||||
</Router>
|
||||
);
|
||||
|
||||
@ -4,18 +4,16 @@ import Coordinates from './classes/Coordinates.js';
|
||||
import Stop from './classes/Stop.js'
|
||||
|
||||
let globalData = {
|
||||
users : [],
|
||||
user: new User(
|
||||
"Exempelanvändare",
|
||||
"test",
|
||||
"123",
|
||||
new Coordinates(),
|
||||
"123"
|
||||
"9022014014020001"
|
||||
),
|
||||
disruption: new Disruption(
|
||||
),
|
||||
stop: new Stop(
|
||||
),
|
||||
currentPage: ""
|
||||
)
|
||||
};
|
||||
|
||||
export default globalData;
|
||||
@ -12,6 +12,7 @@ class AccessToken {
|
||||
|
||||
axios.post('https://api.vasttrafik.se/token','grant_type=client_credentials&scope=device_'+this.device, {headers} )
|
||||
.then(response => {
|
||||
console.log(response);
|
||||
this.token = response.data.access_token
|
||||
});
|
||||
}
|
||||
|
||||
@ -9,15 +9,15 @@
|
||||
*/
|
||||
|
||||
class Departure {
|
||||
constructor(lineName, finalStop, originalTime) {
|
||||
this.sname = lineName;
|
||||
this.direction = finalStop;
|
||||
this.time = originalTime;
|
||||
constructor(lineName, finalStop, originalTime, trafficInfo) {
|
||||
this.lineName = lineName;
|
||||
this.finalStop = finalStop;
|
||||
this.originalTime = originalTime;
|
||||
this.trafficInfo = trafficInfo;
|
||||
}
|
||||
|
||||
timeUpdate(time, trafficInfo) {
|
||||
timeUpdate(time) {
|
||||
this.newTime = time;
|
||||
this.trafficInfo = trafficInfo;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -4,16 +4,14 @@
|
||||
name : String (Användarnamn)
|
||||
deviceId : Int (Enhetens ID)
|
||||
location : Coordinates (Användarens koordinater)
|
||||
track : String (Nuvarande hållplatsläge)
|
||||
*/
|
||||
|
||||
class User {
|
||||
constructor(name, deviceId, location, stoppointgid, track) {
|
||||
constructor(name, deviceId, location, stoppointgid) {
|
||||
this.name = name;
|
||||
this.deviceId = deviceId;
|
||||
this.location = location;
|
||||
this.stoppointgid = stoppointgid;
|
||||
this.track = track;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -21,9 +21,12 @@ class Diruption extends React.Component {
|
||||
'Authorization': 'Bearer ' + this.state.tokenClass.token
|
||||
};
|
||||
|
||||
console.log('Attempted connection')
|
||||
|
||||
axios.get('https://api.vasttrafik.se/ts/v1/traffic-situations/stoppoint/'+this.state.gid, { headers })
|
||||
//axios.get('https://api.vasttrafik.se/ts/v1/traffic-situations/stoppoint/9022014005700002', { headers })
|
||||
.then(response => {
|
||||
console.log(response)
|
||||
this.setState({
|
||||
disruptions: response.data
|
||||
})
|
||||
|
||||
@ -1,124 +1,54 @@
|
||||
import moment from "moment";
|
||||
import addNotification from "react-push-notification";
|
||||
|
||||
import globalData from '../GlobalData.js';
|
||||
import Button from './Button.js';
|
||||
|
||||
import user1 from '../APIexamples/user1.json'
|
||||
import user2 from '../APIexamples/user2.json'
|
||||
import user3 from '../APIexamples/user3.json'
|
||||
import user4 from '../APIexamples/user4.json'
|
||||
|
||||
import locationuser1 from '../APIexamples/locationuser1.json'
|
||||
import locationuser2 from '../APIexamples/locationuser2.json'
|
||||
import locationuser3 from '../APIexamples/locationuser3.json'
|
||||
import locationuser4 from '../APIexamples/locationuser4.json'
|
||||
|
||||
import departureuser1 from '../APIexamples/departureuser1.json'
|
||||
import departureuser2 from '../APIexamples/departureuser2.json'
|
||||
import departureuser3 from '../APIexamples/departureuser3.json'
|
||||
import departureuser4 from '../APIexamples/departureuser4.json'
|
||||
import globData from '../GlobalData.js';
|
||||
|
||||
import ex1 from '../APIexamples/disruption1.json'
|
||||
import ex2 from '../APIexamples/disruption2.json'
|
||||
|
||||
import Button from './Button.js';
|
||||
import disruptIcon from '../img/flash.svg';
|
||||
|
||||
class DisruptionButton extends Button {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.state = {
|
||||
state = {
|
||||
jsonLocation: this.props.path,
|
||||
disruption: "",
|
||||
u1: user1,
|
||||
u2: user2,
|
||||
u3: user3,
|
||||
u4: user4,
|
||||
};
|
||||
disruption: ""
|
||||
}
|
||||
|
||||
updatePage = () => {
|
||||
globalData.currentPage.forceUpdate();
|
||||
}
|
||||
|
||||
showMomentTime = (time) => {
|
||||
return (time.format("HH:mm"))
|
||||
}
|
||||
|
||||
genUsers = () => {
|
||||
if (globalData.users.length < 2) {
|
||||
this.state.first = true;
|
||||
this.state.u1.stop = locationuser1.LocationList.StopLocation[0];
|
||||
this.state.u1.stop.departures = departureuser1.DepartureBoard.Departures;
|
||||
this.state.u2.stop = locationuser2.LocationList.StopLocation[0];
|
||||
this.state.u2.stop.departures = departureuser2.DepartureBoard.Departures;
|
||||
this.state.u3.stop = locationuser3.LocationList.StopLocation[0];
|
||||
this.state.u3.stop.departures = departureuser3.DepartureBoard.Departures;
|
||||
this.state.u4.stop = locationuser4.LocationList.StopLocation[0];
|
||||
this.state.u4.stop.departures = departureuser4.DepartureBoard.Departures;
|
||||
globalData.users = [
|
||||
this.state.u1,
|
||||
this.state.u2,
|
||||
this.state.u3,
|
||||
this.state.u4
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
genDisrupt = () => {
|
||||
this.genUsers()
|
||||
|
||||
this.state.disruption = undefined
|
||||
this.state.disruption = ""
|
||||
if(this.state.jsonLocation === "ex1"){
|
||||
for (let stopPoint of ex1.affectedStopPoints) {
|
||||
for (let user of globalData.users) {
|
||||
if (stopPoint.gid === user.stoppointgid) {
|
||||
this.state.disruption = ex1;
|
||||
var old1t = moment(user.stop.departures[0].time, "HH:mm");
|
||||
old1t.add(ex1.time, "HH:mm");
|
||||
user.stop.departures[0].newTime = this.showMomentTime(old1t);
|
||||
user.stop.departures[0].trafficInfo = ex1.title;
|
||||
}
|
||||
}
|
||||
if (stopPoint.gid === globalData.user.stoppointgid) {
|
||||
this.state.disruption = ex1;
|
||||
var old2t = moment(globalData.stop.departures[0].time, "HH:mm");
|
||||
old2t.add(ex1.time, "HH:mm");
|
||||
globalData.stop.departures[0].newTime = this.showMomentTime(old2t);
|
||||
globalData.stop.departures[0].trafficInfo = ex1.title;
|
||||
globalData.snackbarVisible = true; globalData.root.forceUpdate();
|
||||
if(stopPoint.gid === globData.user.stoppointgid){
|
||||
this.state.disruption = ex1
|
||||
}
|
||||
}
|
||||
} else if (this.state.jsonLocation === "ex2"){
|
||||
for (let stopPoint of ex2.affectedStopPoints) {
|
||||
for (let user of globalData.users) {
|
||||
if (stopPoint.gid === user.stoppointgid) {
|
||||
this.state.disruption = ex2;
|
||||
var old3t = moment(user.stop.departures[0].time, "HH:mm");
|
||||
old3t.add(ex2.time, "HH:mm");
|
||||
user.stop.departures[0].newTime = this.showMomentTime(old3t);
|
||||
user.stop.departures[0].trafficInfo = ex2.title;
|
||||
}
|
||||
}
|
||||
if (stopPoint.gid === globalData.user.stoppointgid) {
|
||||
this.state.disruption = ex2;
|
||||
var old4t = moment(globalData.stop.departures[0].time, "HH:mm");
|
||||
old4t.add(ex2.time, "HH:mm");
|
||||
globalData.stop.departures[0].newTime = this.showMomentTime(old4t);
|
||||
globalData.stop.departures[0].trafficInfo = ex2.title;
|
||||
globalData.snackbarVisible = true; globalData.root.forceUpdate();
|
||||
if(stopPoint.gid === globData.user.stoppointgid){
|
||||
this.state.disruption = ex2
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
globalData.disruption = this.state.disruption
|
||||
console.log(this.state.disruption)
|
||||
globData.disruption = this.state.disruption
|
||||
|
||||
addNotification({
|
||||
title: "Warning",
|
||||
subtitle: "This is a subtitle",
|
||||
message: "This is a very long message",
|
||||
theme: "blue",
|
||||
native: true, // when using native, your OS will handle theming.
|
||||
});
|
||||
}
|
||||
|
||||
render() {
|
||||
return (
|
||||
<div>
|
||||
<Button onClick={this.props.onClick.concat([this.genDisrupt, this.updatePage])} className="disruptBtn">
|
||||
{this.props.children}
|
||||
<Button onClick={this.props.onClick.concat([this.genDisrupt])} className="disruptBtn">
|
||||
<img src={disruptIcon} alt="" />
|
||||
<span>Generera Störning</span>
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
|
||||
import globalData from '../GlobalData.js';
|
||||
import globData from '../GlobalData.js';
|
||||
|
||||
import locationuser1 from '../APIexamples/locationuser1.json'
|
||||
import locationuser2 from '../APIexamples/locationuser2.json'
|
||||
@ -15,13 +15,13 @@ class FindStops extends Button {
|
||||
locations : []
|
||||
}
|
||||
findStops = () => {
|
||||
if(globalData.user.deviceId === "1"){
|
||||
if(globData.user.deviceId === "1"){
|
||||
this.state.locations = locationuser1.LocationList.StopLocation
|
||||
}else if (globalData.user.deviceId === "2"){
|
||||
}else if (globData.user.deviceId === "2"){
|
||||
this.state.locations = locationuser2.LocationList.StopLocation
|
||||
}else if (globalData.user.deviceId === "3"){
|
||||
}else if (globData.user.deviceId === "3"){
|
||||
this.state.locations = locationuser3.LocationList.StopLocation
|
||||
}else if (globalData.user.deviceId === "4"){
|
||||
}else if (globData.user.deviceId === "4"){
|
||||
this.state.locations = locationuser4.LocationList.StopLocation
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,14 +5,14 @@ class MenuButton extends Button {
|
||||
render() {
|
||||
if (this.props.childOrderReverse) {
|
||||
return (
|
||||
<Button className="menuButton">
|
||||
<Button>
|
||||
<span>{this.props.label}</span>
|
||||
<img src={this.props.icon} alt="" />
|
||||
</Button>
|
||||
);
|
||||
} else {
|
||||
return (
|
||||
<Button className="menuButton">
|
||||
<Button>
|
||||
<img src={this.props.icon} alt="" />
|
||||
<span>{this.props.label}</span>
|
||||
</Button>
|
||||
|
||||
@ -9,7 +9,7 @@ import Button from './Button.js';
|
||||
import './css/NavigationDrawer.css';
|
||||
|
||||
import userIcon from '../img/user.svg';
|
||||
import disruptIcon from '../img/flash.svg';
|
||||
import FindStops from './FindStops.js';
|
||||
|
||||
|
||||
class NavigationDrawer extends Component {
|
||||
@ -45,22 +45,16 @@ class NavigationDrawer extends Component {
|
||||
this.popupElem.current.show();
|
||||
};
|
||||
|
||||
hidePopup = () => {
|
||||
this.popupElem.current.hide();
|
||||
};
|
||||
|
||||
updatePage = () => {
|
||||
globalData.currentPage.render();
|
||||
}
|
||||
|
||||
render() {
|
||||
return (
|
||||
<>
|
||||
<Popup ref={this.popupElem}>
|
||||
<h3>Välj scenario:</h3>
|
||||
<h3>Välj hållplats:</h3>
|
||||
<ul>
|
||||
<li><DisruptionButton path={"ex1"} onClick={[this.hidePopup]}>Störningsscenario 1</DisruptionButton></li>
|
||||
<li><DisruptionButton path={"ex2"} onClick={[this.hidePopup]}>Störningsscenario 2</DisruptionButton></li>
|
||||
<li><Button>Hållplats 1</Button></li>
|
||||
<li><Button>Hållplats 2</Button></li>
|
||||
<li><Button>Hållplats 3</Button></li>
|
||||
<li><Button>Hållplats 4</Button></li>
|
||||
</ul>
|
||||
</Popup>
|
||||
|
||||
@ -71,11 +65,13 @@ class NavigationDrawer extends Component {
|
||||
<span>example@gmail.com</span>
|
||||
</header>
|
||||
<div id="navList">
|
||||
<SelectUserButton path={"user1"} username="Guddeby"/>
|
||||
<SelectUserButton path={"user2"} username="Hålta kyrka"/>
|
||||
<SelectUserButton path={"user3"} username="Stenskärsvägen"/>
|
||||
<SelectUserButton path={"user4"} username="Kuröd"/>
|
||||
<Button onClick={[this.showPopup, this.close]} className="disruptBtn"><img src={disruptIcon} alt="" />Generera Störning</Button>
|
||||
<SelectUserButton path={"user1"} username="user1"/>
|
||||
<SelectUserButton path={"user2"} username="user2"/>
|
||||
<SelectUserButton path={"user3"} username="user3"/>
|
||||
<SelectUserButton path={"user4"} username="user4"/>
|
||||
<FindStops/>
|
||||
<DisruptionButton path={"ex1"} onClick={[this.showPopup, this.close]} />
|
||||
<DisruptionButton path={"ex2"} onClick={[this.showPopup, this.close]} />
|
||||
</div>
|
||||
<hr />
|
||||
<span id="version">Projektgrupp 3 - Utmaning 7</span>
|
||||
|
||||
@ -28,8 +28,11 @@ class NearbyStation extends React.Component {
|
||||
'Authorization': 'Bearer ' + this.state.tokenClass.token
|
||||
};
|
||||
|
||||
console.log('Attempted connection')
|
||||
|
||||
axios.get('https://api.vasttrafik.se/bin/rest.exe/v2/location.nearbystops?originCoordLat='+this.state.lat+'&originCoordLong='+this.state.long+'&maxNo=5&format=json', { headers })
|
||||
.then(response => {
|
||||
console.log(response.data.LocationList.StopLocation)
|
||||
this.setState({
|
||||
stops: response.data.LocationList.StopLocation,
|
||||
})
|
||||
|
||||
@ -1,90 +1,36 @@
|
||||
import globalData from '../GlobalData.js';
|
||||
|
||||
import globData from '../GlobalData.js';
|
||||
|
||||
import user1 from '../APIexamples/user1.json'
|
||||
import user2 from '../APIexamples/user2.json'
|
||||
import user3 from '../APIexamples/user3.json'
|
||||
import user4 from '../APIexamples/user4.json'
|
||||
|
||||
import locationuser1 from '../APIexamples/locationuser1.json'
|
||||
import locationuser2 from '../APIexamples/locationuser2.json'
|
||||
import locationuser3 from '../APIexamples/locationuser3.json'
|
||||
import locationuser4 from '../APIexamples/locationuser4.json'
|
||||
|
||||
import departureuser1 from '../APIexamples/departureuser1.json'
|
||||
import departureuser2 from '../APIexamples/departureuser2.json'
|
||||
import departureuser3 from '../APIexamples/departureuser3.json'
|
||||
import departureuser4 from '../APIexamples/departureuser4.json'
|
||||
|
||||
import Button from './Button.js';
|
||||
import userIcon from '../img/userDark.svg';
|
||||
|
||||
import disruptIcon from '../img/flash.svg';
|
||||
|
||||
class SelectUserButton extends Button {
|
||||
state = {
|
||||
first: false,
|
||||
u1: user1,
|
||||
u2: user2,
|
||||
u3: user3,
|
||||
u4: user4,
|
||||
}
|
||||
|
||||
genUsers = () => {
|
||||
if (globalData.users.length < 2) {
|
||||
this.state.first = true;
|
||||
this.state.u1.stop = locationuser1.LocationList.StopLocation[0];
|
||||
this.state.u1.stop.departures = departureuser1.DepartureBoard.Departures;
|
||||
this.state.u2.stop = locationuser2.LocationList.StopLocation[0];
|
||||
this.state.u2.stop.departures = departureuser2.DepartureBoard.Departures;
|
||||
this.state.u3.stop = locationuser3.LocationList.StopLocation[0];
|
||||
this.state.u3.stop.departures = departureuser3.DepartureBoard.Departures;
|
||||
this.state.u4.stop = locationuser4.LocationList.StopLocation[0];
|
||||
this.state.u4.stop.departures = departureuser4.DepartureBoard.Departures;
|
||||
globalData.users = [
|
||||
this.state.u1,
|
||||
this.state.u2,
|
||||
this.state.u3,
|
||||
this.state.u4
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
selectUser = () => {
|
||||
this.genUsers()
|
||||
if(this.props.path === "user1"){
|
||||
globalData.user = user1
|
||||
globalData.user.track = locationuser1.LocationList.StopLocation[0].track
|
||||
globalData.stop = locationuser1.LocationList.StopLocation[0]
|
||||
globalData.stop.departures = departureuser1.DepartureBoard.Departures
|
||||
globData.user = user1
|
||||
}else if (this.props.path === "user2"){
|
||||
globalData.user = user2
|
||||
globalData.user.track = locationuser2.LocationList.StopLocation[0].track
|
||||
globalData.stop = locationuser2.LocationList.StopLocation[0]
|
||||
globalData.stop.departures = departureuser2.DepartureBoard.Departures
|
||||
globData.user = user2
|
||||
}else if (this.props.path === "user3"){
|
||||
globalData.user = user3
|
||||
globalData.user.track = locationuser3.LocationList.StopLocation[0].track
|
||||
globalData.stop = locationuser3.LocationList.StopLocation[0]
|
||||
globalData.stop.departures = departureuser3.DepartureBoard.Departures
|
||||
globData.user = user3
|
||||
}else if (this.props.path === "user4"){
|
||||
globalData.user = user4
|
||||
globalData.user.track = locationuser4.LocationList.StopLocation[0].track
|
||||
globalData.stop = locationuser4.LocationList.StopLocation[0]
|
||||
globalData.stop.departures = departureuser4.DepartureBoard.Departures
|
||||
globData.user = user4
|
||||
}
|
||||
}
|
||||
|
||||
updatePage = () => {
|
||||
globalData.currentPage.forceUpdate();
|
||||
}
|
||||
|
||||
render() {
|
||||
return (
|
||||
<Button onClick={[this.selectUser, this.updatePage]} className="disruptBtn">
|
||||
<img src={userIcon} alt="" />
|
||||
{this.props.username}
|
||||
<Button onClick={[this.selectUser]} className="disruptBtn">
|
||||
<img src={disruptIcon} alt="" />
|
||||
<span>{this.props.username}</span>
|
||||
</Button>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export default SelectUserButton;
|
||||
|
||||
@ -23,11 +23,14 @@ class StationDisruption extends React.Component {
|
||||
'Authorization': 'Bearer ' + this.state.tokenClass.token
|
||||
};
|
||||
|
||||
console.log('Attempted connection')
|
||||
axios.get('https://api.vasttrafik.se/bin/rest.exe/v2/location.nearbystops?originCoordLat='+this.state.lat+'&originCoordLong='+this.state.long+'&maxNo=5&format=json', { headers })
|
||||
.then(response => {
|
||||
console.log(response.data.LocationList.StopLocation)
|
||||
})
|
||||
axios.get('https://api.vasttrafik.se/ts/v1/traffic-situations/stoppoint/'+this.state.gid, { headers })
|
||||
.then(response => {
|
||||
console.log(response)
|
||||
this.setState({
|
||||
disruptions: response.data
|
||||
})
|
||||
|
||||
@ -1,69 +1,16 @@
|
||||
import React, { Component } from 'react';
|
||||
|
||||
import Button from './Button.js';
|
||||
import Popup from './Popup.js';
|
||||
import globalData from '../GlobalData.js';
|
||||
|
||||
import './css/StopTitle.css';
|
||||
|
||||
|
||||
class StopTitle extends Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.popupElem = React.createRef();
|
||||
}
|
||||
|
||||
showPopup = () => {
|
||||
this.popupElem.current.show();
|
||||
};
|
||||
|
||||
hidePopup = () => {
|
||||
this.popupElem.current.hide();
|
||||
};
|
||||
|
||||
setTrackA = () => {
|
||||
globalData.user.track = "A";
|
||||
};
|
||||
|
||||
setTrackB = () => {
|
||||
globalData.user.track = "B";
|
||||
};
|
||||
|
||||
updatePage = () => {
|
||||
globalData.currentPage.forceUpdate();
|
||||
}
|
||||
|
||||
render() {
|
||||
return (
|
||||
<div id="stopTitle">
|
||||
<Popup ref={this.popupElem} className="">
|
||||
<h3>Välj läge:</h3>
|
||||
<ul>
|
||||
<>
|
||||
<li><Button onClick={[this.setTrackA, this.updatePage, this.hidePopup]}>{"Läge A"}</Button></li>
|
||||
<li><Button onClick={[this.setTrackB, this.updatePage, this.hidePopup]}>{"Läge B"}</Button></li>
|
||||
</>
|
||||
</ul>
|
||||
</Popup>
|
||||
|
||||
<h1>{this.props.stop.name !== undefined ?
|
||||
this.props.stop.name
|
||||
: "Hållplats saknas"
|
||||
}</h1>
|
||||
|
||||
{this.props.stop.name !== undefined && this.props.stop.track !== undefined ?
|
||||
<h1>{this.props.stop.name}</h1>
|
||||
<div>
|
||||
<h3>
|
||||
<span>{"Läge " + globalData.user.track}</span>
|
||||
</h3>
|
||||
<Button className="changeTrackBtn" onClick={[this.showPopup]}>Byt Läge</Button>
|
||||
<h3>{this.props.stop.locations[0]}</h3>
|
||||
<button>Byt Läge</button>
|
||||
</div>
|
||||
:
|
||||
(this.props.stop.name !== undefined ?
|
||||
<></>
|
||||
: <h3>Vänligen aktivera platsåtkomst</h3>
|
||||
)
|
||||
}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@ -39,13 +39,13 @@ class TrafficEntry extends Component {
|
||||
<div>
|
||||
<div className="timeColumn">
|
||||
{!lineInterference &&
|
||||
<span>{this.props.departure.time}</span>
|
||||
<span>{this.props.departure.originalTime}</span>
|
||||
}
|
||||
{lineInterference &&
|
||||
<>
|
||||
<div style={{display: "flex", flexDirection: "column"}}>
|
||||
<span style={{color: "red", fontWeight: "bold"}}>{this.props.departure.newTime}</span>
|
||||
<span style={{textDecoration: "line-through"}}>{this.props.departure.time}</span>
|
||||
<span style={{textDecoration: "line-through"}}>{this.props.departure.originalTime}</span>
|
||||
</div>
|
||||
<img src={warningIcon} alt=""></img>
|
||||
</>
|
||||
@ -53,16 +53,13 @@ class TrafficEntry extends Component {
|
||||
</div>
|
||||
<div className="lineColumn">
|
||||
<div>
|
||||
<span className="lineName">{this.props.departure.sname}</span>
|
||||
<span className="lineName">{this.props.departure.lineName}</span>
|
||||
<img src={busIcon} alt=""></img>
|
||||
<span className="destination">{"Mot " + this.props.departure.direction}</span>
|
||||
<span className="destination">{"Mot " + this.props.departure.finalStop}</span>
|
||||
</div>
|
||||
{lineInterference &&
|
||||
<div className="infoWrapper" onClick={this.toggle}>
|
||||
<p className={`${this.state.expanded ? "expanded" : ""}`}>
|
||||
{trafficInfo}
|
||||
<span style={{display: (this.state.expanded ? "inline" : "none"), marginLeft: "5px" }}><u>Visa mindre</u></span>
|
||||
</p>
|
||||
<p className={`${this.state.expanded ? "expanded" : ""}`}>{trafficInfo}</p>
|
||||
<span style={{display: (this.state.expanded ? "none" : "block") }}><u>Visa mer</u></span>
|
||||
</div>
|
||||
}
|
||||
@ -72,7 +69,7 @@ class TrafficEntry extends Component {
|
||||
{lineInterference &&
|
||||
<Link to={
|
||||
{ pathname: "/travel"
|
||||
, to: this.props.departure.direction
|
||||
, to: this.props.departure.finalStop
|
||||
}
|
||||
}>Hitta annan resväg</Link>
|
||||
}
|
||||
|
||||
@ -8,7 +8,6 @@ class TrafficList extends Component {
|
||||
render() {
|
||||
let entries = [];
|
||||
|
||||
if (this.props.departures) {
|
||||
let i = 0; // React requires elems in array to have associated unique key
|
||||
|
||||
this.props.departures.forEach(departure => {
|
||||
@ -23,7 +22,6 @@ class TrafficList extends Component {
|
||||
|
||||
// Add separator after the last element
|
||||
entries.push(<hr key={i++} />);
|
||||
}
|
||||
|
||||
return (
|
||||
<div id="trafficList">
|
||||
|
||||
@ -5,8 +5,6 @@
|
||||
transform: translate(-50%, -50%) scale(0);
|
||||
transform-origin: center;
|
||||
background: white;
|
||||
display: flex !important;
|
||||
flex-direction: column !important;
|
||||
width: 55vw;
|
||||
height: 39vh;
|
||||
padding: 3vh 5vw;
|
||||
@ -23,26 +21,16 @@
|
||||
|
||||
.popup h3 {
|
||||
margin-bottom: 20px;
|
||||
display: block;
|
||||
font-size: 1.17em;
|
||||
font-weight: bold !important;
|
||||
text-align: center;
|
||||
color: black !important;
|
||||
}
|
||||
|
||||
.popup ul {
|
||||
list-style: none;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.popup li button {
|
||||
width: 100% !important;
|
||||
height: 50px;
|
||||
padding: 8% 0 !important;
|
||||
font-size: 16px !important;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 100%;
|
||||
padding: 8% 0;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.popupClose {
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
justify-content: space-evenly;
|
||||
padding: 0 5vw;
|
||||
z-index: 4;
|
||||
max-width: 80vw;
|
||||
}
|
||||
|
||||
#stopTitle h1, #stopTitle h3 {
|
||||
@ -16,7 +15,7 @@
|
||||
}
|
||||
|
||||
#stopTitle h1 {
|
||||
font-size: 3.5vh;
|
||||
font-size: 9vw;
|
||||
}
|
||||
|
||||
#stopTitle h3 {
|
||||
@ -24,9 +23,9 @@
|
||||
color: var(--colorDiscrete);
|
||||
}
|
||||
|
||||
@media screen and (min-width: 400px) {
|
||||
@media screen and (min-width: 350px) {
|
||||
#stopTitle h1 {
|
||||
font-size: 4vh;
|
||||
font-size: 35px;
|
||||
}
|
||||
|
||||
#stopTitle h3 {
|
||||
@ -38,10 +37,9 @@
|
||||
#stopTitle div {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.changeTrackBtn {
|
||||
#stopTitle button {
|
||||
width: auto;
|
||||
height: 100%;
|
||||
box-shadow: none;
|
||||
@ -53,6 +51,6 @@
|
||||
border-radius: calc(var(--topMenuHeight) / 15);
|
||||
}
|
||||
|
||||
.changeTrackBtn:active {
|
||||
#stopTitle button:active {
|
||||
background: rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
@ -6,7 +6,7 @@
|
||||
justify-content: space-evenly;
|
||||
}
|
||||
|
||||
#topMenu .menuButton {
|
||||
#topMenu button {
|
||||
width: var(--topMenuHeight);
|
||||
height: calc(var(--topMenuHeight) / 1.3);
|
||||
display: flex;
|
||||
@ -17,7 +17,7 @@
|
||||
box-shadow: var(--boxShadow);
|
||||
}
|
||||
|
||||
#topMenu .menuButton:active {
|
||||
#topMenu button:active {
|
||||
background: rgb(235, 235, 235);
|
||||
}
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
width: 90%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: flex-start;
|
||||
justify-content: space-evenly;
|
||||
margin-bottom: 2vh;
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
|
||||
.trafficEntry div p {
|
||||
text-align: left;
|
||||
padding: 2vh 0 0 0;
|
||||
padding: 3vh 0 0 0;
|
||||
}
|
||||
|
||||
.trafficEntry div div {
|
||||
@ -50,17 +50,13 @@
|
||||
.trafficEntry div div div {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-around;
|
||||
justify-content: flex-start;
|
||||
align-items: flex-end;
|
||||
}
|
||||
|
||||
.timeColumn div:first-child, .lineColumn div:first-child {
|
||||
height: 5.5vh;
|
||||
}
|
||||
|
||||
.timeColumn {
|
||||
flex-basis: 20%;
|
||||
justify-content: flex-start !important;
|
||||
flex-basis: 15%;
|
||||
justify-content: space-between !important;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
@ -82,8 +78,8 @@
|
||||
}
|
||||
|
||||
.lineColumn img {
|
||||
flex-basis: 25%;
|
||||
height: 9vw;
|
||||
width: 7.5vw;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.infoWrapper p {
|
||||
@ -93,7 +89,7 @@
|
||||
flex-grow: 1;
|
||||
display: block;
|
||||
white-space: nowrap;
|
||||
max-height: 4.5vw;
|
||||
max-height: 3.5vw;
|
||||
}
|
||||
|
||||
.infoWrapper span {
|
||||
@ -110,20 +106,12 @@
|
||||
color: white;
|
||||
font-size: 6vw;
|
||||
font-weight: 100;
|
||||
padding: 1vw 2.5vw;
|
||||
border-radius: var(--borderRadius);
|
||||
font-family: 'Roboto Light';
|
||||
height: 7vw;
|
||||
flex-basis: 35%;
|
||||
margin-right: 10px;
|
||||
padding: 1vw 4vw;
|
||||
}
|
||||
|
||||
.destination {
|
||||
flex-basis: 40%;
|
||||
height: 9vw;
|
||||
font-size: 4vw;
|
||||
text-align: left;
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
}
|
||||
|
||||
.trafficEntry a {
|
||||
@ -135,5 +123,4 @@
|
||||
border-radius: var(--borderRadius);
|
||||
box-shadow: var(--boxShadow);
|
||||
text-decoration: none;
|
||||
border: 1px solid rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
@ -2,12 +2,9 @@ import React, { Component } from 'react';
|
||||
|
||||
import Header from '../Header.js';
|
||||
import MainArea from '../MainArea.js';
|
||||
import globalData from '../../GlobalData.js';
|
||||
|
||||
class Tickets extends Component {
|
||||
render() {
|
||||
globalData.currentPage = this;
|
||||
|
||||
return (
|
||||
<>
|
||||
<Header title="Biljetter" />
|
||||
|
||||
@ -9,12 +9,8 @@ import clockIcon from '../../img/clock.svg';
|
||||
import calendarIcon from '../../img/calendar.svg';
|
||||
import recurringIcon from '../../img/redo.svg';
|
||||
|
||||
import globalData from '../../GlobalData.js';
|
||||
|
||||
class TicketsBuy extends Component {
|
||||
render() {
|
||||
globalData.currentPage = this;
|
||||
|
||||
return (
|
||||
<>
|
||||
<Header title="Köp biljett" />
|
||||
|
||||
@ -6,21 +6,38 @@ import MainArea from "../MainArea.js";
|
||||
import StopTitle from "../StopTitle.js";
|
||||
import TrafficList from "../TrafficList.js";
|
||||
|
||||
import globalData from '../../GlobalData.js';
|
||||
import Stop from "../../classes/Stop.js";
|
||||
import Departure from "../../classes/Departure.js";
|
||||
|
||||
|
||||
class TrafficInfo extends Component {
|
||||
render() {
|
||||
globalData.currentPage = this;
|
||||
/* TEST DATA - TO BE REPLACED */
|
||||
let testStop = new Stop(
|
||||
"Lemmingsgatan",
|
||||
["Läge A", "Läge B", "Läge C"],
|
||||
[
|
||||
new Departure(
|
||||
"519",
|
||||
"Heden",
|
||||
"11:59",
|
||||
"Trafikolycka vid Partille Centrum. Olyckan ska ha inträffat i höjd med brandstationen och det är oklart om någon är skadad. Polis på väg. Två av bilarna behöver bärgas från platsen. Inga uppgifter om personskador."
|
||||
),
|
||||
new Departure("58", "Västra Eriksberg", "12:07"),
|
||||
]
|
||||
);
|
||||
|
||||
testStop.departures[0].timeUpdate("16:50");
|
||||
/* TEST DATA - TO BE REPLACED */
|
||||
|
||||
return (
|
||||
<>
|
||||
<Header title="Trafikinfo" />
|
||||
<TopMenu>
|
||||
<StopTitle stop={globalData.stop} />
|
||||
<StopTitle stop={testStop} />
|
||||
</TopMenu>
|
||||
<MainArea>
|
||||
<TrafficList departures={globalData.stop.departures} />
|
||||
<TrafficList departures={testStop.departures} />
|
||||
</MainArea>
|
||||
</>
|
||||
);
|
||||
|
||||
@ -7,12 +7,8 @@ import TripSelector from '../TripSelector.js';
|
||||
|
||||
import '../css/TripSelector.css';
|
||||
|
||||
import globalData from '../../GlobalData.js';
|
||||
|
||||
class Travel extends Component {
|
||||
render() {
|
||||
globalData.currentPage = this;
|
||||
|
||||
return (
|
||||
<>
|
||||
<Header title="Reseplanering" />
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 24.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 329 329" style="enable-background:new 0 0 329 329;" xml:space="preserve">
|
||||
<path d="M194.6,164.8L322.7,36.7c8.3-8.3,8.3-21.8,0-30.1s-21.8-8.3-30.1,0l-128.1,128L36.4,6.5c-8.3-8.3-21.8-8.3-30.1,0
|
||||
s-8.3,21.8,0,30.1l128.1,128.1L6.3,292.9c-8.3,8.3-8.3,21.8,0,30.1c4.2,4.2,9.6,6.2,15.1,6.2s10.9-2.1,15.1-6.2l128.1-128.1
|
||||
l128,128.1c4.2,4.2,9.6,6.2,15.1,6.2s10.9-2.1,15.1-6.2c8.3-8.3,8.3-21.8,0-30.1L194.6,164.8z"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 691 B |
@ -1,19 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 24.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 460.8 460.8" style="enable-background:new 0 0 460.8 460.8;" xml:space="preserve">
|
||||
<g>
|
||||
<g>
|
||||
<path d="M230.4,0c-65.8,0-119.6,53.8-119.6,119.6s53.8,119.6,119.6,119.6S350,185.4,350,119.6S296.3,0,230.4,0z"/>
|
||||
</g>
|
||||
</g>
|
||||
<g>
|
||||
<g>
|
||||
<path d="M435.8,334.9c-3.1-7.8-7.3-15.2-12-21.9c-24-35.5-61.1-59-102.9-64.8c-5.2-0.5-11,0.5-15.2,3.7
|
||||
c-21.9,16.2-48.1,24.6-75.2,24.6s-53.3-8.4-75.2-24.6c-4.2-3.1-9.9-4.7-15.2-3.7c-41.8,5.7-79.4,29.3-102.9,64.8
|
||||
c-4.7,6.8-8.9,14.6-12,21.9c-1.6,3.1-1,6.8,0.5,9.9c4.2,7.3,9.4,14.6,14.1,20.9c7.3,9.9,15.2,18.8,24,27.2
|
||||
c7.3,7.3,15.7,14.1,24,20.9c41.3,30.8,90.9,47,142.1,47s100.8-16.2,142.1-47c8.4-6.3,16.7-13.6,24-20.9c8.4-8.4,16.7-17.2,24-27.2
|
||||
c5.2-6.8,9.9-13.6,14.1-20.9C436.8,341.7,437.3,338,435.8,334.9z"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.0 KiB |
@ -33,76 +33,3 @@ button {
|
||||
opacity: 0;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.MuiSnackbar-root {
|
||||
width: 90%;
|
||||
left: 50% !important;
|
||||
bottom: 90px !important;
|
||||
transform: translateX(-50%);
|
||||
}
|
||||
|
||||
.MuiSnackbarContent-root {
|
||||
background: white !important;
|
||||
color: black !important;
|
||||
justify-content: space-between;
|
||||
padding: 3.5vw 4vw !important;
|
||||
border: 1px solid rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
|
||||
.MuiSnackbarContent-action {
|
||||
flex-basis: 38%;
|
||||
justify-content: flex-end;
|
||||
margin-left: 0 !important;
|
||||
margin-right: 0 !important;
|
||||
padding-left: 0 !important;
|
||||
height: 7.5vw;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.MuiButtonBase-root{
|
||||
width: 100%;
|
||||
padding: 0 !important;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.MuiButtonBase-root:active {
|
||||
background: none;
|
||||
}
|
||||
|
||||
.MuiTouchRipple-root {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.MuiSnackbarContent-message {
|
||||
flex-basis: 60%;
|
||||
padding: 0 !important;
|
||||
}
|
||||
|
||||
.MuiIconButton-label {
|
||||
justify-content: flex-end !important;
|
||||
}
|
||||
|
||||
.MuiIconButton-label a {
|
||||
align-items: center;
|
||||
font-size: 3.5vw;
|
||||
color: black;
|
||||
text-decoration: none;
|
||||
margin-right: 5vw;
|
||||
}
|
||||
|
||||
.MuiIconButton-label img {
|
||||
height: 3.5vw;
|
||||
}
|
||||
|
||||
#snackDisruptInfo {
|
||||
display: flex;
|
||||
height: 7.5vw;
|
||||
align-items: center;
|
||||
font-size: 3.5vw;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
#snackDisruptInfo img {
|
||||
height: 100%;
|
||||
margin-right: 15px;
|
||||
}
|
||||
@ -5,7 +5,9 @@ import App from './App';
|
||||
import reportWebVitals from './reportWebVitals';
|
||||
|
||||
ReactDOM.render(
|
||||
<App />,
|
||||
<React.StrictMode>
|
||||
<App />
|
||||
</React.StrictMode>,
|
||||
document.getElementById('root')
|
||||
);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user