diff --git a/src/APIexamples/user1.json b/src/APIexamples/user1.json
index 4a13853..6f3b2f2 100644
--- a/src/APIexamples/user1.json
+++ b/src/APIexamples/user1.json
@@ -1,5 +1,5 @@
{
- "name":"1",
- "deviceId":"1",
- "stoppointgid":"9022014014754001"
+ "name": "Användare 1",
+ "deviceId": "1",
+ "stoppointgid": "9022014014754001"
}
\ No newline at end of file
diff --git a/src/APIexamples/user2.json b/src/APIexamples/user2.json
index be15eab..06eef29 100644
--- a/src/APIexamples/user2.json
+++ b/src/APIexamples/user2.json
@@ -1,5 +1,5 @@
{
- "name":"2",
- "deviceId":"2",
- "stoppointgid":"9022014014020001"
+ "name": "Användare 2",
+ "deviceId": "2",
+ "stoppointgid": "9022014014020001"
}
\ No newline at end of file
diff --git a/src/APIexamples/user3.json b/src/APIexamples/user3.json
index a496cc3..6ee5f34 100644
--- a/src/APIexamples/user3.json
+++ b/src/APIexamples/user3.json
@@ -1,5 +1,5 @@
{
- "name":"3",
- "deviceId":"3",
- "stoppointgid":"9022014014751001"
+ "name": "Användare 3",
+ "deviceId": "3",
+ "stoppointgid": "9022014014751001"
}
\ No newline at end of file
diff --git a/src/APIexamples/user4.json b/src/APIexamples/user4.json
index 7bcc5a5..3a81c81 100644
--- a/src/APIexamples/user4.json
+++ b/src/APIexamples/user4.json
@@ -1,5 +1,5 @@
{
- "name":"4",
- "deviceId":"4",
- "stoppointgid":"9021014014225000"
+ "name": "Användare 4",
+ "deviceId": "4",
+ "stoppointgid": "9021014014225000"
}
\ No newline at end of file
diff --git a/src/GlobalData.js b/src/GlobalData.js
index acd0f5b..f1a9d8a 100644
--- a/src/GlobalData.js
+++ b/src/GlobalData.js
@@ -2,11 +2,10 @@ import User from './classes/User.js';
import Disruption from './classes/Disruption.js'
import Coordinates from './classes/Coordinates.js';
import Stop from './classes/Stop.js'
-import Departure from './classes/Departure.js';
let globalData = {
user: new User(
- "test",
+ "Exempelanvändare",
"123",
new Coordinates(),
"9022014014020001"
diff --git a/src/components/DisruptionButton.js b/src/components/DisruptionButton.js
index 1782174..7b1db55 100644
--- a/src/components/DisruptionButton.js
+++ b/src/components/DisruptionButton.js
@@ -1,5 +1,3 @@
-import addNotification from "react-push-notification";
-
import globData from '../GlobalData.js';
import ex1 from '../APIexamples/disruption1.json'
@@ -51,14 +49,6 @@ class DisruptionButton extends Button {
}
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() {
diff --git a/src/components/NavigationDrawer.js b/src/components/NavigationDrawer.js
index c154a1a..7161835 100644
--- a/src/components/NavigationDrawer.js
+++ b/src/components/NavigationDrawer.js
@@ -9,7 +9,6 @@ import Button from './Button.js';
import './css/NavigationDrawer.css';
import userIcon from '../img/user.svg';
-import { glob } from 'glob';
class NavigationDrawer extends Component {
@@ -54,13 +53,15 @@ class NavigationDrawer extends Component {
}
render() {
+ console.log(globalData.user);
+
return (
<>
Välj hållplats:
- - Störnings Scenario 1
- - Störnings Scenario 2
+ - Störningsscenario 1
+ - Störningsscenario 2
diff --git a/src/components/SelectUserButton.js b/src/components/SelectUserButton.js
index 6924d3c..1d690e7 100644
--- a/src/components/SelectUserButton.js
+++ b/src/components/SelectUserButton.js
@@ -1,4 +1,3 @@
-
import globData from '../GlobalData.js';
import user1 from '../APIexamples/user1.json'
@@ -48,12 +47,11 @@ class SelectUserButton extends Button {
render() {
return (
);
}
}
-
export default SelectUserButton;
diff --git a/src/components/css/StopTitle.css b/src/components/css/StopTitle.css
index b45c74b..8063d66 100644
--- a/src/components/css/StopTitle.css
+++ b/src/components/css/StopTitle.css
@@ -24,7 +24,7 @@
color: var(--colorDiscrete);
}
-@media screen and (min-width: 350px) {
+@media screen and (min-width: 400px) {
#stopTitle h1 {
font-size: 35px;
}
diff --git a/src/img/userDark.svg b/src/img/userDark.svg
new file mode 100644
index 0000000..06172f0
--- /dev/null
+++ b/src/img/userDark.svg
@@ -0,0 +1,19 @@
+
+
+