Minor design and typo fixes
This commit is contained in:
parent
cd2a61947f
commit
28d549de28
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name":"1",
|
"name": "Användare 1",
|
||||||
"deviceId": "1",
|
"deviceId": "1",
|
||||||
"stoppointgid": "9022014014754001"
|
"stoppointgid": "9022014014754001"
|
||||||
}
|
}
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name":"2",
|
"name": "Användare 2",
|
||||||
"deviceId": "2",
|
"deviceId": "2",
|
||||||
"stoppointgid": "9022014014020001"
|
"stoppointgid": "9022014014020001"
|
||||||
}
|
}
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name":"3",
|
"name": "Användare 3",
|
||||||
"deviceId": "3",
|
"deviceId": "3",
|
||||||
"stoppointgid": "9022014014751001"
|
"stoppointgid": "9022014014751001"
|
||||||
}
|
}
|
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name":"4",
|
"name": "Användare 4",
|
||||||
"deviceId": "4",
|
"deviceId": "4",
|
||||||
"stoppointgid": "9021014014225000"
|
"stoppointgid": "9021014014225000"
|
||||||
}
|
}
|
@ -2,11 +2,10 @@ import User from './classes/User.js';
|
|||||||
import Disruption from './classes/Disruption.js'
|
import Disruption from './classes/Disruption.js'
|
||||||
import Coordinates from './classes/Coordinates.js';
|
import Coordinates from './classes/Coordinates.js';
|
||||||
import Stop from './classes/Stop.js'
|
import Stop from './classes/Stop.js'
|
||||||
import Departure from './classes/Departure.js';
|
|
||||||
|
|
||||||
let globalData = {
|
let globalData = {
|
||||||
user: new User(
|
user: new User(
|
||||||
"test",
|
"Exempelanvändare",
|
||||||
"123",
|
"123",
|
||||||
new Coordinates(),
|
new Coordinates(),
|
||||||
"9022014014020001"
|
"9022014014020001"
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
import addNotification from "react-push-notification";
|
|
||||||
|
|
||||||
import globData from '../GlobalData.js';
|
import globData from '../GlobalData.js';
|
||||||
|
|
||||||
import ex1 from '../APIexamples/disruption1.json'
|
import ex1 from '../APIexamples/disruption1.json'
|
||||||
@ -51,14 +49,6 @@ class DisruptionButton extends Button {
|
|||||||
}
|
}
|
||||||
|
|
||||||
globData.disruption = this.state.disruption
|
globData.disruption = this.state.disruption
|
||||||
|
|
||||||
addNotification({
|
|
||||||
title: "Warning",
|
|
||||||
subtitle: "This is a subtitle",
|
|
||||||
message: "This is a very long message",
|
|
||||||
theme: "blue",
|
|
||||||
native: true, // when using native, your OS will handle theming.
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
@ -9,7 +9,6 @@ import Button from './Button.js';
|
|||||||
import './css/NavigationDrawer.css';
|
import './css/NavigationDrawer.css';
|
||||||
|
|
||||||
import userIcon from '../img/user.svg';
|
import userIcon from '../img/user.svg';
|
||||||
import { glob } from 'glob';
|
|
||||||
|
|
||||||
|
|
||||||
class NavigationDrawer extends Component {
|
class NavigationDrawer extends Component {
|
||||||
@ -54,13 +53,15 @@ class NavigationDrawer extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
console.log(globalData.user);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Popup ref={this.popupElem}>
|
<Popup ref={this.popupElem}>
|
||||||
<h3>Välj hållplats:</h3>
|
<h3>Välj hållplats:</h3>
|
||||||
<ul>
|
<ul>
|
||||||
<li><DisruptionButton path={"ex1"} onClick={[this.hidePopup]}>Störnings Scenario 1</DisruptionButton></li>
|
<li><DisruptionButton path={"ex1"} onClick={[this.hidePopup]}>Störningsscenario 1</DisruptionButton></li>
|
||||||
<li><DisruptionButton path={"ex2"} onClick={[this.hidePopup]}>Störnings Scenario 2</DisruptionButton></li>
|
<li><DisruptionButton path={"ex2"} onClick={[this.hidePopup]}>Störningsscenario 2</DisruptionButton></li>
|
||||||
</ul>
|
</ul>
|
||||||
</Popup>
|
</Popup>
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
import globData from '../GlobalData.js';
|
import globData from '../GlobalData.js';
|
||||||
|
|
||||||
import user1 from '../APIexamples/user1.json'
|
import user1 from '../APIexamples/user1.json'
|
||||||
@ -48,12 +47,11 @@ class SelectUserButton extends Button {
|
|||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<Button onClick={[this.selectUser, this.updatePage]} className="disruptBtn">
|
<Button onClick={[this.selectUser, this.updatePage]} className="disruptBtn">
|
||||||
<img src={disruptIcon} alt="" />
|
<img src={userIcon} alt="" />
|
||||||
{this.props.username}
|
{this.props.username}
|
||||||
</Button>
|
</Button>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export default SelectUserButton;
|
export default SelectUserButton;
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
color: var(--colorDiscrete);
|
color: var(--colorDiscrete);
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (min-width: 350px) {
|
@media screen and (min-width: 400px) {
|
||||||
#stopTitle h1 {
|
#stopTitle h1 {
|
||||||
font-size: 35px;
|
font-size: 35px;
|
||||||
}
|
}
|
||||||
|
19
src/img/userDark.svg
Normal file
19
src/img/userDark.svg
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
<?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="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||||
|
viewBox="0 0 460.8 460.8" style="enable-background:new 0 0 460.8 460.8;" xml:space="preserve">
|
||||||
|
<g>
|
||||||
|
<g>
|
||||||
|
<path d="M230.4,0c-65.8,0-119.6,53.8-119.6,119.6s53.8,119.6,119.6,119.6S350,185.4,350,119.6S296.3,0,230.4,0z"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
<g>
|
||||||
|
<path d="M435.8,334.9c-3.1-7.8-7.3-15.2-12-21.9c-24-35.5-61.1-59-102.9-64.8c-5.2-0.5-11,0.5-15.2,3.7
|
||||||
|
c-21.9,16.2-48.1,24.6-75.2,24.6s-53.3-8.4-75.2-24.6c-4.2-3.1-9.9-4.7-15.2-3.7c-41.8,5.7-79.4,29.3-102.9,64.8
|
||||||
|
c-4.7,6.8-8.9,14.6-12,21.9c-1.6,3.1-1,6.8,0.5,9.9c4.2,7.3,9.4,14.6,14.1,20.9c7.3,9.9,15.2,18.8,24,27.2
|
||||||
|
c7.3,7.3,15.7,14.1,24,20.9c41.3,30.8,90.9,47,142.1,47s100.8-16.2,142.1-47c8.4-6.3,16.7-13.6,24-20.9c8.4-8.4,16.7-17.2,24-27.2
|
||||||
|
c5.2-6.8,9.9-13.6,14.1-20.9C436.8,341.7,437.3,338,435.8,334.9z"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.0 KiB |
Loading…
Reference in New Issue
Block a user