diff --git a/backend/data/timelines.js b/backend/data/timelines.js
index 6baa3d5..b6f7985 100644
--- a/backend/data/timelines.js
+++ b/backend/data/timelines.js
@@ -9,11 +9,12 @@ module.exports = {
"timestamp": 0,
"events": [
{
- "type": "talk",
+ "type": "shot",
"text": [
"Zet je schrap!",
"We gaan zo beginnen"
- ]
+ ],
+ "shotCount": 0
}
]
},
diff --git a/docker-compose.yml b/docker-compose.yml
index 0ab965d..79ea0ca 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,4 +31,4 @@ networks:
external: true
centurion:
name: centurion
- internal: true
+ internal: true
\ No newline at end of file
diff --git a/frontend/src/components/Centurion.tsx b/frontend/src/components/Centurion.tsx
index 061d628..29b6d7a 100644
--- a/frontend/src/components/Centurion.tsx
+++ b/frontend/src/components/Centurion.tsx
@@ -8,6 +8,7 @@ import ShotsTaken from "./ShotsTaken";
import Lobby from "./Lobby";
import logo from "../img/via-logo.svg";
+import haramlogo from "../img/harambee_logo.png";
import Player from "./Player";
const Centurion = () => {
@@ -35,6 +36,7 @@ const Centurion = () => {
{showFeed ? feedContent : lobbyContent}
>
diff --git a/frontend/src/components/Lobby.tsx b/frontend/src/components/Lobby.tsx
index 1bb0863..5cbff5e 100644
--- a/frontend/src/components/Lobby.tsx
+++ b/frontend/src/components/Lobby.tsx
@@ -148,7 +148,7 @@ const Lobby = (props: any) => {
{isConnected &&
-
+
Huidige lobby: {room?.id || 'Geen lobby'}
diff --git a/frontend/src/components/Player.tsx b/frontend/src/components/Player.tsx
index d77b15b..60c395a 100644
--- a/frontend/src/components/Player.tsx
+++ b/frontend/src/components/Player.tsx
@@ -71,9 +71,6 @@ const Player = () => {
let targetTime = roomTime() / 1000;
let diff = player.current.currentTime - targetTime;
- console.log('PLAYER DIFF', diff,
- 'min req to seek: ', diffSecondsRequiredToSeekRunningPlayer);
-
if (player.current && Math.abs(diff) > diffSecondsRequiredToSeekRunningPlayer) {
if (room.speedFactor != 1 || manualAdjustment || timesSeeked < maxTimesSeekAllow) {
player.current.currentTime = targetTime;
@@ -82,7 +79,6 @@ const Player = () => {
if (!manualAdjustment) {
setTimesSeeked(timesSeeked + 1);
}
- console.log('PLAYER SEEKED', 'Player was seeked (total: ' + timesSeeked + ')');
} else {
console.warn('The running player is off, but we\'ve changed the time ' +
'too often, skipping synchronizing the player.');
diff --git a/frontend/src/css/index.sass b/frontend/src/css/index.sass
index 4cb6b84..1f80980 100644
--- a/frontend/src/css/index.sass
+++ b/frontend/src/css/index.sass
@@ -34,6 +34,16 @@ body
padding: 10px
+.haram-logo
+ z-index: -10000
+ position: fixed
+ left: 0
+ bottom: 0
+ width: auto
+ height: 10em
+ padding: 10px
+
+
.sider
text-align: center
diff --git a/frontend/src/css/lobby.sass b/frontend/src/css/lobby.sass
index c31c11f..d2950ad 100644
--- a/frontend/src/css/lobby.sass
+++ b/frontend/src/css/lobby.sass
@@ -31,6 +31,9 @@
font-size: 1.5rem
text-align: center
+ .lobby-info
+ text-align: center
+
.control
font-size: 1.3rem
margin: 2em 1em 2em 1em
diff --git a/frontend/src/img/harambee_logo.png b/frontend/src/img/harambee_logo.png
new file mode 100644
index 0000000..67dad86
Binary files /dev/null and b/frontend/src/img/harambee_logo.png differ