Add harambee llogo and hack fix for 0 shots bug

master
Thomas 4 years ago
parent e1b8401955
commit 2870f7436f
  1. 5
      backend/data/timelines.js
  2. 2
      docker-compose.yml
  3. 2
      frontend/src/components/Centurion.tsx
  4. 2
      frontend/src/components/Lobby.tsx
  5. 4
      frontend/src/components/Player.tsx
  6. 10
      frontend/src/css/index.sass
  7. 3
      frontend/src/css/lobby.sass
  8. BIN
      frontend/src/img/harambee_logo.png

@ -9,11 +9,12 @@ module.exports = {
"timestamp": 0,
"events": [
{
"type": "talk",
"type": "shot",
"text": [
"Zet je schrap!",
"We gaan zo beginnen"
]
],
"shotCount": 0
}
]
},

@ -31,4 +31,4 @@ networks:
external: true
centurion:
name: centurion
internal: true
internal: true

@ -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}
</section>
<footer>
<img src={haramlogo} className="haram-logo" alt="haramlogo"/>
<img src={logo} className="via-logo" alt="logo"/>
</footer>
</>

@ -148,7 +148,7 @@ const Lobby = (props: any) => {
{isConnected &&
<Row justify="center">
<Col xs={24} sm={16} md={12} xl={10}>
<Col xs={24} sm={16} md={12} xl={10} className="lobby-info">
<Card>
<h3>Huidige lobby: <b>{room?.id || 'Geen lobby'}</b></h3>

@ -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.');

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

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 322 KiB

Loading…
Cancel
Save