Merge branch 'main' into we-out-of-creativity-for-names

src/components/SelectUserButton.js

@@ -18,6 +18,7 @@ import departureuser4 from '../APIexamples/departureuser4.json'
 
 import Button from './Button.js';
 import disruptIcon from '../img/flash.svg';
+import globalData from '../GlobalData.js';
 
 class SelectUserButton extends Button {
 	selectUser = () => {
@@ -40,10 +41,14 @@ class SelectUserButton extends Button {
 		}
 		console.log(globData.stop)
 	}
+    
+    updatePage = () => {
+        globalData.currentPage.render();
+    }
 
 	render() {
 		return (
-			<Button onClick={[this.selectUser]} className="disruptBtn">
+			<Button onClick={[this.selectUser, this.updatePage]} className="disruptBtn">
 				<img src={disruptIcon} alt="" />
 				<span>{this.props.username}</span>
 			</Button>

src/components/pages/Tickets.js

@@ -2,9 +2,12 @@ import React, { Component } from 'react';
 
 import Header from '../Header.js';
 import MainArea from '../MainArea.js';
+import globalData from '../../GlobalData.js';
 
 class Tickets extends Component {
     render() {
+        globalData.currentPage = this;
+
         return (
             <>
                 <Header title="Biljetter" />

src/components/pages/TicketsBuy.js

@@ -9,8 +9,12 @@ import clockIcon from '../../img/clock.svg';
 import calendarIcon from '../../img/calendar.svg';
 import recurringIcon from '../../img/redo.svg';
 
+import globalData from '../../GlobalData.js';
+
 class TicketsBuy extends Component {
     render() {
+        globalData.currentPage = this;
+
         return ( 
             <>
                 <Header title="Köp biljett" />

src/components/pages/TrafficInfo.js

@@ -10,15 +10,21 @@ import globalData from '../../GlobalData.js';
 
 
 class TrafficInfo extends Component {
+    state = {
+        stop: globalData.stop
+    };
+    
     render() {
+        globalData.currentPage = this;
+
         return (
             <>
                 <Header title="Trafikinfo" />
                 <TopMenu>
-                    <StopTitle stop={globalData.stop} />
+                    <StopTitle stop={this.state.stop} />
                 </TopMenu>
                 <MainArea>
-                    <TrafficList departures={globalData.stop.departures} />
+                    <TrafficList departures={this.state.stop.departures} />
                 </MainArea>
             </>
         );

src/components/pages/Travel.js

@@ -7,8 +7,12 @@ import TripSelector from '../TripSelector.js';
 
 import '../css/TripSelector.css';
 
+import globalData from '../../GlobalData.js';
+
 class Travel extends Component {
     render() {
+        globalData.currentPage = this;
+
         return (
             <>
                 <Header title="Reseplanering" />