diff --git a/src/APIexamples/departureuser1.json b/src/APIexamples/departureuser1.json
index 6b56110..f9a5ae9 100644
--- a/src/APIexamples/departureuser1.json
+++ b/src/APIexamples/departureuser1.json
@@ -10,7 +10,7 @@
"journeyNumber": "22",
"type": "BUS",
"stopid": "9022014014751002",
- "stop": "Guddeby, Kungälv",
+ "stop": "Guddeby",
"time": "09:40",
"date": "2020-12-11",
"journeyid": "9015014621000022",
@@ -32,7 +32,7 @@
"journeyNumber": "2",
"type": "BUS",
"stopid": "9022014014751002",
- "stop": "Guddeby, Kungälv",
+ "stop": "Guddeby",
"time": "12:29",
"date": "2020-12-11",
"journeyid": "9015014692700002",
diff --git a/src/APIexamples/departureuser2.json b/src/APIexamples/departureuser2.json
index 3d9f6a0..82848e1 100644
--- a/src/APIexamples/departureuser2.json
+++ b/src/APIexamples/departureuser2.json
@@ -10,7 +10,7 @@
"journeyNumber": "22",
"type": "BUS",
"stopid": "9022014014010002",
- "stop": "Hålta kyrka, Kungälv",
+ "stop": "Hålta kyrka",
"time": "09:47",
"date": "2020-12-11",
"journeyid": "9015014621000022",
@@ -32,7 +32,7 @@
"journeyNumber": "2",
"type": "BUS",
"stopid": "9022014014010002",
- "stop": "Hålta kyrka, Kungälv",
+ "stop": "Hålta kyrka",
"time": "12:38",
"date": "2020-12-11",
"journeyid": "9015014692700002",
diff --git a/src/APIexamples/departureuser3.json b/src/APIexamples/departureuser3.json
index fe689cf..8bcee7a 100644
--- a/src/APIexamples/departureuser3.json
+++ b/src/APIexamples/departureuser3.json
@@ -10,7 +10,7 @@
"journeyNumber": "22",
"type": "BUS",
"stopid": "9022014014614002",
- "stop": "Stenskärsvägen, Kungälv",
+ "stop": "Stenskärsvägen",
"time": "09:52",
"date": "2020-12-11",
"journeyid": "9015014621000022",
@@ -32,7 +32,7 @@
"journeyNumber": "10",
"type": "BUS",
"stopid": "9022014014614002",
- "stop": "Stenskärsvägen, Kungälv",
+ "stop": "Stenskärsvägen",
"time": "10:44",
"date": "2020-12-11",
"journeyid": "9015014632000010",
diff --git a/src/APIexamples/departureuser4.json b/src/APIexamples/departureuser4.json
index d8ad285..325d264 100644
--- a/src/APIexamples/departureuser4.json
+++ b/src/APIexamples/departureuser4.json
@@ -9,7 +9,7 @@
"journeyNumber": "10",
"type": "BUS",
"stopid": "9022014014225001",
- "stop": "Skrämmenborg, Kungälv",
+ "stop": "Skrämmenborg",
"time": "15:19",
"date": "2020-12-11",
"journeyid": "9015014692800010",
diff --git a/src/APIexamples/disruption1.json b/src/APIexamples/disruption1.json
index fe948d3..ca12dce 100644
--- a/src/APIexamples/disruption1.json
+++ b/src/APIexamples/disruption1.json
@@ -4,13 +4,9 @@
"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": "9022014014010001",
- "name": "Hålta kyrka, Kungälv"
- },
{
"gid": "9022014014614001",
- "name": "Stenskärsvägen, Kungälv"
+ "name": "Stenskärsvägen"
}
]
}
\ No newline at end of file
diff --git a/src/APIexamples/disruption2.json b/src/APIexamples/disruption2.json
index e66a95a..33b5c80 100644
--- a/src/APIexamples/disruption2.json
+++ b/src/APIexamples/disruption2.json
@@ -5,8 +5,16 @@
"time":"00:09",
"affectedStopPoints":[
{
- "gid": "9022014014762001",
- "name": "Kuröd, Kungälv"
+ "gid": "9022014014751001",
+ "name": "Guddeby"
+ },
+ {
+ "gid": "9022014014010001",
+ "name": "Hålta kyrka"
+ },
+ {
+ "gid": "9022014014614001",
+ "name": "Stenskärsvägen"
}
]
}
\ No newline at end of file
diff --git a/src/APIexamples/locationuser1.json b/src/APIexamples/locationuser1.json
index f8b13db..41e5132 100644
--- a/src/APIexamples/locationuser1.json
+++ b/src/APIexamples/locationuser1.json
@@ -5,27 +5,27 @@
"serverdate": "2020-12-11",
"StopLocation": [
{
- "name": "Guddeby, Kungälv",
+ "name": "Guddeby",
"id": "9022014014751001",
"lat": "57.874665",
"lon": "11.903884",
"track": "A"
},
{
- "name": "Guddeby, Kungälv",
+ "name": "Guddeby",
"id": "9021014014751000",
"lat": "57.874710",
"lon": "11.903929"
},
{
- "name": "Guddeby, Kungälv",
+ "name": "Guddeby",
"id": "9022014014751002",
"lat": "57.874746",
"lon": "11.903965",
"track": "B"
},
{
- "name": "Stället, Kungälv",
+ "name": "Stället",
"id": "9022014014744001",
"lat": "57.869784",
"lon": "11.904172",
diff --git a/src/APIexamples/locationuser2.json b/src/APIexamples/locationuser2.json
index 7fdd235..1468101 100644
--- a/src/APIexamples/locationuser2.json
+++ b/src/APIexamples/locationuser2.json
@@ -5,27 +5,27 @@
"serverdate": "2020-12-11",
"StopLocation": [
{
- "name": "Hålta kyrka, Kungälv",
+ "name": "Hålta kyrka",
"id": "9022014014010001",
"lat": "57.895125",
"lon": "11.827854",
"track": "A"
},
{
- "name": "Hålta kyrka, Kungälv",
+ "name": "Hålta kyrka",
"id": "9021014014010000",
"lat": "57.895206",
"lon": "11.827647"
},
{
- "name": "Hålta kyrka, Kungälv",
+ "name": "Hålta kyrka",
"id": "9022014014010002",
"lat": "57.895278",
"lon": "11.827440",
"track": "B"
},
{
- "name": "Hålta skola, Kungälv",
+ "name": "Hålta skola",
"id": "9022014014015001",
"lat": "57.896015",
"lon": "11.824555",
diff --git a/src/APIexamples/locationuser3.json b/src/APIexamples/locationuser3.json
index cb4906f..64140f1 100644
--- a/src/APIexamples/locationuser3.json
+++ b/src/APIexamples/locationuser3.json
@@ -5,27 +5,27 @@
"serverdate": "2020-12-11",
"StopLocation": [
{
- "name": "Stenskärsvägen, Kungälv",
+ "name": "Stenskärsvägen",
"id": "9022014014614001",
"lat": "57.894594",
"lon": "11.740128",
"track": "A"
},
{
- "name": "Stenskärsvägen, Kungälv",
+ "name": "Stenskärsvägen",
"id": "9022014014614002",
"lat": "57.894729",
"lon": "11.739984",
"track": "B"
},
{
- "name": "Stenskärsvägen, Kungälv",
+ "name": "Stenskärsvägen",
"id": "9021014014614000",
"lat": "57.894738",
"lon": "11.739858"
},
{
- "name": "Tjuvkilsboden, Kungälv",
+ "name": "Tjuvkilsboden",
"id": "9022014014615002",
"lat": "57.892743",
"lon": "11.743490",
diff --git a/src/APIexamples/locationuser4.json b/src/APIexamples/locationuser4.json
index 38f7289..db0eb86 100644
--- a/src/APIexamples/locationuser4.json
+++ b/src/APIexamples/locationuser4.json
@@ -5,27 +5,27 @@
"serverdate": "2020-12-11",
"StopLocation": [
{
- "name": "Kuröd, Kungälv",
+ "name": "Kuröd",
"id": "9022014014762001",
"lat": "57.856687",
"lon": "11.864727",
"track": "A"
},
{
- "name": "Kuröd, Kungälv",
+ "name": "Kuröd",
"id": "9021014014762000",
"lat": "57.856831",
"lon": "11.864260"
},
{
- "name": "Kuröd, Kungälv",
+ "name": "Kuröd",
"id": "9022014014762002",
"lat": "57.856966",
"lon": "11.863774",
"track": "B"
},
{
- "name": "Skrämmenborg, Kungälv",
+ "name": "Skrämmenborg",
"id": "9021014014225000",
"lat": "57.863528",
"lon": "11.867406"
diff --git a/src/App.js b/src/App.js
index f338a98..fd40510 100644
--- a/src/App.js
+++ b/src/App.js
@@ -2,12 +2,12 @@ import "./variables.css";
import "./App.css";
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 NearbyStation from "./components/NearbyStation.js";
-import Disruption from "./components/Disruption.js";
-import StationDisruption from "./components/StationDisruption.js";
import Tickets from "./components/pages/Tickets.js";
import TicketsBuy from "./components/pages/TicketsBuy.js";
@@ -15,23 +15,61 @@ import Travel from "./components/pages/Travel.js";
import TrafficInfo from "./components/pages/TrafficInfo.js";
import "./variables.css";
+import warningIcon from './img/warning.svg';
+import closeIcon from './img/close.svg';
+
class App extends Component {
- render() {
- return (
-
{trafficInfo}
++ {trafficInfo} + Visa mindre +
Visa mer