Add: Multiple disruptions

Add: Select user buttons
Merge pull request #7 from thefeli73/we-fix-broken-git
2020-12-08 12:10:08 +01:00 · 2020-12-08 11:54:34 +01:00 · 2020-12-08 10:43:20 +01:00 · 2020-12-08 10:42:50 +01:00 · 2020-12-08 10:41:31 +01:00 · 2020-12-08 10:30:41 +01:00
29 changed files with 448 additions and 154 deletions
--- a/README.md
+++ b/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.
 * Ursprungspunkten för React är ``src/index.js``.

-<!--
+
 ## Upplägg
-``` mermaid
-
+```mermaid
 classDiagram
+    class User
+    User : String deviceId
+    User : Coordinates location
+    User : nearbyStops()

-class User
-User : Subscription[] subs
-User : Location loc
+    class Coordinates
+    Coordinates : Float lon
+    Coordinates : Float lat

-class Line
+    class Stop
+    Stop : String name
+    Stop : Track[] locations
+    Stop : Departure[] departures

-class Subscription
-Subscription : Line line
+    class Departure
+    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
+```
--- a/package-lock.json
+++ b/package-lock.json
@ -12386,6 +12386,11 @@
      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
      "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": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/react-push-notification/-/react-push-notification-1.3.0.tgz",
--- a/package.json
+++ b/package.json
@ -10,6 +10,7 @@
    "react": "^17.0.1",
    "react-axios": "^2.0.3",
    "react-dom": "^17.0.1",
+    "react-native-push-notification": "^6.1.3",
    "react-push-notification": "^1.3.0",
    "react-router-dom": "^5.2.0",
    "react-scripts": "4.0.0",
--- a/src/APIexamples/disruption1.json
+++ b/src/APIexamples/disruption1.json
@ -0,0 +1,15 @@
+{
+    "situationNumber": "RT1",
+    "severity":"normal",
+    "title":"Stannar inte på dessa hållplatser",
+    "affectedStopPoints":[
+        {
+            "gid": "9022014014020001",
+            "name": "Ekelöv västra, Kungälv"
+        },
+        {
+            "gid": "9022014014751001",
+            "name": "Guddeby, Kungälv"
+        }
+    ]
+}
--- a/src/APIexamples/disruption2.json
+++ b/src/APIexamples/disruption2.json
@ -0,0 +1,11 @@
+{
+    "situationNumber": "RT2",
+    "severity":"normal",
+    "title":"Försening",
+    "affectedStopPoints":[
+        {
+            "gid": "9021014014225000",
+            "name": "Skrämmenborg, Kungälv"
+        }
+    ]
+}
--- a/src/APIexamples/user1.json
+++ b/src/APIexamples/user1.json
@ -0,0 +1,5 @@
+{
+    "name":"1",
+    "deviceId":"1",
+    "stoppointgid":"9022014014754001"
+}
--- a/src/APIexamples/user2.json
+++ b/src/APIexamples/user2.json
@ -0,0 +1,5 @@
+{
+    "name":"2",
+    "deviceId":"2",
+    "stoppointgid":"9022014014020001"
+}
--- a/src/APIexamples/user3.json
+++ b/src/APIexamples/user3.json
@ -0,0 +1,5 @@
+{
+    "name":"3",
+    "deviceId":"3",
+    "stoppointgid":"9022014014751001"
+}
--- a/src/APIexamples/user4.json
+++ b/src/APIexamples/user4.json
@ -0,0 +1,5 @@
+{
+    "name":"4",
+    "deviceId":"4",
+    "stoppointgid":"9021014014225000"
+}
--- a/src/App.js
+++ b/src/App.js
@ -5,8 +5,9 @@ import React, { Component } from "react";
 import { BrowserRouter as Router, Route } from "react-router-dom";

 import BottomMenu from "./components/BottomMenu.js";
-import AccessToken from "./components/AccessToken.js";
-import NearbyStation from "./components/NearbyStation";
+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";
--- a/src/GlobalData.js
+++ b/src/GlobalData.js
@ -0,0 +1,16 @@
+import User from './classes/User.js';
+import Disruption from './classes/Disruption.js'
+import Coordinates from "./classes/Coordinates.js";
+
+let globalData = {
+    user: new User(
+        "test",
+        "123",
+        new Coordinates(),
+        "9022014014020001"
+    ),
+    disruption: new Disruption(
+    )
+};
+
+export default globalData;
--- a/src/classes/AccessToken.js
+++ b/src/classes/AccessToken.js
@ -0,0 +1,21 @@
+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 => {
+                console.log(response);
+                this.token = response.data.access_token
+        });
+    }
+}
+
+export default AccessToken
--- a/src/classes/Coordinates.js
+++ b/src/classes/Coordinates.js
@ -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;
--- a/src/classes/Departure.js
+++ b/src/classes/Departure.js
@ -2,17 +2,17 @@
    Denna klass är en modell för avgångar.

    lineName : String               (Linjenamnet)
-    destination : String            (Exempelvis "Mot Heden")
+    finalStop : Stop                (Ändhållplats)
    time : String                   (Avgångstid)
-    info : String                   (Trafikinformation)
+    trafficInfo : String            (Trafikinformation)
 */

 class Departure {
-    constructor(lineName, destination, time, info) {
+    constructor(lineName, finalStop, time, trafficInfo) {
        this.lineName = lineName;
-        this.destination = destination;
+        this.finalStop = finalStop;
        this.time = time;
-        this.info = info;
+        this.trafficInfo = trafficInfo;
    }
 }

--- a/src/classes/Disruption.js
+++ b/src/classes/Disruption.js
@ -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;
--- a/src/classes/Stop.js
+++ b/src/classes/Stop.js
@ -2,7 +2,7 @@
    Denna klass är en modell för hållplatser.

    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)
 */

@ -14,4 +14,15 @@ class Stop {
    }
 }

+/*
+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;
--- a/src/classes/Track.js
+++ b/src/classes/Track.js
@ -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;
--- a/src/classes/User.js
+++ b/src/classes/User.js
@ -0,0 +1,18 @@
+/*
+    Denna klass är en modell för användare.
+
+    name     : String           (Användarnamn)
+    deviceId : Int              (Enhetens ID)
+    location : Coordinates      (Användarens koordinater)
+*/
+
+class User {
+    constructor(name, deviceId, location, stoppointgid) {
+        this.name = name;
+        this.deviceId = deviceId;
+        this.location = location;
+        this.stoppointgid = stoppointgid;
+    }
+}
+
+export default User;
--- a/src/components/AccessToken.js
+++ b/src/components/AccessToken.js
@ -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
--- a/src/components/Button.js
+++ b/src/components/Button.js
@ -6,8 +6,6 @@ import './css/Button.css';
 class Button extends Component {
    // Multiple onClick functions
    onClick = () => {
-        console.log(this.props.onClick);
-
        if (this.props.onClick !== null
            && this.props.onClick !== undefined) {
            if (Array.isArray(this.props.onClick)) {
@ -17,8 +15,6 @@ class Button extends Component {
            } else {
                console.log("Error when parsing Button onClick functions.");
            }
-        } else {
-            console.log("Error when parsing Button onClick functions.");
        }
    }

--- a/src/components/Disruption.js
+++ b/src/components/Disruption.js
@ -0,0 +1,60 @@
+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
+        };
+
+        console.log('Attempted connection')
+
+        axios.get('https://api.vasttrafik.se/ts/v1/traffic-situations/stoppoint/'+this.state.gid, { headers })
+        //axios.get('https://api.vasttrafik.se/ts/v1/traffic-situations/stoppoint/9022014005700002', { headers })
+            .then(response => {
+                console.log(response)
+                this.setState({
+                    disruptions: response.data
+                })
+            })
+    }
+
+    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
--- a/src/components/DisruptionButton.js
+++ b/src/components/DisruptionButton.js
@ -1,11 +1,39 @@
 import addNotification from "react-push-notification";

+import globData from '../GlobalData.js';
+
+import ex1 from '../APIexamples/disruption1.json'
+import ex2 from '../APIexamples/disruption2.json'
+
 import Button from './Button.js';
 import disruptIcon from '../img/flash.svg';

-
 class DisruptionButton extends Button {
+	state = {
+		jsonLocation: this.props.path,
+		disruption: ""
+	}
+
+
 	genDisrupt = () => {
+		this.state.disruption = ""
+		if(this.state.jsonLocation === "ex1"){
+			for (let stopPoint of ex1.affectedStopPoints) {
+				if(stopPoint.gid === globData.user.stoppointgid){
+					this.state.disruption = ex1
+				}
+			}
+		} else if (this.state.jsonLocation === "ex2"){
+			for (let stopPoint of ex2.affectedStopPoints) {
+				if(stopPoint.gid === globData.user.stoppointgid){
+					this.state.disruption = ex2
+				}
+			}
+		}
+
+		console.log(this.state.disruption)
+		globData.disruption = this.state.disruption
+
 		addNotification({
 			title: "Warning",
 			subtitle: "This is a subtitle",
--- a/src/components/NavigationDrawer.js
+++ b/src/components/NavigationDrawer.js
@ -1,6 +1,8 @@
 import React, { Component } from 'react';

+import globalData from '../GlobalData.js';
 import DisruptionButton from "./DisruptionButton.js";
+import SelectUserButton from "./SelectUserButton.js"
 import Popup from './Popup.js';
 import Button from './Button.js';

@ -58,11 +60,16 @@ class NavigationDrawer extends Component {
                <div id="navDrawer" className={`${this.state.open ? "open" : ""}`}>
                    <header>
                        <img src={userIcon} alt="" />
-                        <span>Mitt konto</span>
+                        <span>{globalData.user.name}</span>
                        <span>example@gmail.com</span>
                    </header>
                    <div id="navList">
-                        <DisruptionButton onClick={[this.showPopup, this.close]} />
+                        <SelectUserButton path={"user1"} username="user1"/>
+                        <SelectUserButton path={"user2"} username="user2"/>
+                        <SelectUserButton path={"user3"} username="user3"/>
+                        <SelectUserButton path={"user4"} username="user4"/>
+                        <DisruptionButton path={"ex1"} onClick={[this.showPopup, this.close]} />
+                        <DisruptionButton path={"ex2"} onClick={[this.showPopup, this.close]} />
                    </div>
                    <hr />
                    <span id="version">Projektgrupp 3 - Utmaning 7</span>
--- a/src/components/NearbyStation.js
+++ b/src/components/NearbyStation.js
@ -1,5 +1,8 @@
 import React from 'react';
 import axios from 'axios';
+import AccessToken from '../classes/AccessToken';
+import StopComponent from './StopComponent';
+import Stop from '../classes/Stop';

 class NearbyStation extends React.Component {
    state = {
@ -7,7 +10,7 @@ class NearbyStation extends React.Component {
        long: '12.0',
        stops: [],
        token: undefined,
-        device: '123',
+        tokenClass: new AccessToken()
    }

    handleChangeLat = event => {
@ -18,20 +21,16 @@ class NearbyStation extends React.Component {
        this.setState({ long: event.target.value});
    }

-    handleChangeToken = event => {
-        this.setState({ token: event.target.value})
-    }
-
    handleSubmit = event => {
        event.preventDefault();

        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=20&format=json', { headers })
+        axios.get('https://api.vasttrafik.se/bin/rest.exe/v2/location.nearbystops?originCoordLat='+this.state.lat+'&originCoordLong='+this.state.long+'&maxNo=5&format=json', { headers })
            .then(response => {
                console.log(response.data.LocationList.StopLocation)
                this.setState({
@ -52,10 +51,6 @@ class NearbyStation extends React.Component {
                        Longitude coord:
                        <input type="text" name="long" onChange={this.handleChangeLong} />
                    </label>
-                    <label>
-                        Token:
-                        <input type="text" name="token" onChange={this.handleChangeToken} />
-                    </label>
                    <button type="submit">Stops</button>
                </form>
                <h1>
@ -65,32 +60,11 @@ class NearbyStation extends React.Component {
                    {this.state.long}
                </h1>
                {this.state.stops.map((item) =>
-                    <div>
-                        <h1>
-                            {item.name},
-                            {item.id},
-                            {item.lat},
-                            {item.lon},
-                            {item.track}
-                        </h1>
-                    </div>
+                    <StopComponent stop={item} />
                )}
            </div>
        )
    }
 }
+
 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
--- a/src/components/SelectUserButton.js
+++ b/src/components/SelectUserButton.js
@ -0,0 +1,36 @@
+
+import globData from '../GlobalData.js';
+
+import user1 from '../APIexamples/user1.json'
+import user2 from '../APIexamples/user2.json'
+import user3 from '../APIexamples/user3.json'
+import user4 from '../APIexamples/user4.json'
+
+import Button from './Button.js';
+import disruptIcon from '../img/flash.svg';
+
+class SelectUserButton extends Button {
+	selectUser = () => {
+        if(this.props.path === "user1"){
+            globData.user = user1
+        }else if (this.props.path === "user2"){
+            globData.user = user2
+        }else if (this.props.path === "user3"){
+            globData.user = user3
+        }else if (this.props.path === "user4"){
+            globData.user = user4
+        }
+	}
+
+	render() {
+		return (
+			<Button onClick={[this.selectUser]} className="disruptBtn">
+				<img src={disruptIcon} alt="" />
+				<span>{this.props.username}</span>
+			</Button>
+		);
+	}
+}
+
+
+export default SelectUserButton;
--- a/src/components/StationDisruption.js
+++ b/src/components/StationDisruption.js
@ -0,0 +1,64 @@
+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
+        };
+
+        console.log('Attempted connection')
+        axios.get('https://api.vasttrafik.se/bin/rest.exe/v2/location.nearbystops?originCoordLat='+this.state.lat+'&originCoordLong='+this.state.long+'&maxNo=5&format=json', { headers })
+            .then(response => {
+                console.log(response.data.LocationList.StopLocation)
+            })
+        axios.get('https://api.vasttrafik.se/ts/v1/traffic-situations/stoppoint/'+this.state.gid, { headers })
+            .then(response => {
+                console.log(response)
+                this.setState({
+                    disruptions: response.data
+                })
+            })
+    }
+
+    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
--- a/src/components/StopComponent.js
+++ b/src/components/StopComponent.js
@ -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
--- a/src/components/TrafficEntry.js
+++ b/src/components/TrafficEntry.js
@ -7,8 +7,8 @@ import warningIcon from '../img/warning.svg';

 class TrafficEntry extends Component {
    render() {
-        let trafficInfo = this.props.departure.info;
-        let lineInterference = trafficInfo !== "" && trafficInfo !== null;
+        let trafficInfo = this.props.departure.trafficInfo;
+        let lineInterference = trafficInfo !== "" && trafficInfo !== null && trafficInfo !== undefined;

        return (
            <div className="trafficEntry">
@ -23,7 +23,7 @@ class TrafficEntry extends Component {
                        <div>
                            <span className="lineName">{this.props.departure.lineName}</span>
                            <img src={busIcon} alt=""></img>
-                            <span className="destination">{this.props.departure.destination}</span>
+                            <span className="destination">{this.props.departure.finalStop}</span>
                        </div>
                        {lineInterference &&
                            <p>{trafficInfo} <u>Visa mer</u></p>
--- a/src/components/pages/TrafficInfo.js
+++ b/src/components/pages/TrafficInfo.js
@ -11,33 +11,33 @@ import Departure from "../../classes/Departure.js";


 class TrafficInfo extends Component {
-  render() {
-    let testStop = new Stop(
-      "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"),
-      ]
-    );
+    render() {
+        let testStop = new Stop(
+            "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 (
-      <>
-        <Header title="Trafikinfo" />
-        <TopMenu>
-          <StopTitle stop={testStop} />
-        </TopMenu>
-        <MainArea>
-          <TrafficList departures={testStop.departures} />
-        </MainArea>
-      </>
-    );
-  }
+        return (
+            <>
+                <Header title="Trafikinfo" />
+                <TopMenu>
+                    <StopTitle stop={testStop} />
+                </TopMenu>
+                <MainArea>
+                    <TrafficList departures={testStop.departures} />
+                </MainArea>
+            </>
+        );
+    }
 }

 export default TrafficInfo;
Author	SHA1	Message	Date
williameriksson126	2d2ec96533	Add: Multiple disruptions	2020-12-08 12:10:08 +01:00
williameriksson126	3c0fc6fe1f	Add: Select user buttons	2020-12-08 11:54:34 +01:00
William Eriksson	c7517f185c	Merge pull request #7 from thefeli73/we-fix-broken-git We fix broken git	2020-12-08 10:43:20 +01:00
williameriksson126	d39f114d5c	Fix 2of2	2020-12-08 10:42:50 +01:00
williameriksson126	a0ff50ab23	Fix 1of2	2020-12-08 10:41:31 +01:00
William Eriksson	ca1ca3884d	Merge pull request #6 from thefeli73/we-demo-disruption-first Add: code to fetch disruption data and see if it is relevant	2020-12-08 10:30:41 +01:00
williameriksson126	ea2a18f3ad	Add: code to fetch disruption data and see if it is relevant	2020-12-08 10:29:03 +01:00
William Eriksson	75b4ecc4ed	Merge pull request #5 from thefeli73/we-json-examples Add: json files for scenarios	2020-12-08 09:38:22 +01:00
William Eriksson	3080359dcd	Merge branch 'main' into we-json-examples	2020-12-08 09:38:11 +01:00
williameriksson126	3d7e6cf52f	Add: json files for scenarios	2020-12-08 09:36:19 +01:00
William Eriksson	34f4b8af18	Merge pull request #4 from thefeli73/we-Disruption-base We disruption base	2020-12-08 09:18:21 +01:00
William Eriksson	7c59fa2825	Merge branch 'main' into we-Disruption-base	2020-12-08 09:18:00 +01:00
williameriksson126	31263e919e	Minor modifications to Example API components and base classes	2020-12-08 09:13:38 +01:00
André Wahlberg	d40420ad2b	Remove irrelevant button errors in console	2020-12-04 12:02:45 +01:00
André Wahlberg	4ce76dbe90	Merge branch 'aw-disruption-control' into main	2020-12-04 11:53:37 +01:00
André Wahlberg	051afedcc5	Add user name to navigation drawer	2020-12-04 11:52:41 +01:00
André Wahlberg	bff5a73c8c	Merge branch 'main' into aw-disruption-control	2020-12-04 11:49:28 +01:00
André Wahlberg	093199d0e0	Add global data variable	2020-12-04 11:48:56 +01:00
André Wahlberg	25d66f9195	Updated class changes in TrafficEntry	2020-12-04 11:47:42 +01:00
André Wahlberg	4e36270130	Format TrafficInfo.js	2020-12-04 11:13:55 +01:00
williameriksson126	c36d6afea7	Merge to work on aw branch	2020-12-04 10:51:09 +01:00
williameriksson126	ff8a87c961	Hack: Nothing is done just commiting to swap branch	2020-12-04 10:45:22 +01:00
williameriksson126	c3edd2d74f	Add basic component for calls to traffic disruption API	2020-12-04 10:08:11 +01:00
André Wahlberg	b324250c79	Merge remote-tracking branch 'origin/aw-client-side-classes' into aw-disruption-control	2020-12-04 09:59:51 +01:00
William Eriksson	e35524fa19	Merge pull request #3 from williameriksson126/we-AccessToken-class Add: AccessToken now updated to seperate class	2020-11-30 10:21:10 +01:00
williameriksson126	521d3b2e63	Add: AccessToken now updated to seperate class	2020-11-30 10:18:18 +01:00
André Wahlberg	3bc1ff9a1a	Add and update classes for client-side data management	2020-11-27 17:32:35 +01:00