Attempted merge to live branch
This commit is contained in:
williameriksson126
commit
8bf47b9292
5
package-lock.json
generated
5
package-lock.json
generated
@ -10111,6 +10111,11 @@
|
|||||||
"minimist": "^1.2.5"
|
"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": {
|
"move-concurrently": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
|
||||||
|
|||||||
@ -7,6 +7,7 @@
|
|||||||
"@testing-library/react": "^11.1.2",
|
"@testing-library/react": "^11.1.2",
|
||||||
"@testing-library/user-event": "^12.2.2",
|
"@testing-library/user-event": "^12.2.2",
|
||||||
"axios": "^0.21.0",
|
"axios": "^0.21.0",
|
||||||
|
"moment": "^2.29.1",
|
||||||
"react": "^17.0.1",
|
"react": "^17.0.1",
|
||||||
"react-axios": "^2.0.3",
|
"react-axios": "^2.0.3",
|
||||||
"react-dom": "^17.0.1",
|
"react-dom": "^17.0.1",
|
||||||
|
|||||||
53
src/APIexamples/departureuser1.json
Normal file
53
src/APIexamples/departureuser1.json
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
{
|
||||||
|
"DepartureBoard": {
|
||||||
|
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd",
|
||||||
|
"servertime": "10:09",
|
||||||
|
"serverdate": "2020-12-10",
|
||||||
|
"Departures": [
|
||||||
|
{
|
||||||
|
"name": "Buss MEXP",
|
||||||
|
"sname": "MEXP",
|
||||||
|
"journeyNumber": "24",
|
||||||
|
"type": "BUS",
|
||||||
|
"stopid": "9022014014754002",
|
||||||
|
"stop": "Bollestadsvägen, Kungälv",
|
||||||
|
"time": "10:09",
|
||||||
|
"date": "2020-12-10",
|
||||||
|
"journeyid": "9015014621000024",
|
||||||
|
"direction": "Marstrand",
|
||||||
|
"track": "B",
|
||||||
|
"rtTime": "10:11",
|
||||||
|
"rtDate": "2020-12-10",
|
||||||
|
"fgColor": "#006C93",
|
||||||
|
"bgColor": "#FFFFFF",
|
||||||
|
"stroke": "Solid",
|
||||||
|
"accessibility": "wheelChair",
|
||||||
|
"JourneyDetailRef": {
|
||||||
|
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=347217%2F124275%2F19874%2F105802%2F80%3Fdate%3D2020-12-10%26station_evaId%3D14754002%26station_type%3Ddep%26format%3Djson%26"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Buss 920",
|
||||||
|
"sname": "920",
|
||||||
|
"journeyNumber": "2",
|
||||||
|
"type": "BUS",
|
||||||
|
"stopid": "9022014014754002",
|
||||||
|
"stop": "Bollestadsvägen, Kungälv",
|
||||||
|
"time": "12:26",
|
||||||
|
"date": "2020-12-10",
|
||||||
|
"journeyid": "9015014692000002",
|
||||||
|
"direction": "Bredsten",
|
||||||
|
"track": "B",
|
||||||
|
"rtTime": "12:26",
|
||||||
|
"rtDate": "2020-12-10",
|
||||||
|
"fgColor": "#006C93",
|
||||||
|
"bgColor": "#FFFFFF",
|
||||||
|
"stroke": "Solid",
|
||||||
|
"accessibility": "wheelChair",
|
||||||
|
"JourneyDetailRef": {
|
||||||
|
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=210630%2F70533%2F834318%2F346949%2F80%3Fdate%3D2020-12-10%26station_evaId%3D14754002%26station_type%3Ddep%26format%3Djson%26"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
53
src/APIexamples/departureuser2.json
Normal file
53
src/APIexamples/departureuser2.json
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
{
|
||||||
|
"DepartureBoard": {
|
||||||
|
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd",
|
||||||
|
"servertime": "10:10",
|
||||||
|
"serverdate": "2020-12-10",
|
||||||
|
"Departures": [
|
||||||
|
{
|
||||||
|
"name": "Buss MEXP",
|
||||||
|
"sname": "MEXP",
|
||||||
|
"journeyNumber": "24",
|
||||||
|
"type": "BUS",
|
||||||
|
"stopid": "9022014014020002",
|
||||||
|
"stop": "Ekelöv västra, Kungälv",
|
||||||
|
"time": "10:10",
|
||||||
|
"date": "2020-12-10",
|
||||||
|
"journeyid": "9015014621000024",
|
||||||
|
"direction": "Marstrand",
|
||||||
|
"track": "B",
|
||||||
|
"rtTime": "10:13",
|
||||||
|
"rtDate": "2020-12-10",
|
||||||
|
"fgColor": "#006C93",
|
||||||
|
"bgColor": "#FFFFFF",
|
||||||
|
"stroke": "Solid",
|
||||||
|
"accessibility": "wheelChair",
|
||||||
|
"JourneyDetailRef": {
|
||||||
|
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=740262%2F255290%2F59460%2F217024%2F80%3Fdate%3D2020-12-10%26station_evaId%3D14020002%26station_type%3Ddep%26format%3Djson%26"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Buss 920",
|
||||||
|
"sname": "920",
|
||||||
|
"journeyNumber": "2",
|
||||||
|
"type": "BUS",
|
||||||
|
"stopid": "9022014014754002",
|
||||||
|
"stop": "Bollestadsvägen, Kungälv",
|
||||||
|
"time": "12:28",
|
||||||
|
"date": "2020-12-10",
|
||||||
|
"journeyid": "9015014692000002",
|
||||||
|
"direction": "Bredsten",
|
||||||
|
"track": "B",
|
||||||
|
"rtTime": "12:26",
|
||||||
|
"rtDate": "2020-12-10",
|
||||||
|
"fgColor": "#006C93",
|
||||||
|
"bgColor": "#FFFFFF",
|
||||||
|
"stroke": "Solid",
|
||||||
|
"accessibility": "wheelChair",
|
||||||
|
"JourneyDetailRef": {
|
||||||
|
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=210630%2F70533%2F834318%2F346949%2F80%3Fdate%3D2020-12-10%26station_evaId%3D14754002%26station_type%3Ddep%26format%3Djson%26"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
27
src/APIexamples/departureuser3.json
Normal file
27
src/APIexamples/departureuser3.json
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
{
|
||||||
|
"DepartureBoard": {
|
||||||
|
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd",
|
||||||
|
"servertime": "10:10",
|
||||||
|
"serverdate": "2020-12-10",
|
||||||
|
"Departures": [{
|
||||||
|
"name": "Buss MEXP",
|
||||||
|
"sname": "MEXP",
|
||||||
|
"journeyNumber": "24",
|
||||||
|
"type": "BUS",
|
||||||
|
"stopid": "9022014014751002",
|
||||||
|
"stop": "Guddeby, Kungälv",
|
||||||
|
"time": "10:07",
|
||||||
|
"date": "2020-12-10",
|
||||||
|
"journeyid": "9015014621000024",
|
||||||
|
"direction": "Marstrand",
|
||||||
|
"track": "B",
|
||||||
|
"fgColor": "#006C93",
|
||||||
|
"bgColor": "#FFFFFF",
|
||||||
|
"stroke": "Solid",
|
||||||
|
"accessibility": "wheelChair",
|
||||||
|
"JourneyDetailRef": {
|
||||||
|
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=473190%2F166266%2F666560%2F175550%2F80%3Fdate%3D2020-12-10%26station_evaId%3D14751002%26station_type%3Ddep%26format%3Djson%26"
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
}
|
||||||
|
}
|
||||||
30
src/APIexamples/departureuser4.json
Normal file
30
src/APIexamples/departureuser4.json
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
{
|
||||||
|
"DepartureBoard": {
|
||||||
|
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestDepartureBoard.xsd",
|
||||||
|
"servertime": "10:11",
|
||||||
|
"serverdate": "2020-12-10",
|
||||||
|
"Departures":
|
||||||
|
[{
|
||||||
|
"name": "Buss 928",
|
||||||
|
"sname": "928",
|
||||||
|
"journeyNumber": "10",
|
||||||
|
"type": "BUS",
|
||||||
|
"stopid": "9022014014225001",
|
||||||
|
"stop": "Skrämmenborg, Kungälv",
|
||||||
|
"time": "15:19",
|
||||||
|
"date": "2020-12-10",
|
||||||
|
"journeyid": "9015014692800010",
|
||||||
|
"direction": "Kärna",
|
||||||
|
"track": "A",
|
||||||
|
"rtTime": "15:19",
|
||||||
|
"rtDate": "2020-12-10",
|
||||||
|
"fgColor": "#006C93",
|
||||||
|
"bgColor": "#FFFFFF",
|
||||||
|
"stroke": "Solid",
|
||||||
|
"accessibility": "wheelChair",
|
||||||
|
"JourneyDetailRef": {
|
||||||
|
"ref": "https://api.vasttrafik.se/bin/rest.exe/v2/journeyDetail?ref=261732%2F87569%2F149176%2F12656%2F80%3Fdate%3D2020-12-10%26station_evaId%3D14225001%26station_type%3Ddep%26format%3Djson%26"
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
}
|
||||||
|
}
|
||||||
16
src/APIexamples/disruption1.json
Normal file
16
src/APIexamples/disruption1.json
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"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:01",
|
||||||
|
"affectedStopPoints":[
|
||||||
|
{
|
||||||
|
"gid": "9022014014020001",
|
||||||
|
"name": "Ekelöv västra, Kungälv"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"gid": "9022014014751001",
|
||||||
|
"name": "Guddeby, Kungälv"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
12
src/APIexamples/disruption2.json
Normal file
12
src/APIexamples/disruption2.json
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"situationNumber": "RT2",
|
||||||
|
"severity":"normal",
|
||||||
|
"title":"Försening",
|
||||||
|
"time":"00:02",
|
||||||
|
"affectedStopPoints":[
|
||||||
|
{
|
||||||
|
"gid": "9021014014225000",
|
||||||
|
"name": "Skrämmenborg, Kungälv"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
36
src/APIexamples/locationuser1.json
Normal file
36
src/APIexamples/locationuser1.json
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
{
|
||||||
|
"LocationList": {
|
||||||
|
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd",
|
||||||
|
"servertime": "16:48",
|
||||||
|
"serverdate": "2020-12-09",
|
||||||
|
"StopLocation": [
|
||||||
|
{
|
||||||
|
"name": "Bollestadsvägen, Kungälv",
|
||||||
|
"id": "9022014014754001",
|
||||||
|
"lat": "57.888940",
|
||||||
|
"lon": "11.885663",
|
||||||
|
"track": "A"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Bollestadsvägen, Kungälv",
|
||||||
|
"id": "9021014014754000",
|
||||||
|
"lat": "57.889030",
|
||||||
|
"lon": "11.885708"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Bollestadsvägen, Kungälv",
|
||||||
|
"id": "9022014014754002",
|
||||||
|
"lat": "57.889111",
|
||||||
|
"lon": "11.885753",
|
||||||
|
"track": "B"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Bredsten, Kungälv",
|
||||||
|
"id": "9022014014753002",
|
||||||
|
"lat": "57.886450",
|
||||||
|
"lon": "11.889529",
|
||||||
|
"track": "B"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
36
src/APIexamples/locationuser2.json
Normal file
36
src/APIexamples/locationuser2.json
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
{
|
||||||
|
"LocationList": {
|
||||||
|
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd",
|
||||||
|
"servertime": "16:47",
|
||||||
|
"serverdate": "2020-12-09",
|
||||||
|
"StopLocation": [
|
||||||
|
{
|
||||||
|
"name": "Ekelöv västra, Kungälv",
|
||||||
|
"id": "9022014014020001",
|
||||||
|
"lat": "57.892527",
|
||||||
|
"lon": "11.865321",
|
||||||
|
"track": "A"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Ekelöv västra, Kungälv",
|
||||||
|
"id": "9021014014020000",
|
||||||
|
"lat": "57.892608",
|
||||||
|
"lon": "11.865312"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Ekelöv västra, Kungälv",
|
||||||
|
"id": "9022014014020002",
|
||||||
|
"lat": "57.892689",
|
||||||
|
"lon": "11.865285",
|
||||||
|
"track": "B"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Ekelöv östra, Kungälv",
|
||||||
|
"id": "9022014014021002",
|
||||||
|
"lat": "57.892994",
|
||||||
|
"lon": "11.873923",
|
||||||
|
"track": "B"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
36
src/APIexamples/locationuser3.json
Normal file
36
src/APIexamples/locationuser3.json
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
{
|
||||||
|
"LocationList": {
|
||||||
|
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd",
|
||||||
|
"servertime": "16:45",
|
||||||
|
"serverdate": "2020-12-09",
|
||||||
|
"StopLocation": [
|
||||||
|
{
|
||||||
|
"name": "Guddeby, Kungälv",
|
||||||
|
"id": "9022014014751001",
|
||||||
|
"lat": "57.874665",
|
||||||
|
"lon": "11.903884",
|
||||||
|
"track": "A"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"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": "Stället, Kungälv",
|
||||||
|
"id": "9022014014744001",
|
||||||
|
"lat": "57.869784",
|
||||||
|
"lon": "11.904172",
|
||||||
|
"track": "A"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
35
src/APIexamples/locationuser4.json
Normal file
35
src/APIexamples/locationuser4.json
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
{
|
||||||
|
"LocationList": {
|
||||||
|
"noNamespaceSchemaLocation": "http://api.vasttrafik.se/v1/hafasRestLocation.xsd",
|
||||||
|
"servertime": "16:44",
|
||||||
|
"serverdate": "2020-12-09",
|
||||||
|
"StopLocation": [
|
||||||
|
{
|
||||||
|
"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, Kungälv",
|
||||||
|
"id": "9022014014762002",
|
||||||
|
"lat": "57.856966",
|
||||||
|
"lon": "11.863774",
|
||||||
|
"track": "B"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Kuröd, Kungälv",
|
||||||
|
"id": "9021014014762000",
|
||||||
|
"lat": "57.856831",
|
||||||
|
"lon": "11.864260"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
5
src/APIexamples/user1.json
Normal file
5
src/APIexamples/user1.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"name": "Användare 1",
|
||||||
|
"deviceId": "1",
|
||||||
|
"stoppointgid": "9022014014754001"
|
||||||
|
}
|
||||||
5
src/APIexamples/user2.json
Normal file
5
src/APIexamples/user2.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"name": "Användare 2",
|
||||||
|
"deviceId": "2",
|
||||||
|
"stoppointgid": "9022014014020001"
|
||||||
|
}
|
||||||
5
src/APIexamples/user3.json
Normal file
5
src/APIexamples/user3.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"name": "Användare 3",
|
||||||
|
"deviceId": "3",
|
||||||
|
"stoppointgid": "9022014014751001"
|
||||||
|
}
|
||||||
5
src/APIexamples/user4.json
Normal file
5
src/APIexamples/user4.json
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"name": "Användare 4",
|
||||||
|
"deviceId": "4",
|
||||||
|
"stoppointgid": "9021014014225000"
|
||||||
|
}
|
||||||
@ -5,8 +5,9 @@ import React, { Component } from "react";
|
|||||||
import { BrowserRouter as Router, Route } from "react-router-dom";
|
import { BrowserRouter as Router, Route } from "react-router-dom";
|
||||||
|
|
||||||
import BottomMenu from "./components/BottomMenu.js";
|
import BottomMenu from "./components/BottomMenu.js";
|
||||||
//import AccessToken from "./components/AccessToken.js";
|
import NearbyStation from "./components/NearbyStation.js";
|
||||||
import NearbyStation from "./components/NearbyStation";
|
import Disruption from "./components/Disruption.js";
|
||||||
|
import StationDisruption from "./components/StationDisruption.js";
|
||||||
|
|
||||||
import Tickets from "./components/pages/Tickets.js";
|
import Tickets from "./components/pages/Tickets.js";
|
||||||
import TicketsBuy from "./components/pages/TicketsBuy.js";
|
import TicketsBuy from "./components/pages/TicketsBuy.js";
|
||||||
|
|||||||
@ -1,11 +1,19 @@
|
|||||||
import User from './classes/User.js';
|
import User from './classes/User.js';
|
||||||
import Coordinates from "./classes/Coordinates.js";
|
import Disruption from './classes/Disruption.js'
|
||||||
|
import Coordinates from './classes/Coordinates.js';
|
||||||
|
import Stop from './classes/Stop.js'
|
||||||
|
|
||||||
let globalData = {
|
let globalData = {
|
||||||
|
users : [],
|
||||||
user: new User(
|
user: new User(
|
||||||
"test",
|
"Exempelanvändare",
|
||||||
"123",
|
"123",
|
||||||
new Coordinates()
|
new Coordinates(),
|
||||||
|
"123"
|
||||||
|
),
|
||||||
|
disruption: new Disruption(
|
||||||
|
),
|
||||||
|
stop: new Stop(
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -12,7 +12,6 @@ class AccessToken {
|
|||||||
|
|
||||||
axios.post('https://api.vasttrafik.se/token','grant_type=client_credentials&scope=device_'+this.device, {headers} )
|
axios.post('https://api.vasttrafik.se/token','grant_type=client_credentials&scope=device_'+this.device, {headers} )
|
||||||
.then(response => {
|
.then(response => {
|
||||||
console.log(response);
|
|
||||||
this.token = response.data.access_token
|
this.token = response.data.access_token
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,15 +3,20 @@
|
|||||||
|
|
||||||
lineName : String (Linjenamnet)
|
lineName : String (Linjenamnet)
|
||||||
finalStop : Stop (Ändhållplats)
|
finalStop : Stop (Ändhållplats)
|
||||||
time : String (Avgångstid)
|
originalTime : String (Ursprunglig Avgångstid)
|
||||||
|
newTime : String (Ny Avgångstid)
|
||||||
trafficInfo : String (Trafikinformation)
|
trafficInfo : String (Trafikinformation)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class Departure {
|
class Departure {
|
||||||
constructor(lineName, finalStop, time, trafficInfo) {
|
constructor(lineName, finalStop, originalTime) {
|
||||||
this.lineName = lineName;
|
this.sname = lineName;
|
||||||
this.finalStop = finalStop;
|
this.direction = finalStop;
|
||||||
this.time = time;
|
this.time = originalTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
timeUpdate(time, trafficInfo) {
|
||||||
|
this.newTime = time;
|
||||||
this.trafficInfo = trafficInfo;
|
this.trafficInfo = trafficInfo;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
11
src/classes/Disruption.js
Normal file
11
src/classes/Disruption.js
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
|
||||||
|
class Disruption {
|
||||||
|
constructor(situationNumber, severity, title, affectedStopPoints) {
|
||||||
|
this.situationNumber = situationNumber;
|
||||||
|
this.severity = severity;
|
||||||
|
this.title = title;
|
||||||
|
this.affectedStopPoints = affectedStopPoints;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Disruption;
|
||||||
@ -7,11 +7,25 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
class Stop {
|
class Stop {
|
||||||
constructor(name, locations, departures) {
|
constructor(name, id, lat, lon, locations, departures) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
|
this.id = id;
|
||||||
|
this.lat = lat;
|
||||||
|
this.lon = lon;
|
||||||
this.locations = locations;
|
this.locations = locations;
|
||||||
this.departures = departures;
|
this.departures = departures;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Från västtrafiks api ett element i listan av hållplatser ser ut som följande
|
||||||
|
"id": "string",
|
||||||
|
"lon": "string",
|
||||||
|
"idx": "string",
|
||||||
|
"weight": "string",
|
||||||
|
"name": "string",
|
||||||
|
"track": "string",
|
||||||
|
"lat": "string"
|
||||||
|
*/
|
||||||
|
|
||||||
export default Stop;
|
export default Stop;
|
||||||
@ -4,13 +4,16 @@
|
|||||||
name : String (Användarnamn)
|
name : String (Användarnamn)
|
||||||
deviceId : Int (Enhetens ID)
|
deviceId : Int (Enhetens ID)
|
||||||
location : Coordinates (Användarens koordinater)
|
location : Coordinates (Användarens koordinater)
|
||||||
|
track : String (Nuvarande hållplatsläge)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class User {
|
class User {
|
||||||
constructor(name, deviceId, location) {
|
constructor(name, deviceId, location, stoppointgid, track) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.deviceId = deviceId;
|
this.deviceId = deviceId;
|
||||||
this.location = location;
|
this.location = location;
|
||||||
|
this.stoppointgid = stoppointgid;
|
||||||
|
this.track = track;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -13,7 +13,7 @@ class Button extends Component {
|
|||||||
func();
|
func();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
console.log("Error when parsing Button onClick functions.");
|
console.log("Error when parsing Button onClick functions. Make sure the functions are passed as an array.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
57
src/components/Disruption.js
Normal file
57
src/components/Disruption.js
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import axios from 'axios';
|
||||||
|
import AccessToken from '../classes/AccessToken'
|
||||||
|
|
||||||
|
class Diruption extends React.Component {
|
||||||
|
state = {
|
||||||
|
gid: '9022014005700002',
|
||||||
|
disruptions: [],
|
||||||
|
token: undefined,
|
||||||
|
tokenClass: new AccessToken()
|
||||||
|
}
|
||||||
|
|
||||||
|
handleChangeGid = event => {
|
||||||
|
this.setState({ lat: event.target.value});
|
||||||
|
}
|
||||||
|
|
||||||
|
handleSubmit = event => {
|
||||||
|
event.preventDefault();
|
||||||
|
|
||||||
|
const headers = {
|
||||||
|
'Authorization': 'Bearer ' + this.state.tokenClass.token
|
||||||
|
};
|
||||||
|
|
||||||
|
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 => {
|
||||||
|
this.setState({
|
||||||
|
disruptions: response.data
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<form onSubmit={this.handleSubmit}>
|
||||||
|
<label>
|
||||||
|
Stoppoint Gid:
|
||||||
|
<input type="text" name="gid" onChange={this.handleChangeGid} />
|
||||||
|
</label>
|
||||||
|
<button type="submit">Find traffic disruptions</button>
|
||||||
|
</form>
|
||||||
|
<h1>
|
||||||
|
{this.state.gid}
|
||||||
|
</h1>
|
||||||
|
{this.state.disruptions.map((item) =>
|
||||||
|
<div>
|
||||||
|
<h1>
|
||||||
|
{item.description}
|
||||||
|
</h1>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export default Diruption
|
||||||
@ -1,23 +1,118 @@
|
|||||||
import addNotification from "react-push-notification";
|
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 ex1 from '../APIexamples/disruption1.json'
|
||||||
|
import ex2 from '../APIexamples/disruption2.json'
|
||||||
|
|
||||||
import Button from './Button.js';
|
import Button from './Button.js';
|
||||||
import disruptIcon from '../img/flash.svg';
|
import disruptIcon from '../img/flash.svg';
|
||||||
|
|
||||||
|
import globalData from '../GlobalData.js'
|
||||||
|
import moment from "moment";
|
||||||
|
|
||||||
class DisruptionButton extends Button {
|
class DisruptionButton extends Button {
|
||||||
|
state = {
|
||||||
|
jsonLocation: this.props.path,
|
||||||
|
disruption: "",
|
||||||
|
u1 : user1,
|
||||||
|
u2 : user2,
|
||||||
|
u3 : user3,
|
||||||
|
u4 : user4,
|
||||||
|
}
|
||||||
|
|
||||||
|
updatePage = () => {
|
||||||
|
globalData.currentPage.forceUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
showMomentTime = (time) => {
|
||||||
|
//return(time.hours().toString()+ ":"+time.minutes().toString())
|
||||||
|
return(time.format("HH:mm"))
|
||||||
|
}
|
||||||
|
|
||||||
|
genUsers = () => {
|
||||||
|
if(globData.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;
|
||||||
|
globData.users = [
|
||||||
|
this.state.u1,
|
||||||
|
this.state.u2,
|
||||||
|
this.state.u3,
|
||||||
|
this.state.u4
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
genDisrupt = () => {
|
genDisrupt = () => {
|
||||||
addNotification({
|
this.genUsers()
|
||||||
title: "Warning",
|
|
||||||
subtitle: "This is a subtitle",
|
this.state.disruption = undefined
|
||||||
message: "This is a very long message",
|
if(this.state.jsonLocation === "ex1"){
|
||||||
theme: "blue",
|
for (let stopPoint of ex1.affectedStopPoints) {
|
||||||
native: true, // when using native, your OS will handle theming.
|
for (let user of globData.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 === globData.user.stoppointgid){
|
||||||
|
this.state.disruption = ex1;
|
||||||
|
var old2t = moment(globData.stop.departures[0].time,"HH:mm");
|
||||||
|
old2t.add(ex1.time, "HH:mm");
|
||||||
|
globData.stop.departures[0].newTime = this.showMomentTime(old2t);
|
||||||
|
globData.stop.departures[0].trafficInfo = ex1.title;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (this.state.jsonLocation === "ex2"){
|
||||||
|
for (let stopPoint of ex2.affectedStopPoints) {
|
||||||
|
for (let user of globData.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 === globData.user.stoppointgid){
|
||||||
|
this.state.disruption = ex2;
|
||||||
|
var old4t = moment(globData.stop.departures[0].time,"HH:mm");
|
||||||
|
old4t.add(ex2.time, "HH:mm");
|
||||||
|
globData.stop.departures[0].newTime = this.showMomentTime(old4t);
|
||||||
|
globData.stop.departures[0].trafficInfo = ex2.title;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
globData.disruption = this.state.disruption
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<Button onClick={this.props.onClick.concat([this.genDisrupt])} className="disruptBtn">
|
<Button onClick={this.props.onClick.concat([this.genDisrupt,this.updatePage])} className="disruptBtn">
|
||||||
<img src={disruptIcon} alt="" />
|
<img src={disruptIcon} alt="" />
|
||||||
<span>Generera Störning</span>
|
<span>Generera Störning</span>
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
45
src/components/FindStops.js
Normal file
45
src/components/FindStops.js
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
|
||||||
|
import globData from '../GlobalData.js';
|
||||||
|
|
||||||
|
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 StopSelectButton from './StopSelectButton.js';
|
||||||
|
import Button from './Button.js';
|
||||||
|
import disruptIcon from '../img/flash.svg';
|
||||||
|
|
||||||
|
class FindStops extends Button {
|
||||||
|
state = {
|
||||||
|
locations : []
|
||||||
|
}
|
||||||
|
findStops = () => {
|
||||||
|
if(globData.user.deviceId === "1"){
|
||||||
|
this.state.locations = locationuser1.LocationList.StopLocation
|
||||||
|
}else if (globData.user.deviceId === "2"){
|
||||||
|
this.state.locations = locationuser2.LocationList.StopLocation
|
||||||
|
}else if (globData.user.deviceId === "3"){
|
||||||
|
this.state.locations = locationuser3.LocationList.StopLocation
|
||||||
|
}else if (globData.user.deviceId === "4"){
|
||||||
|
this.state.locations = locationuser4.LocationList.StopLocation
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Button onClick={[this.findStops]} className="disruptBtn">
|
||||||
|
<img src={disruptIcon} alt="" />
|
||||||
|
<span>Select nearby stops</span>
|
||||||
|
</Button>
|
||||||
|
{this.state.locations.map((item) =>
|
||||||
|
<StopSelectButton stop={item}/>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export default FindStops;
|
||||||
@ -5,7 +5,7 @@ import './css/MainArea.css';
|
|||||||
class MainArea extends Component {
|
class MainArea extends Component {
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<main>
|
<main style={this.props.style}>
|
||||||
{this.props.children}
|
{this.props.children}
|
||||||
</main>
|
</main>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -2,6 +2,7 @@ import React, { Component } from 'react';
|
|||||||
|
|
||||||
import globalData from '../GlobalData.js';
|
import globalData from '../GlobalData.js';
|
||||||
import DisruptionButton from "./DisruptionButton.js";
|
import DisruptionButton from "./DisruptionButton.js";
|
||||||
|
import SelectUserButton from "./SelectUserButton.js"
|
||||||
import Popup from './Popup.js';
|
import Popup from './Popup.js';
|
||||||
import Button from './Button.js';
|
import Button from './Button.js';
|
||||||
|
|
||||||
@ -43,16 +44,23 @@ class NavigationDrawer extends Component {
|
|||||||
this.popupElem.current.show();
|
this.popupElem.current.show();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
hidePopup = () => {
|
||||||
|
this.popupElem.current.hide();
|
||||||
|
};
|
||||||
|
|
||||||
|
updatePage = () => {
|
||||||
|
globalData.currentPage.render();
|
||||||
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Popup ref={this.popupElem}>
|
<Popup ref={this.popupElem}>
|
||||||
<h3>Välj hållplats:</h3>
|
<h3>Välj hållplats:</h3>
|
||||||
<ul>
|
<ul>
|
||||||
<li><Button>Hållplats 1</Button></li>
|
<li><DisruptionButton path={"ex1"} onClick={[this.hidePopup]}>Störningsscenario 1</DisruptionButton></li>
|
||||||
<li><Button>Hållplats 2</Button></li>
|
<li><DisruptionButton path={"ex2"} onClick={[this.hidePopup]}>Störningsscenario 2</DisruptionButton></li>
|
||||||
<li><Button>Hållplats 3</Button></li>
|
|
||||||
<li><Button>Hållplats 4</Button></li>
|
|
||||||
</ul>
|
</ul>
|
||||||
</Popup>
|
</Popup>
|
||||||
|
|
||||||
@ -63,7 +71,11 @@ class NavigationDrawer extends Component {
|
|||||||
<span>example@gmail.com</span>
|
<span>example@gmail.com</span>
|
||||||
</header>
|
</header>
|
||||||
<div id="navList">
|
<div id="navList">
|
||||||
<DisruptionButton onClick={[this.showPopup, this.close]} />
|
<SelectUserButton path={"user1"} username="Användare 1"/>
|
||||||
|
<SelectUserButton path={"user2"} username="Användare 2"/>
|
||||||
|
<SelectUserButton path={"user3"} username="Användare 3"/>
|
||||||
|
<SelectUserButton path={"user4"} username="Användare 4"/>
|
||||||
|
<Button onClick={[this.showPopup, this.close]}><span>Generera Störning</span></Button>
|
||||||
</div>
|
</div>
|
||||||
<hr />
|
<hr />
|
||||||
<span id="version">Projektgrupp 3 - Utmaning 7</span>
|
<span id="version">Projektgrupp 3 - Utmaning 7</span>
|
||||||
|
|||||||
@ -1,6 +1,8 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import AccessToken from '../classes/AccessToken'
|
import AccessToken from '../classes/AccessToken';
|
||||||
|
import StopComponent from './StopComponent';
|
||||||
|
import Stop from '../classes/Stop';
|
||||||
|
|
||||||
class NearbyStation extends React.Component {
|
class NearbyStation extends React.Component {
|
||||||
state = {
|
state = {
|
||||||
@ -26,11 +28,8 @@ class NearbyStation extends React.Component {
|
|||||||
'Authorization': 'Bearer ' + this.state.tokenClass.token
|
'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 })
|
||||||
|
|
||||||
axios.get('https://api.vasttrafik.se/bin/rest.exe/v2/location.nearbystops?originCoordLat='+this.state.lat+'&originCoordLong='+this.state.long+'&maxNo=20&format=json', { headers })
|
|
||||||
.then(response => {
|
.then(response => {
|
||||||
console.log(response.data.LocationList.StopLocation)
|
|
||||||
this.setState({
|
this.setState({
|
||||||
stops: response.data.LocationList.StopLocation,
|
stops: response.data.LocationList.StopLocation,
|
||||||
})
|
})
|
||||||
@ -58,32 +57,11 @@ class NearbyStation extends React.Component {
|
|||||||
{this.state.long}
|
{this.state.long}
|
||||||
</h1>
|
</h1>
|
||||||
{this.state.stops.map((item) =>
|
{this.state.stops.map((item) =>
|
||||||
<div>
|
<StopComponent stop={item} />
|
||||||
<h1>
|
|
||||||
{item.name},
|
|
||||||
{item.id},
|
|
||||||
{item.lat},
|
|
||||||
{item.lon},
|
|
||||||
{item.track}
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default NearbyStation
|
export default NearbyStation
|
||||||
|
|
||||||
//https://api.vasttrafik.se/bin/rest.exe/v2/location.nearbystops?originCoordLat=57.5987&originCoordLong=11.9454&maxNo=20&format=json
|
|
||||||
|
|
||||||
//https://api.vasttrafik.se/bin/rest.exe/v2/location.nearbystops
|
|
||||||
|
|
||||||
|
|
||||||
//'https://reqres.in/api/articles'
|
|
||||||
|
|
||||||
//'https://api.vasttrafik.se/token'
|
|
||||||
|
|
||||||
//grant_type=client_credentials&scope=<device_id>
|
|
||||||
|
|
||||||
//BPvMjPidHckBtETZxr3dHP1rptQa
|
|
||||||
//z5MFCS_wwmqprc0s4iLZWBAUJdga
|
|
||||||
92
src/components/SelectUserButton.js
Normal file
92
src/components/SelectUserButton.js
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
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 globalData from '../GlobalData.js';
|
||||||
|
|
||||||
|
|
||||||
|
class SelectUserButton extends Button {
|
||||||
|
state = {
|
||||||
|
first : false,
|
||||||
|
u1 : user1,
|
||||||
|
u2 : user2,
|
||||||
|
u3 : user3,
|
||||||
|
u4 : user4,
|
||||||
|
}
|
||||||
|
|
||||||
|
genUsers = () => {
|
||||||
|
if(globData.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;
|
||||||
|
globData.users = [
|
||||||
|
this.state.u1,
|
||||||
|
this.state.u2,
|
||||||
|
this.state.u3,
|
||||||
|
this.state.u4
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
selectUser = () => {
|
||||||
|
this.genUsers()
|
||||||
|
|
||||||
|
if(this.props.path === "user1"){
|
||||||
|
globData.user = user1
|
||||||
|
globData.user.track = locationuser1.LocationList.StopLocation[0].track
|
||||||
|
globData.stop = locationuser1.LocationList.StopLocation[0]
|
||||||
|
globData.stop.departures = departureuser1.DepartureBoard.Departures
|
||||||
|
}else if (this.props.path === "user2"){
|
||||||
|
globData.user = user2
|
||||||
|
globData.user.track = locationuser2.LocationList.StopLocation[0].track
|
||||||
|
globData.stop = locationuser2.LocationList.StopLocation[0]
|
||||||
|
globData.stop.departures = departureuser2.DepartureBoard.Departures
|
||||||
|
}else if (this.props.path === "user3"){
|
||||||
|
globData.user = user3
|
||||||
|
globData.user.track = locationuser3.LocationList.StopLocation[0].track
|
||||||
|
globData.stop = locationuser3.LocationList.StopLocation[0]
|
||||||
|
globData.stop.departures = departureuser3.DepartureBoard.Departures
|
||||||
|
}else if (this.props.path === "user4"){
|
||||||
|
globData.user = user4
|
||||||
|
globData.user.track = locationuser4.LocationList.StopLocation[0].track
|
||||||
|
globData.stop = locationuser4.LocationList.StopLocation[0]
|
||||||
|
globData.stop.departures = departureuser4.DepartureBoard.Departures
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
updatePage = () => {
|
||||||
|
globalData.currentPage.forceUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
return (
|
||||||
|
<Button onClick={[this.selectUser, this.updatePage]} className="disruptBtn">
|
||||||
|
<img src={userIcon} alt="" />
|
||||||
|
{this.props.username}
|
||||||
|
</Button>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default SelectUserButton;
|
||||||
61
src/components/StationDisruption.js
Normal file
61
src/components/StationDisruption.js
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import axios from 'axios';
|
||||||
|
import AccessToken from '../classes/AccessToken'
|
||||||
|
|
||||||
|
class StationDisruption extends React.Component {
|
||||||
|
state = {
|
||||||
|
gid: '9022014005700002',
|
||||||
|
lat: '57.7',
|
||||||
|
long: '12.0',
|
||||||
|
disruptions: [],
|
||||||
|
token: undefined,
|
||||||
|
tokenClass: new AccessToken()
|
||||||
|
}
|
||||||
|
|
||||||
|
handleChangeGid = event => {
|
||||||
|
this.setState({ lat: event.target.value});
|
||||||
|
}
|
||||||
|
|
||||||
|
handleSubmit = event => {
|
||||||
|
event.preventDefault();
|
||||||
|
|
||||||
|
const headers = {
|
||||||
|
'Authorization': 'Bearer ' + this.state.tokenClass.token
|
||||||
|
};
|
||||||
|
|
||||||
|
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 => {
|
||||||
|
})
|
||||||
|
axios.get('https://api.vasttrafik.se/ts/v1/traffic-situations/stoppoint/'+this.state.gid, { headers })
|
||||||
|
.then(response => {
|
||||||
|
this.setState({
|
||||||
|
disruptions: response.data
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<form onSubmit={this.handleSubmit}>
|
||||||
|
<label>
|
||||||
|
Stoppoint Gid:
|
||||||
|
<input type="text" name="gid" onChange={this.handleChangeGid} />
|
||||||
|
</label>
|
||||||
|
<button type="submit">Find traffic disruptions</button>
|
||||||
|
</form>
|
||||||
|
<h1>
|
||||||
|
{this.state.gid}
|
||||||
|
</h1>
|
||||||
|
{this.state.disruptions.map((item) =>
|
||||||
|
<div>
|
||||||
|
<h1>
|
||||||
|
{item.description}
|
||||||
|
</h1>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export default StationDisruption
|
||||||
19
src/components/StopComponent.js
Normal file
19
src/components/StopComponent.js
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
import React, {Component} from 'react';
|
||||||
|
|
||||||
|
class StopComponent extends Component {
|
||||||
|
render() {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<h1>
|
||||||
|
{this.props.stop.name},
|
||||||
|
{this.props.stop.id},
|
||||||
|
{this.props.stop.lat},
|
||||||
|
{this.props.stop.lon},
|
||||||
|
{this.props.stop.track}
|
||||||
|
</h1>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// TODO Add css
|
||||||
|
export default StopComponent
|
||||||
22
src/components/StopSelectButton.js
Normal file
22
src/components/StopSelectButton.js
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
import React, {Component} from 'react';
|
||||||
|
import globalData from '../GlobalData';
|
||||||
|
import Button from './Button.js';
|
||||||
|
|
||||||
|
class StopSelectButton extends Component {
|
||||||
|
|
||||||
|
selectStop = () => {
|
||||||
|
globalData.stop = this.props.stop
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Button onClick={[this.selectStop]}>
|
||||||
|
<span>{this.props.stop.name}</span>
|
||||||
|
</Button>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// TODO Add css
|
||||||
|
export default StopSelectButton
|
||||||
0
src/components/StopSelector.js
Normal file
0
src/components/StopSelector.js
Normal file
@ -1,16 +1,56 @@
|
|||||||
import React, { Component } from 'react';
|
import React, { Component } from 'react';
|
||||||
|
|
||||||
|
import Button from './Button.js';
|
||||||
|
import Popup from './Popup.js';
|
||||||
|
|
||||||
import './css/StopTitle.css';
|
import './css/StopTitle.css';
|
||||||
|
|
||||||
|
|
||||||
class StopTitle extends Component {
|
class StopTitle extends Component {
|
||||||
|
constructor(props) {
|
||||||
|
super(props);
|
||||||
|
this.popupElem = React.createRef();
|
||||||
|
}
|
||||||
|
|
||||||
|
showPopup = () => {
|
||||||
|
this.popupElem.current.show();
|
||||||
|
};
|
||||||
|
|
||||||
|
hidePopup = () => {
|
||||||
|
this.popupElem.current.hide();
|
||||||
|
};
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div id="stopTitle">
|
<div id="stopTitle">
|
||||||
<h1>{this.props.stop.name}</h1>
|
<Popup ref={this.popupElem} className="">
|
||||||
<div>
|
<h3>Välj läge:</h3>
|
||||||
<h3>{this.props.stop.locations[0]}</h3>
|
<ul>
|
||||||
<button>Byt Läge</button>
|
<>
|
||||||
</div>
|
<li><Button onClick={[this.hidePopup]}>{"Läge A"}</Button></li>
|
||||||
|
<li><Button onClick={[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 ?
|
||||||
|
<div>
|
||||||
|
<h3>
|
||||||
|
<span>{"Läge " + this.props.stop.track}</span>
|
||||||
|
</h3>
|
||||||
|
<Button onclick={this.showPopup}>Byt Läge</Button>
|
||||||
|
</div>
|
||||||
|
:
|
||||||
|
(this.props.stop.name !== undefined ?
|
||||||
|
<></>
|
||||||
|
: <h3>Vänligen aktivera platsåtkomst</h3>
|
||||||
|
)
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
import React, { Component } from 'react';
|
import React, { Component } from 'react';
|
||||||
|
import { Link } from 'react-router-dom';
|
||||||
|
|
||||||
import './css/TrafficInfo.css';
|
import './css/TrafficInfo.css';
|
||||||
|
|
||||||
@ -6,6 +7,29 @@ import busIcon from '../img/bus.svg';
|
|||||||
import warningIcon from '../img/warning.svg';
|
import warningIcon from '../img/warning.svg';
|
||||||
|
|
||||||
class TrafficEntry extends Component {
|
class TrafficEntry extends Component {
|
||||||
|
state = {
|
||||||
|
expanded: false
|
||||||
|
};
|
||||||
|
|
||||||
|
toggle = () => {
|
||||||
|
if (this.state.expanded)
|
||||||
|
this.collapse();
|
||||||
|
else
|
||||||
|
this.expand();
|
||||||
|
};
|
||||||
|
|
||||||
|
expand = () => {
|
||||||
|
this.setState({
|
||||||
|
expanded: true
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
collapse = () => {
|
||||||
|
this.setState({
|
||||||
|
expanded: false
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
let trafficInfo = this.props.departure.trafficInfo;
|
let trafficInfo = this.props.departure.trafficInfo;
|
||||||
let lineInterference = trafficInfo !== "" && trafficInfo !== null && trafficInfo !== undefined;
|
let lineInterference = trafficInfo !== "" && trafficInfo !== null && trafficInfo !== undefined;
|
||||||
@ -14,25 +38,40 @@ class TrafficEntry extends Component {
|
|||||||
<div className="trafficEntry">
|
<div className="trafficEntry">
|
||||||
<div>
|
<div>
|
||||||
<div className="timeColumn">
|
<div className="timeColumn">
|
||||||
<span>{this.props.departure.time}</span>
|
{!lineInterference &&
|
||||||
|
<span>{this.props.departure.time}</span>
|
||||||
|
}
|
||||||
{lineInterference &&
|
{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>
|
||||||
|
</div>
|
||||||
<img src={warningIcon} alt=""></img>
|
<img src={warningIcon} alt=""></img>
|
||||||
|
</>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
<div className="lineColumn">
|
<div className="lineColumn">
|
||||||
<div>
|
<div>
|
||||||
<span className="lineName">{this.props.departure.lineName}</span>
|
<span className="lineName">{this.props.departure.sname}</span>
|
||||||
<img src={busIcon} alt=""></img>
|
<img src={busIcon} alt=""></img>
|
||||||
<span className="destination">{this.props.departure.finalStop}</span>
|
<span className="destination">{"Mot " + this.props.departure.direction}</span>
|
||||||
</div>
|
</div>
|
||||||
{lineInterference &&
|
{lineInterference &&
|
||||||
<p>{trafficInfo} <u>Visa mer</u></p>
|
<div className="infoWrapper" onClick={this.toggle}>
|
||||||
|
<p className={`${this.state.expanded ? "expanded" : ""}`}>{trafficInfo}</p>
|
||||||
|
<span style={{display: (this.state.expanded ? "none" : "block") }}><u>Visa mer</u></span>
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{lineInterference &&
|
{lineInterference &&
|
||||||
<button>Hitta annan resväg</button>
|
<Link to={
|
||||||
|
{ pathname: "/travel"
|
||||||
|
, to: this.props.departure.direction
|
||||||
|
}
|
||||||
|
}>Hitta annan resväg</Link>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -8,20 +8,22 @@ class TrafficList extends Component {
|
|||||||
render() {
|
render() {
|
||||||
let entries = [];
|
let entries = [];
|
||||||
|
|
||||||
let i = 0; // React requires elems in array to have associated unique key
|
if (this.props.departures) {
|
||||||
|
let i = 0; // React requires elems in array to have associated unique key
|
||||||
|
|
||||||
this.props.departures.forEach(departure => {
|
this.props.departures.forEach(departure => {
|
||||||
entries.push(
|
entries.push(
|
||||||
<TrafficEntry key={i++} departure={departure} />
|
<TrafficEntry key={i++} departure={departure} />
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Add separator between every element
|
// Add separator between every element
|
||||||
const intersperse = (arr, sep) => arr.reduce((a,v)=>[...a,v,sep],[]).slice(0,-1);
|
const intersperse = (arr, sep) => arr.reduce((a,v)=>[...a,v,sep],[]).slice(0,-1);
|
||||||
entries = intersperse(entries, (<hr key={i++} />));
|
entries = intersperse(entries, (<hr key={i++} />));
|
||||||
|
|
||||||
// Add separator after the last element
|
// Add separator after the last element
|
||||||
entries.push(<hr key={i++} />);
|
entries.push(<hr key={i++} />);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div id="trafficList">
|
<div id="trafficList">
|
||||||
|
|||||||
@ -5,10 +5,10 @@ class TripSelector extends Component {
|
|||||||
return (
|
return (
|
||||||
<form>
|
<form>
|
||||||
<label>Från:</label>
|
<label>Från:</label>
|
||||||
<input type="text" placeholder="Hållplats/Adress/Plats" />
|
<input type="text" placeholder="Hållplats/Adress/Plats" defaultValue={this.props.from}/>
|
||||||
<hr/>
|
<hr/>
|
||||||
<label>Till:</label>
|
<label>Till:</label>
|
||||||
<input type="text" placeholder="Hållplats/Adress/Plats" />
|
<input type="text" placeholder="Hållplats/Adress/Plats" defaultValue={this.props.to} />
|
||||||
</form>
|
</form>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#bottomMenu {
|
#bottomMenu {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 9vh;
|
height: 9vh;
|
||||||
min-height: 60px;
|
min-height: 70px;
|
||||||
background: white;
|
background: white;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-evenly;
|
justify-content: space-evenly;
|
||||||
|
|||||||
@ -1,3 +1,7 @@
|
|||||||
button:active {
|
button:active {
|
||||||
background: rgba(0, 0, 0, 0.1);
|
background: rgba(0, 0, 0, 0.1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
a:active {
|
||||||
|
background: rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
@ -3,7 +3,7 @@ header {
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 15px 15px 15vh 15px;
|
padding: 15px 15px 12vh 15px;
|
||||||
top: 0;
|
top: 0;
|
||||||
background: linear-gradient(90deg, var(--colorVT1), var(--colorVT2));
|
background: linear-gradient(90deg, var(--colorVT1), var(--colorVT2));
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,6 +3,6 @@ main {
|
|||||||
flex: 1 1 auto;
|
flex: 1 1 auto;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-flow: column;
|
flex-flow: column;
|
||||||
justify-content: space-evenly;
|
justify-content: flex-start;
|
||||||
overflow: hidden scroll;
|
overflow: hidden scroll;
|
||||||
}
|
}
|
||||||
@ -8,21 +8,38 @@
|
|||||||
justify-content: space-evenly;
|
justify-content: space-evenly;
|
||||||
padding: 0 5vw;
|
padding: 0 5vw;
|
||||||
z-index: 4;
|
z-index: 4;
|
||||||
|
max-width: 80vw;
|
||||||
}
|
}
|
||||||
|
|
||||||
#stopTitle h1, #stopTitle h3 {
|
#stopTitle h1, #stopTitle h3 {
|
||||||
font-weight: 100;
|
font-weight: 100;
|
||||||
}
|
}
|
||||||
|
|
||||||
#stopTitle div {
|
#stopTitle h1 {
|
||||||
display: flex;
|
font-size: 9vw;
|
||||||
flex-direction: row;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#stopTitle h3 {
|
#stopTitle h3 {
|
||||||
|
font-size: 5vw;
|
||||||
color: var(--colorDiscrete);
|
color: var(--colorDiscrete);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media screen and (min-width: 400px) {
|
||||||
|
#stopTitle h1 {
|
||||||
|
font-size: 35px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#stopTitle h3 {
|
||||||
|
font-size: 20px;
|
||||||
|
color: var(--colorDiscrete);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#stopTitle div {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
}
|
||||||
|
|
||||||
#stopTitle button {
|
#stopTitle button {
|
||||||
width: auto;
|
width: auto;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
#trafficList {
|
#trafficList {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
margin-top: 40px;
|
margin-top: 40px;
|
||||||
|
padding-bottom: 40px;
|
||||||
background: white;
|
background: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -10,8 +11,9 @@
|
|||||||
justify-content: space-evenly;
|
justify-content: space-evenly;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
width: 100vw;
|
width: 100vw;
|
||||||
padding: 6vw 0;
|
padding: 8vw 0;
|
||||||
background: white;
|
background: white;
|
||||||
|
font-size: 3.5vw;
|
||||||
}
|
}
|
||||||
|
|
||||||
.trafficEntry div {
|
.trafficEntry div {
|
||||||
@ -19,13 +21,25 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
justify-content: space-evenly;
|
justify-content: space-evenly;
|
||||||
margin-bottom: 8px;
|
margin-bottom: 2vh;
|
||||||
|
}
|
||||||
|
|
||||||
|
.trafficEntry div:only-child {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.trafficEntry div:only-child > .timeColumn,
|
||||||
|
.trafficEntry div:only-child > .lineColumn {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.trafficEntry div:only-child > .timeColumn {
|
||||||
|
justify-content: center !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.trafficEntry div p {
|
.trafficEntry div p {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
font-size: 3.5vw;
|
padding: 3vh 0 0 0;
|
||||||
padding: 3vw 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.trafficEntry div div {
|
.trafficEntry div div {
|
||||||
@ -33,25 +47,6 @@
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
|
|
||||||
.timeColumn {
|
|
||||||
flex-basis: 15%;
|
|
||||||
justify-content: flex-start;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.timeColumn img {
|
|
||||||
width: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.lineColumn {
|
|
||||||
flex-basis: 75%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.lineColumn img {
|
|
||||||
width: 30px;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.trafficEntry div div div {
|
.trafficEntry div div div {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
@ -59,6 +54,53 @@
|
|||||||
align-items: flex-end;
|
align-items: flex-end;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.timeColumn {
|
||||||
|
flex-basis: 15%;
|
||||||
|
justify-content: space-between !important;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timeColumn div {
|
||||||
|
align-items: center !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timeColumn img {
|
||||||
|
width: 3.5vw;
|
||||||
|
}
|
||||||
|
|
||||||
|
.lineColumn {
|
||||||
|
flex-basis: 75%;
|
||||||
|
max-width: 75%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.lineColumn div {
|
||||||
|
margin-bottom: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.lineColumn img {
|
||||||
|
width: 7.5vw;
|
||||||
|
margin-right: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.infoWrapper p {
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
overflow: hidden;
|
||||||
|
flex-basis: 75%;
|
||||||
|
flex-grow: 1;
|
||||||
|
display: block;
|
||||||
|
white-space: nowrap;
|
||||||
|
max-height: 3.5vw;
|
||||||
|
}
|
||||||
|
|
||||||
|
.infoWrapper span {
|
||||||
|
flex-basis: 25%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.expanded {
|
||||||
|
white-space: normal !important;
|
||||||
|
max-height: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
.lineName {
|
.lineName {
|
||||||
background: var(--colorLine);
|
background: var(--colorLine);
|
||||||
color: white;
|
color: white;
|
||||||
@ -69,11 +111,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.destination {
|
.destination {
|
||||||
font-size: 100%;
|
|
||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
.trafficEntry button {
|
.trafficEntry a {
|
||||||
width: 90%;
|
width: 90%;
|
||||||
font-size: 4vw;
|
font-size: 4vw;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
@ -81,4 +122,5 @@
|
|||||||
padding: 4vw 0;
|
padding: 4vw 0;
|
||||||
border-radius: var(--borderRadius);
|
border-radius: var(--borderRadius);
|
||||||
box-shadow: var(--boxShadow);
|
box-shadow: var(--boxShadow);
|
||||||
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
@ -2,13 +2,16 @@ import React, { Component } from 'react';
|
|||||||
|
|
||||||
import Header from '../Header.js';
|
import Header from '../Header.js';
|
||||||
import MainArea from '../MainArea.js';
|
import MainArea from '../MainArea.js';
|
||||||
|
import globalData from '../../GlobalData.js';
|
||||||
|
|
||||||
class Tickets extends Component {
|
class Tickets extends Component {
|
||||||
render() {
|
render() {
|
||||||
|
globalData.currentPage = this;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Header title="Biljetter" />
|
<Header title="Biljetter" />
|
||||||
<MainArea>
|
<MainArea style={{justifyContent: "space-evenly"}}>
|
||||||
<p>Du har inga biljetter</p>
|
<p>Du har inga biljetter</p>
|
||||||
</MainArea>
|
</MainArea>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@ -9,8 +9,12 @@ import clockIcon from '../../img/clock.svg';
|
|||||||
import calendarIcon from '../../img/calendar.svg';
|
import calendarIcon from '../../img/calendar.svg';
|
||||||
import recurringIcon from '../../img/redo.svg';
|
import recurringIcon from '../../img/redo.svg';
|
||||||
|
|
||||||
|
import globalData from '../../GlobalData.js';
|
||||||
|
|
||||||
class TicketsBuy extends Component {
|
class TicketsBuy extends Component {
|
||||||
render() {
|
render() {
|
||||||
|
globalData.currentPage = this;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Header title="Köp biljett" />
|
<Header title="Köp biljett" />
|
||||||
@ -19,7 +23,7 @@ class TicketsBuy extends Component {
|
|||||||
<MenuButton label="Periodbiljett" icon={calendarIcon} />
|
<MenuButton label="Periodbiljett" icon={calendarIcon} />
|
||||||
<MenuButton label="Dygnsbiljett" icon={recurringIcon} />
|
<MenuButton label="Dygnsbiljett" icon={recurringIcon} />
|
||||||
</TopMenu>
|
</TopMenu>
|
||||||
<MainArea>
|
<MainArea style={{justifyContent: "space-evenly"}}>
|
||||||
<p>Du har inga tidigare köp</p>
|
<p>Du har inga tidigare köp</p>
|
||||||
</MainArea>
|
</MainArea>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@ -6,34 +6,21 @@ import MainArea from "../MainArea.js";
|
|||||||
import StopTitle from "../StopTitle.js";
|
import StopTitle from "../StopTitle.js";
|
||||||
import TrafficList from "../TrafficList.js";
|
import TrafficList from "../TrafficList.js";
|
||||||
|
|
||||||
import Stop from "../../classes/Stop.js";
|
import globalData from '../../GlobalData.js';
|
||||||
import Departure from "../../classes/Departure.js";
|
|
||||||
|
|
||||||
|
|
||||||
class TrafficInfo extends Component {
|
class TrafficInfo extends Component {
|
||||||
render() {
|
render() {
|
||||||
let testStop = new Stop(
|
globalData.currentPage = this;
|
||||||
"Lemmingsgatan",
|
|
||||||
["Läge A", "Läge B", "Läge C"],
|
|
||||||
[
|
|
||||||
new Departure(
|
|
||||||
"519",
|
|
||||||
"Mot Heden",
|
|
||||||
"11:59",
|
|
||||||
"Trafikolycka vid Partille Centrum."
|
|
||||||
),
|
|
||||||
new Departure("58", "Mot Västra Eriksberg", "12:07"),
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Header title="Trafikinfo" />
|
<Header title="Trafikinfo" />
|
||||||
<TopMenu>
|
<TopMenu>
|
||||||
<StopTitle stop={testStop} />
|
<StopTitle stop={globalData.stop} />
|
||||||
</TopMenu>
|
</TopMenu>
|
||||||
<MainArea>
|
<MainArea>
|
||||||
<TrafficList departures={testStop.departures} />
|
<TrafficList departures={globalData.stop.departures} />
|
||||||
</MainArea>
|
</MainArea>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -7,15 +7,22 @@ import TripSelector from '../TripSelector.js';
|
|||||||
|
|
||||||
import '../css/TripSelector.css';
|
import '../css/TripSelector.css';
|
||||||
|
|
||||||
|
import globalData from '../../GlobalData.js';
|
||||||
|
|
||||||
class Travel extends Component {
|
class Travel extends Component {
|
||||||
render() {
|
render() {
|
||||||
|
globalData.currentPage = this;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Header title="Reseplanering" />
|
<Header title="Reseplanering" />
|
||||||
<TopMenu>
|
<TopMenu>
|
||||||
<TripSelector />
|
<TripSelector
|
||||||
|
from={this.props.location.from}
|
||||||
|
to={this.props.location.to}
|
||||||
|
/>
|
||||||
</TopMenu>
|
</TopMenu>
|
||||||
<MainArea>
|
<MainArea style={{justifyContent: "space-evenly"}}>
|
||||||
</MainArea>
|
</MainArea>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
19
src/img/userDark.svg
Normal file
19
src/img/userDark.svg
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
<?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>
|
||||||
|
After Width: | Height: | Size: 1.0 KiB |
Loading…
Reference in New Issue
Block a user