Skip to content

Commit

Permalink
Final production push before deadline
Browse files Browse the repository at this point in the history
  • Loading branch information
lumsdnb committed Apr 5, 2021
1 parent 978c5d6 commit 0bbacb9
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 22 deletions.
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"prettier.jsxSingleQuote": true
}
4 changes: 2 additions & 2 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -670,12 +670,12 @@ const App = () => {
/>
</div>
<div className='crowd'>
<img src={crowd} alt='crowd cheering'></img>
<img src={crowd} alt='crowd cheering' draggable='false'></img>
</div>
<div className='card-deck'>
{role === "judge" ? null : (
<button className='deck-button' onClick={showDeck}>
<img src={deckbtn} alt='deck öffnen'></img>
<img src={deckbtn} alt='deck öffnen' draggable='false'></img>
</button>
)}
</div>
Expand Down
4 changes: 1 addition & 3 deletions src/Components/Card.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { useState } from "react";

import { AiOutlineStar } from "react-icons/ai";
import { TiThumbsUp, TiThumbsDown } from "react-icons/ti";
import { HiOutlineSaveAs } from "react-icons/hi";

Expand All @@ -10,7 +9,6 @@ import { GrOverview } from "react-icons/gr";
import "./Card.css";

const Card = (props) => {
const [hover, setHover] = useState(false);
const [wasRated, setWasRated] = useState("");
const [cardSaved, setCardSaved] = useState(false);

Expand Down Expand Up @@ -43,7 +41,7 @@ const Card = (props) => {
</h4>
<p className='card-body'>{props.claim}</p>
{props.source ? (
<a href={props.source} target='_blank'>
<a href={props.source} target='_blank' rel='noreferrer'>
source
</a>
) : null}
Expand Down
2 changes: 1 addition & 1 deletion src/Components/LoginModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ const LoginModal = (props) => {
style={{ width: "5rem", height: "5rem" }}
/>
</div>
{props.userName && props.role && debateID != -1 ? (
{props.userName && props.role && debateID !== -1 ? (
<>
<button
type='button'
Expand Down
14 changes: 14 additions & 0 deletions src/Components/PreparedDeck.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,20 @@ const PreparedDeck = (props) => {
judgeRating: 0,
spectatorRating: 0,
},
{
body:
"Niemand MUSS in einer Großstadt leben. Wer sich Wohnungen in beliebten Gebieten mit Platzmangel nicht leisten kann, soll sich an weniger dicht besiedelten Orten Wohnraum suchen.",
type: "argument",
judgeRating: 0,
spectatorRating: 0,
},
{
body:
"Eine Mietpreisbremse alleine reicht nicht aus, um finanziell schwache Gruppen zu unterstützen.",
type: "argument",
judgeRating: 0,
spectatorRating: 0,
},
],
];

Expand Down
2 changes: 1 addition & 1 deletion src/Components/Timer.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { propTypes } from "react-bootstrap/esm/Image";
import "./Timer.css";

const Timer = ({ playTick, startTimer, stopRound }) => {
const DEFAULT_TIME = 11;
const DEFAULT_TIME = 301;
const [seconds, setSeconds] = useState(DEFAULT_TIME);
const [isActive, setIsActive] = useState(false);

Expand Down
4 changes: 0 additions & 4 deletions src/Components/Toolbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ const Toolbox = (props) => {
);
};

const startTimer = () => {
props.startTimer();
};

return (
<BlockUi
tag='div'
Expand Down
15 changes: 5 additions & 10 deletions todo.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
- deploy DONE
- final design DONE
- chat char limit DONE
- voting screen DONE

## tag 7 - 5.4.

Expand All @@ -92,15 +93,9 @@

### extra zeug unsortiert bis jetzt

voting screen
verdict, spectator voting, diskussion aufklappen
- chat text rot highlight
verdict, spectator voting, diskussion aufklappen

erste karte mit voting zeigen

spectator voting

karten display(?)

wahl o mat
- spectator voting DONE

freie themenwahl
- freie themenwahl DONE

0 comments on commit 0bbacb9

Please sign in to comment.