diff --git a/client/src/App.js b/client/src/App.js
index f6bacb7..ce93ea7 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -3,17 +3,20 @@ import { Routes, Route, BrowserRouter } from 'react-router-dom';
import Welcome from './components/Welcome';
import FulLGameView from './components/Game/FullGameView';
+import Store from './store/Store';
function App() {
return (
-
SPLINTER
+
Players: {state.players}
{tierThree || 'Loading'}
diff --git a/client/src/components/GameConfigForms/CpuMultiForm.js b/client/src/components/GameConfigForms/CpuMultiForm.js
index 03892ef..95780ea 100644
--- a/client/src/components/GameConfigForms/CpuMultiForm.js
+++ b/client/src/components/GameConfigForms/CpuMultiForm.js
@@ -2,6 +2,7 @@ export default function CpuMultiForm() {
return (
)
}
\ No newline at end of file
diff --git a/client/src/components/GameConfigForms/LocalMultiForm.js b/client/src/components/GameConfigForms/LocalMultiForm.js
index 43ea700..52aa568 100644
--- a/client/src/components/GameConfigForms/LocalMultiForm.js
+++ b/client/src/components/GameConfigForms/LocalMultiForm.js
@@ -1,6 +1,9 @@
-import { useState, useEffect } from "react";
+import { useState, useEffect, useContext } from "react";
+import { Context } from "../../store/Store";
export default function LocalMultiForm() {
+ const [state, dispatch] = useContext(Context);
+
const [players, setPlayers] = useState(null);
const [formVariant, setFormVariant] = useState(null);
const [playerOne, setPlayerOne] = useState('');
@@ -8,6 +11,8 @@ export default function LocalMultiForm() {
const [playerThree, setPlayerThree] = useState('');
const [playerFour, setPlayerFour] = useState('');
+ const allPlayerNames = [playerOne, playerTwo, playerThree, playerFour];
+
const formVariants = [
<> { /* Fragment, expects to be concatenated as necessary within a
+
+
>
)
}
\ No newline at end of file
diff --git a/client/src/components/Welcome.js b/client/src/components/Welcome.js
index fec6a45..fdc4ac2 100644
--- a/client/src/components/Welcome.js
+++ b/client/src/components/Welcome.js
@@ -1,8 +1,11 @@
-import { useState, useRef } from "react"
+import { useState, useRef, useContext } from "react"
import LocalMultiForm from "./GameConfigForms/LocalMultiForm";
import CpuMultiForm from "./GameConfigForms/CpuMultiForm";
+import { Context } from "../store/Store";
export default function Welcome() {
+ const [state, dispatch] = useContext(Context);
+
const [localMulti, setLocalMulti] = useState(false);
const [cpuMulti, setCpuMulti] = useState(false);
diff --git a/client/src/store/Store.js b/client/src/store/Store.js
index 3b617f3..8f4b674 100644
--- a/client/src/store/Store.js
+++ b/client/src/store/Store.js
@@ -1,12 +1,12 @@
import { useReducer, createContext } from "react"
-import { TierOneDeck } from "../../store/TierOneDeck"
-import { TierTwoDeck } from "../../store/TierTwoDeck"
-import { TierThreeDeck } from "../../store/TierThreeDeck"
-import { Spirits } from "./Spirits"
+import { TierOneDeck } from './TierOneDeck';
+import { TierTwoDeck } from './TierTwoDeck';
+import { TierThreeDeck } from './TierThreeDeck';
+import { Spirits } from '../components/Game/Spirits';
const initialGameState = {
- players: [],
+ players: ['no players'],
materials: {
cards: {
tierOneRemaining: TierOneDeck,
@@ -27,13 +27,18 @@ const initialGameState = {
const reducer = (state, action) => {
switch (action.type) {
- case "ADD PLAYER":
- state.players.push(action.payload);
- break;
+ case "GET PLAYERS":
+ return state;
+ case "ADD PLAYERS":
+ state.players = action.payload;
+ return state;
case "UPDATE PLAYER MATERIALS":
// find player in array of players and update their resources
// update list of available materials in state
break;
+ case "PRINT PLAYERS":
+ console.log(state.players);
+ return state;
default:
break;
}