schulze/hallbarUtvecklingVT7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add snackbar notification for disruptions

Browse Source
This commit is contained in:
André Wahlberg 2020-12-11 18:19:55 +01:00
parent b07708f3e9
commit 6fc5fd8ea4
5 changed files with 217 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/App.js
View File

@ -2,12 +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 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 Tickets from "./components/pages/Tickets.js";
import TicketsBuy from "./components/pages/TicketsBuy.js"; import TicketsBuy from "./components/pages/TicketsBuy.js";
@ -15,23 +15,52 @@ 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() { render() {
return ( globalData.root = this;
<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 /> 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() }}
>
<Link to="/traffic">Visa trafikinfo</Link>
<img src={closeIcon} alt="" />
</IconButton>,
]}
/>
</div>
</Router>
); );
} }
} }
export default App; export default App;

171
src/components/DisruptionButton.js
View File

@ -23,97 +23,104 @@ import ex2 from '../APIexamples/disruption2.json'
class DisruptionButton extends Button { class DisruptionButton extends Button {
state = { constructor(props) {
jsonLocation: this.props.path, super(props);
disruption: "", this.state = {
u1 : user1, jsonLocation: this.props.path,
u2 : user2, disruption: "",
u3 : user3, u1: user1,
u4 : user4, u2: user2,
} u3: user3,
u4: user4,
};
}
updatePage = () => { updatePage = () => {
globalData.currentPage.forceUpdate(); globalData.currentPage.forceUpdate();
} }
showMomentTime = (time) => { showMomentTime = (time) => {
return(time.format("HH:mm")) return (time.format("HH:mm"))
} }
genUsers = () => { genUsers = () => {
if(globalData.users.length < 2){ if (globalData.users.length < 2) {
this.state.first = true; this.state.first = true;
this.state.u1.stop = locationuser1.LocationList.StopLocation[0]; this.state.u1.stop = locationuser1.LocationList.StopLocation[0];
this.state.u1.stop.departures = departureuser1.DepartureBoard.Departures; this.state.u1.stop.departures = departureuser1.DepartureBoard.Departures;
this.state.u2.stop = locationuser2.LocationList.StopLocation[0]; this.state.u2.stop = locationuser2.LocationList.StopLocation[0];
this.state.u2.stop.departures = departureuser2.DepartureBoard.Departures; this.state.u2.stop.departures = departureuser2.DepartureBoard.Departures;
this.state.u3.stop = locationuser3.LocationList.StopLocation[0]; this.state.u3.stop = locationuser3.LocationList.StopLocation[0];
this.state.u3.stop.departures = departureuser3.DepartureBoard.Departures; this.state.u3.stop.departures = departureuser3.DepartureBoard.Departures;
this.state.u4.stop = locationuser4.LocationList.StopLocation[0]; this.state.u4.stop = locationuser4.LocationList.StopLocation[0];
this.state.u4.stop.departures = departureuser4.DepartureBoard.Departures; this.state.u4.stop.departures = departureuser4.DepartureBoard.Departures;
globalData.users = [ globalData.users = [
this.state.u1, this.state.u1,
this.state.u2, this.state.u2,
this.state.u3, this.state.u3,
this.state.u4 this.state.u4
] ]
} }
} }
genDisrupt = () => { genDisrupt = () => {
this.genUsers() this.genUsers()
this.state.disruption = undefined this.state.disruption = undefined
if(this.state.jsonLocation === "ex1"){ if (this.state.jsonLocation === "ex1") {
for (let stopPoint of ex1.affectedStopPoints) { for (let stopPoint of ex1.affectedStopPoints) {
for (let user of globalData.users){ for (let user of globalData.users) {
if(stopPoint.gid === user.stoppointgid){ if (stopPoint.gid === user.stoppointgid) {
this.state.disruption = ex1; this.state.disruption = ex1;
var old1t = moment(user.stop.departures[0].time,"HH:mm"); var old1t = moment(user.stop.departures[0].time, "HH:mm");
old1t.add(ex1.time, "HH:mm"); old1t.add(ex1.time, "HH:mm");
user.stop.departures[0].newTime = this.showMomentTime(old1t); user.stop.departures[0].newTime = this.showMomentTime(old1t);
user.stop.departures[0].trafficInfo = ex1.title; user.stop.departures[0].trafficInfo = ex1.title;
} }
} }
if(stopPoint.gid === globalData.user.stoppointgid){ if (stopPoint.gid === globalData.user.stoppointgid) {
this.state.disruption = ex1; this.state.disruption = ex1;
var old2t = moment(globalData.stop.departures[0].time,"HH:mm"); var old2t = moment(globalData.stop.departures[0].time, "HH:mm");
old2t.add(ex1.time, "HH:mm"); old2t.add(ex1.time, "HH:mm");
globalData.stop.departures[0].newTime = this.showMomentTime(old2t); globalData.stop.departures[0].newTime = this.showMomentTime(old2t);
globalData.stop.departures[0].trafficInfo = ex1.title; 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) { } else if (this.state.jsonLocation === "ex2") {
for (let user of globalData.users){ for (let stopPoint of ex2.affectedStopPoints) {
if(stopPoint.gid === user.stoppointgid){ for (let user of globalData.users) {
this.state.disruption = ex2; if (stopPoint.gid === user.stoppointgid) {
var old3t = moment(user.stop.departures[0].time,"HH:mm"); this.state.disruption = ex2;
old3t.add(ex2.time, "HH:mm"); var old3t = moment(user.stop.departures[0].time, "HH:mm");
user.stop.departures[0].newTime = this.showMomentTime(old3t); old3t.add(ex2.time, "HH:mm");
user.stop.departures[0].trafficInfo = ex2.title; 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; if (stopPoint.gid === globalData.user.stoppointgid) {
var old4t = moment(globalData.stop.departures[0].time,"HH:mm"); this.state.disruption = ex2;
old4t.add(ex2.time, "HH:mm"); var old4t = moment(globalData.stop.departures[0].time, "HH:mm");
globalData.stop.departures[0].newTime = this.showMomentTime(old4t); old4t.add(ex2.time, "HH:mm");
globalData.stop.departures[0].trafficInfo = ex2.title; 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 globalData.disruption = this.state.disruption
} }
render() { render() {
return ( return (
<Button onClick={this.props.onClick.concat([this.genDisrupt,this.updatePage])} className="disruptBtn"> <div>
{this.props.children} <Button onClick={this.props.onClick.concat([this.genDisrupt, this.updatePage])} className="disruptBtn">
</Button> {this.props.children}
); </Button>
} </div>
);
}
} }

12
src/img/close.svg Normal file
View File

@ -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>
Side by Side

After

Width:  |  Height:  |  Size: 782 B

66
src/index.css
View File

@ -33,3 +33,69 @@ button {
opacity: 0; opacity: 0;
pointer-events: none; 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: space-between !important;
}
.MuiIconButton-label a {
align-items: center;
}
.MuiIconButton-label a {
font-size: 3.5vw;
color: white;
text-decoration: none;
}
.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;
}

6
src/index.js
View File

@ -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