Merge branch 'main' into live

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",

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",

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",

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",

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"
         }
     ]
 }

src/APIexamples/disruption2.json

@@ -5,8 +5,16 @@
     "time":"00:09",
     "affectedStopPoints":[
         {
-            "gid": "9022014014762001",
+            "gid": "9022014014751001",
-            "name": "Kuröd, Kungälv"
+            "name": "Guddeby"
+        },
+        {
+            "gid": "9022014014010001",
+            "name": "Hålta kyrka"
+        },
+        {
+            "gid": "9022014014614001",
+            "name": "Stenskärsvägen"
         }
     ]
 }

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",

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",

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",

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"

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,9 +15,21 @@ import Travel from "./components/pages/Travel.js";
 import TrafficInfo from "./components/pages/TrafficInfo.js";
 
 import "./variables.css";
+import warningIcon from './img/warning.svg';
+import closeIcon from './img/close.svg';
+
 
 class App extends Component {
+    currentPageName = () => {
+        if (globalData.currentPage.constructor !== undefined)
+            return globalData.currentPage.constructor.name;
+        else
+            return "";
+    };
+    
     render() {
+        globalData.root = this;
+
         return (
             <Router>
                 <div className="App">
@@ -28,6 +40,32 @@ class App extends Component {
                     <Route path="/traffic" exact component={TrafficInfo} />
 
                     <BottomMenu />
+
+                    <Snackbar
+                        anchorOrigin={{ vertical: "bottom", horizontal: "center" }}
+                        open={globalData.snackbarVisible}
+                        autoHideDuration={3000}
+                        onClose={() => globalData.snackbarVisible = false}
+                        message={
+                            <div id="snackDisruptInfo">
+                                <img src={warningIcon} alt="" />
+                                <span id="message-id">Trafikstörning upptäckt</span>
+                            </div>
+                        }
+                        action={[
+                            <IconButton
+                                key="close"
+                                aria-label="Close"
+                                color="inherit"
+                                onClick={() => { globalData.snackbarVisible = false; globalData.root.forceUpdate() }}
+                            >
+                                {this.currentPageName() !== "TrafficInfo" &&
+                                    <Link to="/traffic">Visa trafikinfo</Link>
+                                }
+                                <img src={closeIcon} alt="" />
+                            </IconButton>,
+                        ]}
+                    />
                 </div>
             </Router>
 		);

src/GlobalData.js

@@ -14,7 +14,8 @@ let globalData = {
     disruption: new Disruption(
     ),
     stop: new Stop(
-    )
+    ),
+    currentPage: ""
 };
 
 export default globalData;

src/components/DisruptionButton.js

@@ -23,13 +23,16 @@ import ex2 from '../APIexamples/disruption2.json'
 
 
 class DisruptionButton extends Button {
-	state = {
+    constructor(props) {
+        super(props);
+        this.state = {
             jsonLocation: this.props.path,
             disruption: "",
             u1: user1,
             u2: user2,
             u3: user3,
             u4: user4,
+        };
     }
 
     updatePage = () => {
@@ -81,6 +84,7 @@ class DisruptionButton extends Button {
                     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") {
@@ -100,6 +104,7 @@ class DisruptionButton extends Button {
                     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();
                 }
             }
         }
@@ -109,9 +114,11 @@ class DisruptionButton extends Button {
 
     render() {
         return (
+            <div>
                 <Button onClick={this.props.onClick.concat([this.genDisrupt, this.updatePage])} className="disruptBtn">
                     {this.props.children}
                 </Button>
+            </div>
         );
     }
 }

src/components/NavigationDrawer.js

@@ -71,10 +71,10 @@ class NavigationDrawer extends Component {
                         <span>example@gmail.com</span>
                     </header>
                     <div id="navList">
-                        <SelectUserButton path={"user1"} username="Användare 1"/>
+                        <SelectUserButton path={"user1"} username="Guddeby"/>
-                        <SelectUserButton path={"user2"} username="Användare 2"/>
+                        <SelectUserButton path={"user2"} username="Hålta kyrka"/>
-                        <SelectUserButton path={"user3"} username="Användare 3"/>
+                        <SelectUserButton path={"user3"} username="Stenskärsvägen"/>
-                        <SelectUserButton path={"user4"} username="Användare 4"/>
+                        <SelectUserButton path={"user4"} username="Kuröd"/>
                         <Button onClick={[this.showPopup, this.close]} className="disruptBtn"><img src={disruptIcon} alt="" />Generera Störning</Button>
                     </div>
                     <hr />

src/components/TrafficEntry.js

@@ -59,7 +59,10 @@ class TrafficEntry extends Component {
                         </div>
                         {lineInterference &&
                             <div className="infoWrapper" onClick={this.toggle}>
-                                <p className={`${this.state.expanded ? "expanded" : ""}`}>{trafficInfo}</p>
+                                <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>
                         }

src/components/css/StopTitle.css

@@ -16,7 +16,7 @@
 }
 
 #stopTitle h1 {
-    font-size: 9vw;
+    font-size: 3.5vh;
 }
 
 #stopTitle h3 {
@@ -26,7 +26,7 @@
 
 @media screen and (min-width: 400px) {
     #stopTitle h1 {
-        font-size: 35px;
+        font-size: 4vh;
     }
     
     #stopTitle h3 {

src/components/css/TrafficInfo.css

@@ -20,7 +20,7 @@
     width: 90%;
     display: flex;
     flex-direction: row;
-    justify-content: space-evenly;
+    justify-content: flex-start;
     margin-bottom: 2vh;
 }
 
@@ -39,7 +39,7 @@
 
 .trafficEntry div p {
     text-align: left;
-    padding: 3vh 0 0 0;
+    padding: 2vh 0 0 0;
 }
 
 .trafficEntry div div {
@@ -50,13 +50,17 @@
 .trafficEntry div div div {
     display: flex;
     flex-direction: row;
-    justify-content: flex-start;
+    justify-content: space-around;
     align-items: flex-end;
 }
 
+.timeColumn div:first-child, .lineColumn div:first-child {
+    height: 5.5vh;
+}
+
 .timeColumn {
-    flex-basis: 15%;
+    flex-basis: 20%;
-    justify-content: space-between !important;
+    justify-content: flex-start !important;
     align-items: center;
 }
 
@@ -78,8 +82,8 @@
 }
 
 .lineColumn img {
-    width: 7.5vw;
+    flex-basis: 25%;
-    margin-right: 10px;
+    height: 9vw;
 }
 
 .infoWrapper p {
@@ -106,12 +110,20 @@
     color: white;
     font-size: 6vw;
     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 {
+    flex-basis: 40%;
+    height: 9vw;
+    font-size: 4vw;
     text-align: left;
+    display: flex;
+    align-items: flex-end;
 }
 
 .trafficEntry a {
@@ -123,4 +135,5 @@
     border-radius: var(--borderRadius);
     box-shadow: var(--boxShadow);
     text-decoration: none;
+    border: 1px solid rgba(0, 0, 0, 0.2);
 }

src/img/close.svg

@@ -0,0 +1,12 @@
+<?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">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M194.6,164.8L322.7,36.7c8.3-8.3,8.3-21.8,0-30.1c-8.3-8.3-21.8-8.3-30.1,0L164.5,134.6L36.4,6.5
+	c-8.3-8.3-21.8-8.3-30.1,0c-8.3,8.3-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.2
+	s10.9-2.1,15.1-6.2l128.1-128.1L292.6,323c4.2,4.2,9.6,6.2,15.1,6.2c5.5,0,10.9-2.1,15.1-6.2c8.3-8.3,8.3-21.8,0-30.1L194.6,164.8z"
+	/>
+</svg>

src/index.css

@@ -33,3 +33,67 @@ button {
     opacity: 0;
     pointer-events: none;
 }
+
+.MuiSnackbarContent-root {
+    background: white;
+    color: black;
+    justify-content: space-between;
+    padding: 3.5vw 4vw !important;
+}
+
+.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: white;
+    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;
+}
+
+#snackDisruptInfo img {
+    height: 100%;
+    margin-right: 15px;
+}

src/index.js

@@ -5,9 +5,7 @@ import App from './App';
 import reportWebVitals from './reportWebVitals';
 
 ReactDOM.render(
-  <React.StrictMode>
+    <App />,
-    <App />
-  </React.StrictMode>,
     document.getElementById('root')
 );