Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions imports/ui/About.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class About extends Component {
About
</span>
</h2>
{/* should escape quote here */}
<h5>Dixit is a card game using a deck of cards illustrated with dreamlike images,
players select cards that match a title suggestsed by the "storyteller", and
attempt to vote which card the "storyteller" selected...</h5>
Expand Down
2 changes: 2 additions & 0 deletions imports/ui/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@ class App extends Component {
<div className = "container">
<Switch>
<Route exact path="/" component={HomePage} />
{/* How to get to this page */}
<Route exact path="/AddCard" component={AddCard} />
<Route exact path="/About" component={About} />
<Fragment>
{/* You can Do something : <Route exact path="/gameroom" component= { this.props.myData.length === 0 ? GameRoom : this.props.myData[0].ingame ? MyGame : GameRoom} /> */}
{this.props.myData.length === 0 ? <Route exact path="/gameroom" component= {GameRoom} /> : <div>
{this.props.myData[0].ingame ? <Route exact path="/gameroom" component={MyGame} /> :
<Route exact path="/gameroom" component= {GameRoom} />}</div>
Expand Down
2 changes: 1 addition & 1 deletion imports/ui/HomePage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class HomePage extends Component {
render() {
return (
<div className="jumbotron">

{/* Here you better have something in the landing page */}
</div>
);
}
Expand Down
3 changes: 2 additions & 1 deletion imports/ui/MyGame.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,7 @@ class MyGame extends Component {
</div>
:
<div>
{/* TargetCard might be null */}
{this.state.stage === 2 && this.state.isHost?
<div className="row">
<h4>
Expand Down Expand Up @@ -660,7 +661,7 @@ MyGame.propTypes = {
cards: PropTypes.arrayOf(PropTypes.object).isRequired,
ready: PropTypes.bool.isRequired
};

/* Is it better to pass myGame from App into MyGame? */
export default withTracker(() => {
const handle = Meteor.subscribe("myGame");
const handle2 = Meteor.subscribe("gameData");
Expand Down