Compare commits
65 Commits
aw-disrupt
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
0d26321055 | ||
|
|
c294b60b5a | ||
|
|
13bf20c2ea | ||
|
|
30bcbd0286 | ||
|
|
6fc5fd8ea4 | ||
|
|
b07708f3e9 | ||
|
|
84fa5e0597 | ||
|
|
c0a64784ac | ||
|
|
98db97627b | ||
|
|
b56e334d00 | ||
|
|
c1fe945a41 | ||
|
|
919fd4b438 | ||
|
|
be292c8aa3 | ||
|
|
f7cbe39b0d | ||
|
|
078393335a | ||
|
|
5cafe99946 | ||
|
|
28d549de28 | ||
|
|
cd2a61947f | ||
|
|
cf977ccb1f | ||
|
|
1b3f5abd25 | ||
|
|
9e185ef941 | ||
|
|
031829d4f9 | ||
|
|
2b8c08e082 | ||
|
|
19282607ba | ||
|
|
308bd7b99f | ||
|
|
8e21856eb2 | ||
|
|
df3e181e2e | ||
|
|
211257ac67 | ||
|
|
3b6aed2e41 | ||
|
|
2c5567cb62 | ||
|
|
6d6356d576 | ||
|
|
5c59866dc4 | ||
|
|
9ccd2f01c0 | ||
|
|
d304b250a2 | ||
|
|
68b6e4e836 | ||
|
|
3accd7806a | ||
|
|
b207b464bd | ||
|
|
2d2ec96533 | ||
|
|
359c0a8192 | ||
|
|
3c0fc6fe1f | ||
|
|
c7517f185c | ||
|
|
d39f114d5c | ||
|
|
a0ff50ab23 | ||
|
|
ca1ca3884d | ||
|
|
ea2a18f3ad | ||
|
|
75b4ecc4ed | ||
|
|
3080359dcd | ||
|
|
3d7e6cf52f | ||
|
|
34f4b8af18 | ||
|
|
7c59fa2825 | ||
|
|
31263e919e | ||
|
|
d40420ad2b | ||
|
|
4ce76dbe90 | ||
|
|
051afedcc5 | ||
|
|
bff5a73c8c | ||
|
|
093199d0e0 | ||
|
|
25d66f9195 | ||
|
|
4e36270130 | ||
|
|
c36d6afea7 | ||
|
|
ff8a87c961 | ||
|
|
c3edd2d74f | ||
|
|
b324250c79 | ||
|
|
e35524fa19 | ||
|
|
521d3b2e63 | ||
|
|
3bc1ff9a1a |
39
README.md
39
README.md
@ -25,20 +25,37 @@ Tutorials för React går att hitta [här](https://www.youtube.com/playlist?list
|
|||||||
* ``public/index.html`` är den enda HTML-fil vi kommer ha i appen, detta eftersom vi bygger en s.k. SPA (Single Page Application). Man ändrar oftast inget i denna fil utöver möjligtvis innehållet i ``<head>``, detta eftersom React hanterar hela vårt UI.
|
* ``public/index.html`` är den enda HTML-fil vi kommer ha i appen, detta eftersom vi bygger en s.k. SPA (Single Page Application). Man ändrar oftast inget i denna fil utöver möjligtvis innehållet i ``<head>``, detta eftersom React hanterar hela vårt UI.
|
||||||
* Ursprungspunkten för React är ``src/index.js``.
|
* Ursprungspunkten för React är ``src/index.js``.
|
||||||
|
|
||||||
<!--
|
|
||||||
## Upplägg
|
## Upplägg
|
||||||
``` mermaid
|
```mermaid
|
||||||
|
|
||||||
classDiagram
|
classDiagram
|
||||||
|
class User
|
||||||
|
User : String deviceId
|
||||||
|
User : Coordinates location
|
||||||
|
User : nearbyStops()
|
||||||
|
|
||||||
class User
|
class Coordinates
|
||||||
User : Subscription[] subs
|
Coordinates : Float lon
|
||||||
User : Location loc
|
Coordinates : Float lat
|
||||||
|
|
||||||
class Line
|
class Stop
|
||||||
|
Stop : String name
|
||||||
|
Stop : Track[] locations
|
||||||
|
Stop : Departure[] departures
|
||||||
|
|
||||||
class Subscription
|
class Departure
|
||||||
Subscription : Line line
|
Departure : String lineName
|
||||||
|
Departure : Stop finalStop
|
||||||
|
Departure : String time
|
||||||
|
Departure : String trafficInfo
|
||||||
|
|
||||||
```
|
class Track
|
||||||
-->
|
Track : String name
|
||||||
|
|
||||||
|
|
||||||
|
User <.. Coordinates
|
||||||
|
User <.. Stop
|
||||||
|
Stop <.. Departure
|
||||||
|
Departure <.. Stop
|
||||||
|
Stop <.. Track
|
||||||
|
```
|
||||||
10
package-lock.json
generated
10
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",
|
||||||
@ -12386,6 +12391,11 @@
|
|||||||
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
|
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
|
||||||
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
|
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
|
||||||
},
|
},
|
||||||
|
"react-native-push-notification": {
|
||||||
|
"version": "6.1.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/react-native-push-notification/-/react-native-push-notification-6.1.3.tgz",
|
||||||
|
"integrity": "sha512-qNbFCkObCXwSFQbK6hJyx1Bym1D7V4XM8iN2L6eL3GAdNLmeBTdLdx3mPbKJtuaDJ1+deniFTQ2rz6hU4ELOXA=="
|
||||||
|
},
|
||||||
"react-push-notification": {
|
"react-push-notification": {
|
||||||
"version": "1.3.0",
|
"version": "1.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/react-push-notification/-/react-push-notification-1.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/react-push-notification/-/react-push-notification-1.3.0.tgz",
|
||||||
|
|||||||
@ -7,9 +7,11 @@
|
|||||||
"@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",
|
||||||
|
"react-native-push-notification": "^6.1.3",
|
||||||
"react-push-notification": "^1.3.0",
|
"react-push-notification": "^1.3.0",
|
||||||
"react-router-dom": "^5.2.0",
|
"react-router-dom": "^5.2.0",
|
||||||
"react-scripts": "4.0.0",
|
"react-scripts": "4.0.0",
|
||||||
|
|||||||
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": "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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
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": "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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
53
src/APIexamples/departureuser3.json
Normal file
53
src/APIexamples/departureuser3.json
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
{
|
||||||
|
"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"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
29
src/APIexamples/departureuser4.json
Normal file
29
src/APIexamples/departureuser4.json
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
{
|
||||||
|
"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"
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
}
|
||||||
|
}
|
||||||
12
src/APIexamples/disruption1.json
Normal file
12
src/APIexamples/disruption1.json
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"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",
|
||||||
|
"affectedStopPoints":[
|
||||||
|
{
|
||||||
|
"gid": "9022014014614001",
|
||||||
|
"name": "Stenskärsvägen"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
20
src/APIexamples/disruption2.json
Normal file
20
src/APIexamples/disruption2.json
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"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",
|
||||||
|
"affectedStopPoints":[
|
||||||
|
{
|
||||||
|
"gid": "9022014014751001",
|
||||||
|
"name": "Guddeby"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"gid": "9022014014010001",
|
||||||
|
"name": "Hålta kyrka"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"gid": "9022014014614001",
|
||||||
|
"name": "Stenskärsvägen"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
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": "09:34",
|
||||||
|
"serverdate": "2020-12-11",
|
||||||
|
"StopLocation": [
|
||||||
|
{
|
||||||
|
"name": "Guddeby",
|
||||||
|
"id": "9022014014751001",
|
||||||
|
"lat": "57.874665",
|
||||||
|
"lon": "11.903884",
|
||||||
|
"track": "A"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Guddeby",
|
||||||
|
"id": "9021014014751000",
|
||||||
|
"lat": "57.874710",
|
||||||
|
"lon": "11.903929"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Guddeby",
|
||||||
|
"id": "9022014014751002",
|
||||||
|
"lat": "57.874746",
|
||||||
|
"lon": "11.903965",
|
||||||
|
"track": "B"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Stället",
|
||||||
|
"id": "9022014014744001",
|
||||||
|
"lat": "57.869784",
|
||||||
|
"lon": "11.904172",
|
||||||
|
"track": "A"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
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": "09:35",
|
||||||
|
"serverdate": "2020-12-11",
|
||||||
|
"StopLocation": [
|
||||||
|
{
|
||||||
|
"name": "Hålta kyrka",
|
||||||
|
"id": "9022014014010001",
|
||||||
|
"lat": "57.895125",
|
||||||
|
"lon": "11.827854",
|
||||||
|
"track": "A"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Hålta kyrka",
|
||||||
|
"id": "9021014014010000",
|
||||||
|
"lat": "57.895206",
|
||||||
|
"lon": "11.827647"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Hålta kyrka",
|
||||||
|
"id": "9022014014010002",
|
||||||
|
"lat": "57.895278",
|
||||||
|
"lon": "11.827440",
|
||||||
|
"track": "B"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Hålta skola",
|
||||||
|
"id": "9022014014015001",
|
||||||
|
"lat": "57.896015",
|
||||||
|
"lon": "11.824555",
|
||||||
|
"track": "A"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
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": "09:36",
|
||||||
|
"serverdate": "2020-12-11",
|
||||||
|
"StopLocation": [
|
||||||
|
{
|
||||||
|
"name": "Stenskärsvägen",
|
||||||
|
"id": "9022014014614001",
|
||||||
|
"lat": "57.894594",
|
||||||
|
"lon": "11.740128",
|
||||||
|
"track": "A"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Stenskärsvägen",
|
||||||
|
"id": "9022014014614002",
|
||||||
|
"lat": "57.894729",
|
||||||
|
"lon": "11.739984",
|
||||||
|
"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"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
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": "09:37",
|
||||||
|
"serverdate": "2020-12-11",
|
||||||
|
"StopLocation": [
|
||||||
|
{
|
||||||
|
"name": "Kuröd",
|
||||||
|
"id": "9022014014762001",
|
||||||
|
"lat": "57.856687",
|
||||||
|
"lon": "11.864727",
|
||||||
|
"track": "A"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Kuröd",
|
||||||
|
"id": "9021014014762000",
|
||||||
|
"lat": "57.856831",
|
||||||
|
"lon": "11.864260"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Kuröd",
|
||||||
|
"id": "9022014014762002",
|
||||||
|
"lat": "57.856966",
|
||||||
|
"lon": "11.863774",
|
||||||
|
"track": "B"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Skrämmenborg",
|
||||||
|
"id": "9021014014225000",
|
||||||
|
"lat": "57.863528",
|
||||||
|
"lon": "11.867406"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
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": "9022014014751001"
|
||||||
|
}
|
||||||
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": "9022014014010001"
|
||||||
|
}
|
||||||
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": "9022014014614001"
|
||||||
|
}
|
||||||
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": "9022014014762001"
|
||||||
|
}
|
||||||
71
src/App.js
71
src/App.js
@ -2,11 +2,12 @@ import "./variables.css";
|
|||||||
import "./App.css";
|
import "./App.css";
|
||||||
|
|
||||||
import React, { Component } from "react";
|
import React, { Component } from "react";
|
||||||
import { BrowserRouter as Router, Route } from "react-router-dom";
|
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 globalData from './GlobalData.js';
|
||||||
import BottomMenu from "./components/BottomMenu.js";
|
import BottomMenu from "./components/BottomMenu.js";
|
||||||
import AccessToken from "./components/AccessToken.js";
|
|
||||||
import NearbyStation from "./components/NearbyStation";
|
|
||||||
|
|
||||||
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";
|
||||||
@ -14,23 +15,61 @@ import Travel from "./components/pages/Travel.js";
|
|||||||
import TrafficInfo from "./components/pages/TrafficInfo.js";
|
import TrafficInfo from "./components/pages/TrafficInfo.js";
|
||||||
|
|
||||||
import "./variables.css";
|
import "./variables.css";
|
||||||
|
import warningIcon from './img/warning.svg';
|
||||||
|
import closeIcon from './img/close.svg';
|
||||||
|
|
||||||
|
|
||||||
class App extends Component {
|
class App extends Component {
|
||||||
render() {
|
currentPageName = () => {
|
||||||
return (
|
if (globalData.currentPage.constructor !== undefined)
|
||||||
<Router>
|
return globalData.currentPage.constructor.name;
|
||||||
<div className="App">
|
else
|
||||||
<Route path="/" exact component={TicketsBuy} />
|
return "";
|
||||||
<Route path="/tickets" exact component={Tickets} />
|
};
|
||||||
<Route path="/ticketsBuy" exact component={TicketsBuy} />
|
|
||||||
<Route path="/travel" exact component={Travel} />
|
render() {
|
||||||
<Route path="/traffic" exact component={TrafficInfo} />
|
globalData.root = this;
|
||||||
|
|
||||||
<BottomMenu />
|
return (
|
||||||
</div>
|
<Router>
|
||||||
</Router>
|
<div className="App">
|
||||||
|
<Route path="/" exact component={TicketsBuy} />
|
||||||
|
<Route path="/tickets" exact component={Tickets} />
|
||||||
|
<Route path="/ticketsBuy" exact component={TicketsBuy} />
|
||||||
|
<Route path="/travel" exact component={Travel} />
|
||||||
|
<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>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default App;
|
export default App;
|
||||||
|
|||||||
21
src/GlobalData.js
Normal file
21
src/GlobalData.js
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
import User from './classes/User.js';
|
||||||
|
import Disruption from './classes/Disruption.js'
|
||||||
|
import Coordinates from './classes/Coordinates.js';
|
||||||
|
import Stop from './classes/Stop.js'
|
||||||
|
|
||||||
|
let globalData = {
|
||||||
|
users : [],
|
||||||
|
user: new User(
|
||||||
|
"Exempelanvändare",
|
||||||
|
"123",
|
||||||
|
new Coordinates(),
|
||||||
|
"123"
|
||||||
|
),
|
||||||
|
disruption: new Disruption(
|
||||||
|
),
|
||||||
|
stop: new Stop(
|
||||||
|
),
|
||||||
|
currentPage: ""
|
||||||
|
};
|
||||||
|
|
||||||
|
export default globalData;
|
||||||
20
src/classes/AccessToken.js
Normal file
20
src/classes/AccessToken.js
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
import axios from 'axios';
|
||||||
|
|
||||||
|
class AccessToken {
|
||||||
|
credentials = 'NXR5N2d4bUFmUWxVSERIZG03a2dhcVh3SzVJYTp3cElPVVJuSkpjVHRPNnJPUlltWVlQcTR3WGth'
|
||||||
|
device = '123'
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
const headers = {
|
||||||
|
'Content-Type': 'application/x-www-form-urlencoded',
|
||||||
|
'Authorization': 'Basic ' + this.credentials
|
||||||
|
};
|
||||||
|
|
||||||
|
axios.post('https://api.vasttrafik.se/token','grant_type=client_credentials&scope=device_'+this.device, {headers} )
|
||||||
|
.then(response => {
|
||||||
|
this.token = response.data.access_token
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default AccessToken
|
||||||
15
src/classes/Coordinates.js
Normal file
15
src/classes/Coordinates.js
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
/*
|
||||||
|
Denna klass är en modell för platskoordinater.
|
||||||
|
|
||||||
|
lon : Float (Longitud)
|
||||||
|
lat : Float (Latitud)
|
||||||
|
*/
|
||||||
|
|
||||||
|
class Coordinates {
|
||||||
|
constructor(lon, lat) {
|
||||||
|
this.lon = lon;
|
||||||
|
this.lat = lat;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Coordinates;
|
||||||
@ -2,17 +2,22 @@
|
|||||||
Denna klass är en modell för avgångar.
|
Denna klass är en modell för avgångar.
|
||||||
|
|
||||||
lineName : String (Linjenamnet)
|
lineName : String (Linjenamnet)
|
||||||
destination : String (Exempelvis "Mot Heden")
|
finalStop : Stop (Ändhållplats)
|
||||||
time : String (Avgångstid)
|
originalTime : String (Ursprunglig Avgångstid)
|
||||||
info : String (Trafikinformation)
|
newTime : String (Ny Avgångstid)
|
||||||
|
trafficInfo : String (Trafikinformation)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
class Departure {
|
class Departure {
|
||||||
constructor(lineName, destination, time, info) {
|
constructor(lineName, finalStop, originalTime) {
|
||||||
this.lineName = lineName;
|
this.sname = lineName;
|
||||||
this.destination = destination;
|
this.direction = finalStop;
|
||||||
this.time = time;
|
this.time = originalTime;
|
||||||
this.info = info;
|
}
|
||||||
|
|
||||||
|
timeUpdate(time, trafficInfo) {
|
||||||
|
this.newTime = time;
|
||||||
|
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;
|
||||||
@ -2,16 +2,30 @@
|
|||||||
Denna klass är en modell för hållplatser.
|
Denna klass är en modell för hållplatser.
|
||||||
|
|
||||||
name : String (Hållplatsens namn)
|
name : String (Hållplatsens namn)
|
||||||
locations : String[] (Möjliga lägen)
|
locations : Track[] (Möjliga lägen)
|
||||||
departures : Departure[] (Avgångar från hållplatsen)
|
departures : Departure[] (Avgångar från hållplatsen)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
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;
|
||||||
13
src/classes/Track.js
Normal file
13
src/classes/Track.js
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
/*
|
||||||
|
Denna klass är en modell för hållplatslägen, ex. "Läge A" eller "Spår 3".
|
||||||
|
|
||||||
|
name : String (Lägets namn)
|
||||||
|
*/
|
||||||
|
|
||||||
|
class Track {
|
||||||
|
constructor(name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default Track;
|
||||||
20
src/classes/User.js
Normal file
20
src/classes/User.js
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
/*
|
||||||
|
Denna klass är en modell för användare.
|
||||||
|
|
||||||
|
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) {
|
||||||
|
this.name = name;
|
||||||
|
this.deviceId = deviceId;
|
||||||
|
this.location = location;
|
||||||
|
this.stoppointgid = stoppointgid;
|
||||||
|
this.track = track;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default User;
|
||||||
@ -1,65 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import axios from 'axios';
|
|
||||||
|
|
||||||
var globToken = ''
|
|
||||||
|
|
||||||
const GetToken = () => {
|
|
||||||
const vars = {
|
|
||||||
credentials: 'NXR5N2d4bUFmUWxVSERIZG03a2dhcVh3SzVJYTp3cElPVVJuSkpjVHRPNnJPUlltWVlQcTR3WGth',
|
|
||||||
token: undefined,
|
|
||||||
device: '123',
|
|
||||||
}
|
|
||||||
|
|
||||||
const headers = {
|
|
||||||
'Content-Type': 'application/x-www-form-urlencoded',
|
|
||||||
'Authorization': 'Basic ' + vars.credentials
|
|
||||||
};
|
|
||||||
|
|
||||||
axios.post('https://api.vasttrafik.se/token','grant_type=client_credentials&scope=device_'+vars.device, { headers })
|
|
||||||
.then(response => {
|
|
||||||
console.log(response);
|
|
||||||
globToken = response.data.access_token
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
class AccessToken extends React.Component {
|
|
||||||
state = {
|
|
||||||
token: 'No Token',
|
|
||||||
}
|
|
||||||
|
|
||||||
handleChange = event => {
|
|
||||||
this.setState({ token: event.target.value});
|
|
||||||
}
|
|
||||||
|
|
||||||
handleSubmit = event => {
|
|
||||||
event.preventDefault();
|
|
||||||
|
|
||||||
this.setState({
|
|
||||||
credentials: 'Attempting to send token'
|
|
||||||
});
|
|
||||||
GetToken();
|
|
||||||
}
|
|
||||||
|
|
||||||
handleFetch = event => {
|
|
||||||
event.preventDefault();
|
|
||||||
this.setState({token: globToken})
|
|
||||||
}
|
|
||||||
|
|
||||||
render() {
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<form onSubmit={this.handleSubmit}>
|
|
||||||
<button type="submit">Get Token</button>
|
|
||||||
</form>
|
|
||||||
<h1>
|
|
||||||
{this.state.token}
|
|
||||||
</h1>
|
|
||||||
<form onSubmit={this.handleFetch}>
|
|
||||||
<button type="submit">fetch</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export default AccessToken
|
|
||||||
@ -6,8 +6,6 @@ import './css/Button.css';
|
|||||||
class Button extends Component {
|
class Button extends Component {
|
||||||
// Multiple onClick functions
|
// Multiple onClick functions
|
||||||
onClick = () => {
|
onClick = () => {
|
||||||
console.log(this.props.onClick);
|
|
||||||
|
|
||||||
if (this.props.onClick !== null
|
if (this.props.onClick !== null
|
||||||
&& this.props.onClick !== undefined) {
|
&& this.props.onClick !== undefined) {
|
||||||
if (Array.isArray(this.props.onClick)) {
|
if (Array.isArray(this.props.onClick)) {
|
||||||
@ -15,10 +13,8 @@ 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.");
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
console.log("Error when parsing Button onClick functions.");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
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,28 +1,126 @@
|
|||||||
import addNotification from "react-push-notification";
|
import moment from "moment";
|
||||||
|
|
||||||
|
import globalData from '../GlobalData.js';
|
||||||
import Button from './Button.js';
|
import Button from './Button.js';
|
||||||
import disruptIcon from '../img/flash.svg';
|
|
||||||
|
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'
|
||||||
|
|
||||||
|
|
||||||
class DisruptionButton extends Button {
|
class DisruptionButton extends Button {
|
||||||
genDisrupt = () => {
|
constructor(props) {
|
||||||
addNotification({
|
super(props);
|
||||||
title: "Warning",
|
this.state = {
|
||||||
subtitle: "This is a subtitle",
|
jsonLocation: this.props.path,
|
||||||
message: "This is a very long message",
|
disruption: "",
|
||||||
theme: "blue",
|
u1: user1,
|
||||||
native: true, // when using native, your OS will handle theming.
|
u2: user2,
|
||||||
});
|
u3: user3,
|
||||||
}
|
u4: user4,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
render() {
|
updatePage = () => {
|
||||||
return (
|
globalData.currentPage.forceUpdate();
|
||||||
<Button onClick={this.props.onClick.concat([this.genDisrupt])} className="disruptBtn">
|
}
|
||||||
<img src={disruptIcon} alt="" />
|
|
||||||
<span>Generera Störning</span>
|
showMomentTime = (time) => {
|
||||||
</Button>
|
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
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} 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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
globalData.disruption = this.state.disruption
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<Button onClick={this.props.onClick.concat([this.genDisrupt, this.updatePage])} className="disruptBtn">
|
||||||
|
{this.props.children}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
45
src/components/FindStops.js
Normal file
45
src/components/FindStops.js
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
|
||||||
|
import globalData 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(globalData.user.deviceId === "1"){
|
||||||
|
this.state.locations = locationuser1.LocationList.StopLocation
|
||||||
|
}else if (globalData.user.deviceId === "2"){
|
||||||
|
this.state.locations = locationuser2.LocationList.StopLocation
|
||||||
|
}else if (globalData.user.deviceId === "3"){
|
||||||
|
this.state.locations = locationuser3.LocationList.StopLocation
|
||||||
|
}else if (globalData.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>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -5,14 +5,14 @@ class MenuButton extends Button {
|
|||||||
render() {
|
render() {
|
||||||
if (this.props.childOrderReverse) {
|
if (this.props.childOrderReverse) {
|
||||||
return (
|
return (
|
||||||
<Button>
|
<Button className="menuButton">
|
||||||
<span>{this.props.label}</span>
|
<span>{this.props.label}</span>
|
||||||
<img src={this.props.icon} alt="" />
|
<img src={this.props.icon} alt="" />
|
||||||
</Button>
|
</Button>
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
return (
|
return (
|
||||||
<Button>
|
<Button className="menuButton">
|
||||||
<img src={this.props.icon} alt="" />
|
<img src={this.props.icon} alt="" />
|
||||||
<span>{this.props.label}</span>
|
<span>{this.props.label}</span>
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@ -1,12 +1,15 @@
|
|||||||
import React, { Component } from 'react';
|
import React, { Component } from 'react';
|
||||||
|
|
||||||
|
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';
|
||||||
|
|
||||||
import './css/NavigationDrawer.css';
|
import './css/NavigationDrawer.css';
|
||||||
|
|
||||||
import userIcon from '../img/user.svg';
|
import userIcon from '../img/user.svg';
|
||||||
|
import disruptIcon from '../img/flash.svg';
|
||||||
|
|
||||||
|
|
||||||
class NavigationDrawer extends Component {
|
class NavigationDrawer extends Component {
|
||||||
@ -42,27 +45,37 @@ 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 scenario:</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>
|
||||||
|
|
||||||
<div id="navDrawer" className={`${this.state.open ? "open" : ""}`}>
|
<div id="navDrawer" className={`${this.state.open ? "open" : ""}`}>
|
||||||
<header>
|
<header>
|
||||||
<img src={userIcon} alt="" />
|
<img src={userIcon} alt="" />
|
||||||
<span>Mitt konto</span>
|
<span>{globalData.user.name}</span>
|
||||||
<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="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>
|
||||||
</div>
|
</div>
|
||||||
<hr />
|
<hr />
|
||||||
<span id="version">Projektgrupp 3 - Utmaning 7</span>
|
<span id="version">Projektgrupp 3 - Utmaning 7</span>
|
||||||
|
|||||||
@ -1,5 +1,8 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
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 = {
|
||||||
@ -7,7 +10,7 @@ class NearbyStation extends React.Component {
|
|||||||
long: '12.0',
|
long: '12.0',
|
||||||
stops: [],
|
stops: [],
|
||||||
token: undefined,
|
token: undefined,
|
||||||
device: '123',
|
tokenClass: new AccessToken()
|
||||||
}
|
}
|
||||||
|
|
||||||
handleChangeLat = event => {
|
handleChangeLat = event => {
|
||||||
@ -18,22 +21,15 @@ class NearbyStation extends React.Component {
|
|||||||
this.setState({ long: event.target.value});
|
this.setState({ long: event.target.value});
|
||||||
}
|
}
|
||||||
|
|
||||||
handleChangeToken = event => {
|
|
||||||
this.setState({ token: event.target.value})
|
|
||||||
}
|
|
||||||
|
|
||||||
handleSubmit = event => {
|
handleSubmit = event => {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|
||||||
const headers = {
|
const headers = {
|
||||||
'Authorization': 'Bearer ' + this.state.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,
|
||||||
})
|
})
|
||||||
@ -52,10 +48,6 @@ class NearbyStation extends React.Component {
|
|||||||
Longitude coord:
|
Longitude coord:
|
||||||
<input type="text" name="long" onChange={this.handleChangeLong} />
|
<input type="text" name="long" onChange={this.handleChangeLong} />
|
||||||
</label>
|
</label>
|
||||||
<label>
|
|
||||||
Token:
|
|
||||||
<input type="text" name="token" onChange={this.handleChangeToken} />
|
|
||||||
</label>
|
|
||||||
<button type="submit">Stops</button>
|
<button type="submit">Stops</button>
|
||||||
</form>
|
</form>
|
||||||
<h1>
|
<h1>
|
||||||
@ -65,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
|
|
||||||
90
src/components/SelectUserButton.js
Normal file
90
src/components/SelectUserButton.js
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
import globalData 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';
|
||||||
|
|
||||||
|
|
||||||
|
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
|
||||||
|
}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
|
||||||
|
}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
|
||||||
|
}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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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,69 @@
|
|||||||
import React, { Component } from 'react';
|
import React, { Component } from 'react';
|
||||||
|
|
||||||
|
import Button from './Button.js';
|
||||||
|
import Popup from './Popup.js';
|
||||||
|
import globalData from '../GlobalData.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();
|
||||||
|
};
|
||||||
|
|
||||||
|
setTrackA = () => {
|
||||||
|
globalData.user.track = "A";
|
||||||
|
};
|
||||||
|
|
||||||
|
setTrackB = () => {
|
||||||
|
globalData.user.track = "B";
|
||||||
|
};
|
||||||
|
|
||||||
|
updatePage = () => {
|
||||||
|
globalData.currentPage.forceUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
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.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 ?
|
||||||
|
<div>
|
||||||
|
<h3>
|
||||||
|
<span>{"Läge " + globalData.user.track}</span>
|
||||||
|
</h3>
|
||||||
|
<Button className="changeTrackBtn" 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,33 +7,74 @@ 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.info;
|
let trafficInfo = this.props.departure.trafficInfo;
|
||||||
let lineInterference = trafficInfo !== "" && trafficInfo !== null;
|
let lineInterference = trafficInfo !== "" && trafficInfo !== null && trafficInfo !== undefined;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<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.destination}</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}
|
||||||
|
<span style={{display: (this.state.expanded ? "inline" : "none"), marginLeft: "5px" }}><u>Visa mindre</u></span>
|
||||||
|
</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>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -7,21 +7,23 @@ import './css/TrafficInfo.css';
|
|||||||
class TrafficList extends Component {
|
class TrafficList extends Component {
|
||||||
render() {
|
render() {
|
||||||
let entries = [];
|
let entries = [];
|
||||||
|
|
||||||
|
if (this.props.departures) {
|
||||||
|
let i = 0; // React requires elems in array to have associated unique key
|
||||||
|
|
||||||
let i = 0; // React requires elems in array to have associated unique key
|
this.props.departures.forEach(departure => {
|
||||||
|
entries.push(
|
||||||
|
<TrafficEntry key={i++} departure={departure} />
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
this.props.departures.forEach(departure => {
|
// Add separator between every element
|
||||||
entries.push(
|
const intersperse = (arr, sep) => arr.reduce((a,v)=>[...a,v,sep],[]).slice(0,-1);
|
||||||
<TrafficEntry key={i++} departure={departure} />
|
entries = intersperse(entries, (<hr key={i++} />));
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
// Add separator between every element
|
// Add separator after the last element
|
||||||
const intersperse = (arr, sep) => arr.reduce((a,v)=>[...a,v,sep],[]).slice(0,-1);
|
entries.push(<hr key={i++} />);
|
||||||
entries = intersperse(entries, (<hr key={i++} />));
|
}
|
||||||
|
|
||||||
// Add separator after the last element
|
|
||||||
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;
|
||||||
}
|
}
|
||||||
@ -5,6 +5,8 @@
|
|||||||
transform: translate(-50%, -50%) scale(0);
|
transform: translate(-50%, -50%) scale(0);
|
||||||
transform-origin: center;
|
transform-origin: center;
|
||||||
background: white;
|
background: white;
|
||||||
|
display: flex !important;
|
||||||
|
flex-direction: column !important;
|
||||||
width: 55vw;
|
width: 55vw;
|
||||||
height: 39vh;
|
height: 39vh;
|
||||||
padding: 3vh 5vw;
|
padding: 3vh 5vw;
|
||||||
@ -21,16 +23,26 @@
|
|||||||
|
|
||||||
.popup h3 {
|
.popup h3 {
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
|
display: block;
|
||||||
|
font-size: 1.17em;
|
||||||
|
font-weight: bold !important;
|
||||||
|
text-align: center;
|
||||||
|
color: black !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.popup ul {
|
.popup ul {
|
||||||
list-style: none;
|
list-style: none;
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.popup li button {
|
.popup li button {
|
||||||
width: 100%;
|
width: 100% !important;
|
||||||
padding: 8% 0;
|
height: 50px;
|
||||||
font-size: 16px;
|
padding: 8% 0 !important;
|
||||||
|
font-size: 16px !important;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.popupClose {
|
.popupClose {
|
||||||
|
|||||||
@ -8,22 +8,40 @@
|
|||||||
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: 3.5vh;
|
||||||
flex-direction: row;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#stopTitle h3 {
|
#stopTitle h3 {
|
||||||
|
font-size: 5vw;
|
||||||
color: var(--colorDiscrete);
|
color: var(--colorDiscrete);
|
||||||
}
|
}
|
||||||
|
|
||||||
#stopTitle button {
|
@media screen and (min-width: 400px) {
|
||||||
|
#stopTitle h1 {
|
||||||
|
font-size: 4vh;
|
||||||
|
}
|
||||||
|
|
||||||
|
#stopTitle h3 {
|
||||||
|
font-size: 20px;
|
||||||
|
color: var(--colorDiscrete);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#stopTitle div {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.changeTrackBtn {
|
||||||
width: auto;
|
width: auto;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
@ -35,6 +53,6 @@
|
|||||||
border-radius: calc(var(--topMenuHeight) / 15);
|
border-radius: calc(var(--topMenuHeight) / 15);
|
||||||
}
|
}
|
||||||
|
|
||||||
#stopTitle button:active {
|
.changeTrackBtn:active {
|
||||||
background: rgba(0, 0, 0, 0.3);
|
background: rgba(0, 0, 0, 0.3);
|
||||||
}
|
}
|
||||||
@ -6,7 +6,7 @@
|
|||||||
justify-content: space-evenly;
|
justify-content: space-evenly;
|
||||||
}
|
}
|
||||||
|
|
||||||
#topMenu button {
|
#topMenu .menuButton {
|
||||||
width: var(--topMenuHeight);
|
width: var(--topMenuHeight);
|
||||||
height: calc(var(--topMenuHeight) / 1.3);
|
height: calc(var(--topMenuHeight) / 1.3);
|
||||||
display: flex;
|
display: flex;
|
||||||
@ -17,7 +17,7 @@
|
|||||||
box-shadow: var(--boxShadow);
|
box-shadow: var(--boxShadow);
|
||||||
}
|
}
|
||||||
|
|
||||||
#topMenu button:active {
|
#topMenu .menuButton:active {
|
||||||
background: rgb(235, 235, 235);
|
background: rgb(235, 235, 235);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
#trafficList {
|
#trafficList {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
margin-top: 40px;
|
margin-top: 40px;
|
||||||
|
padding-bottom: 40px;
|
||||||
background: white;
|
background: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -10,22 +11,35 @@
|
|||||||
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 {
|
||||||
width: 90%;
|
width: 90%;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
justify-content: space-evenly;
|
justify-content: flex-start;
|
||||||
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: 2vh 0 0 0;
|
||||||
padding: 3vw 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.trafficEntry div div {
|
.trafficEntry div div {
|
||||||
@ -33,30 +47,62 @@
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.trafficEntry div div div {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
justify-content: space-around;
|
||||||
|
align-items: flex-end;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timeColumn div:first-child, .lineColumn div:first-child {
|
||||||
|
height: 5.5vh;
|
||||||
|
}
|
||||||
|
|
||||||
.timeColumn {
|
.timeColumn {
|
||||||
flex-basis: 15%;
|
flex-basis: 20%;
|
||||||
justify-content: flex-start;
|
justify-content: flex-start !important;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.timeColumn div {
|
||||||
|
align-items: center !important;
|
||||||
|
}
|
||||||
|
|
||||||
.timeColumn img {
|
.timeColumn img {
|
||||||
width: 20px;
|
width: 3.5vw;
|
||||||
}
|
}
|
||||||
|
|
||||||
.lineColumn {
|
.lineColumn {
|
||||||
flex-basis: 75%;
|
flex-basis: 75%;
|
||||||
|
max-width: 75%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.lineColumn div {
|
||||||
|
margin-bottom: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.lineColumn img {
|
.lineColumn img {
|
||||||
width: 30px;
|
flex-basis: 25%;
|
||||||
margin-right: 10px;
|
height: 9vw;
|
||||||
}
|
}
|
||||||
|
|
||||||
.trafficEntry div div div {
|
.infoWrapper p {
|
||||||
display: flex;
|
text-overflow: ellipsis;
|
||||||
flex-direction: row;
|
overflow: hidden;
|
||||||
justify-content: flex-start;
|
flex-basis: 75%;
|
||||||
align-items: flex-end;
|
flex-grow: 1;
|
||||||
|
display: block;
|
||||||
|
white-space: nowrap;
|
||||||
|
max-height: 4.5vw;
|
||||||
|
}
|
||||||
|
|
||||||
|
.infoWrapper span {
|
||||||
|
flex-basis: 25%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.expanded {
|
||||||
|
white-space: normal !important;
|
||||||
|
max-height: none !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.lineName {
|
.lineName {
|
||||||
@ -64,16 +110,23 @@
|
|||||||
color: white;
|
color: white;
|
||||||
font-size: 6vw;
|
font-size: 6vw;
|
||||||
font-weight: 100;
|
font-weight: 100;
|
||||||
margin-right: 10px;
|
padding: 1vw 2.5vw;
|
||||||
padding: 1vw 4vw;
|
border-radius: var(--borderRadius);
|
||||||
|
font-family: 'Roboto Light';
|
||||||
|
height: 7vw;
|
||||||
|
flex-basis: 35%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.destination {
|
.destination {
|
||||||
font-size: 100%;
|
flex-basis: 40%;
|
||||||
|
height: 9vw;
|
||||||
|
font-size: 4vw;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-end;
|
||||||
}
|
}
|
||||||
|
|
||||||
.trafficEntry button {
|
.trafficEntry a {
|
||||||
width: 90%;
|
width: 90%;
|
||||||
font-size: 4vw;
|
font-size: 4vw;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
@ -81,4 +134,6 @@
|
|||||||
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;
|
||||||
|
border: 1px solid rgba(0, 0, 0, 0.2);
|
||||||
}
|
}
|
||||||
@ -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,38 +6,25 @@ 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>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default TrafficInfo;
|
export default TrafficInfo;
|
||||||
|
|||||||
@ -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>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
8
src/img/close.svg
Normal file
8
src/img/close.svg
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<?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>
|
||||||
|
After Width: | Height: | Size: 691 B |
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 |
@ -32,4 +32,77 @@ button {
|
|||||||
.hidden {
|
.hidden {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
pointer-events: none;
|
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,10 +5,8 @@ import App from './App';
|
|||||||
import reportWebVitals from './reportWebVitals';
|
import reportWebVitals from './reportWebVitals';
|
||||||
|
|
||||||
ReactDOM.render(
|
ReactDOM.render(
|
||||||
<React.StrictMode>
|
<App />,
|
||||||
<App />
|
document.getElementById('root')
|
||||||
</React.StrictMode>,
|
|
||||||
document.getElementById('root')
|
|
||||||
);
|
);
|
||||||
|
|
||||||
// If you want to start measuring performance in your app, pass a function
|
// If you want to start measuring performance in your app, pass a function
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user