Starting to operate with a bit of functionality

tomhands1 · Oct 24, 2019 · 6cb7097 · 6cb7097
1 parent 0e0dd8f
commit 6cb7097
Show file tree

Hide file tree

Showing 24 changed files with 17,319 additions and 17,436 deletions.
diff --git a/.firebaserc b/.firebaserc
@@ -1,5 +1,5 @@
 {
   "projects": {
-    "default": "duzza-cards"
+    "default": "perudo-3e05b"
   }
 }
diff --git a/firebase.json b/firebase.json
@@ -1,5 +1,6 @@
 {
     "hosting": {
+        "site": "perudo-sl",
         "public": "build",
         "ignore": [
             "firebase.json",

diff --git a/functions/index.js b/functions/index.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "duzza-games",
+    "name": "perudo",
     "version": "0.1.0",
     "private": true,
     "dependencies": {

diff --git a/public/cwood-colors-striped.png b/public/cwood-colors-striped.png
diff --git a/public/dice.png b/public/dice.png
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
+
+<head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="theme-color" content="#000000">
@@ -9,7 +10,7 @@
       homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
     -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-    <link rel="shortcut icon" href="%PUBLIC_URL%/cwood-colors-striped.png">
+    <link rel="shortcut icon" href="%PUBLIC_URL%/dice.png">
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
@@ -23,11 +24,12 @@
     <!-- Compiled and minified CSS -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-beta/css/materialize.min.css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
-    <title>Duzza Games</title>
-  </head>
-  <body>
+    <title>Perudo</title>
+</head>
+
+<body>
     <noscript>
-      You need to enable JavaScript to run this app.
+        You need to enable JavaScript to run this app.
     </noscript>
     <div id="root"></div>
     <!--
@@ -41,5 +43,6 @@
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-beta/js/materialize.min.js"></script>
-  </body>
-</html>
+</body>
+
+</html>
diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/public/manifest.json b/public/manifest.json
@@ -1,15 +1,15 @@
 {
-  "short_name": "Duzza Games",
-  "name": "Duzza Games",
-  "icons": [
-    {
-      "src": "cwood-colors-striped.png",
-      "sizes": "192x192 64x64 32x32 24x24 16x16",
-      "type": "image/png"
-    }
-  ],
-  "start_url": "./index.html",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
+    "short_name": "Perudo",
+    "name": "Perudo",
+    "icons": [
+        {
+            "src": "dice.png",
+            "sizes": "192x192 64x64 32x32 24x24 16x16",
+            "type": "image/png"
+        }
+    ],
+    "start_url": "./index.html",
+    "display": "standalone",
+    "theme_color": "#000000",
+    "background_color": "#ffffff"
 }
diff --git a/src/App.js b/src/App.js
diff --git a/src/App.jsx b/src/App.jsx
@@ -20,7 +20,6 @@ import defaultStyles from './App.module.scss';
 import NewNavbar from './navbar/NewNavbar';
 import CreateGame from './games/creategame/CreateGame';
 import JoinGame from './games/joingame/JoinGame';
-import Cards from './games/Cards';
 import Perudo from './games/perudo/PerudoContainer';
 
 const App = props => (
@@ -37,8 +36,6 @@ const App = props => (
                             <AuthenticatedRoute exact path="/profile" component={Profile} />
                             <AuthenticatedRoute exact path="/join-game" component={JoinGame} />
                             <AuthenticatedRoute exact path="/create-game" component={CreateGame} />
-                            <AuthenticatedRoute exact path="/cards" component={Cards} />
-                            <AuthenticatedRoute exact path="/perudo" component={Perudo} />
                             <AuthenticatedRoute exact path="/game/:gameId" component={Perudo} />
                             <UnauthenticatedRoute path="/sign-in" component={SignIn} redirect="/dashboard" />
                             <UnauthenticatedRoute path="/sign-up" component={SignUp} redirect="/dashboard" />

diff --git a/src/configureStore.js b/src/configureStore.js
@@ -11,4 +11,4 @@ const store = createStore(rootReducer, composeEnhancers(applyMiddleware(sagaMidd
 
 sagaMiddleware.run(rootSaga);
 
-export default store;
+export default store;
diff --git a/src/games/Cards.jsx b/src/games/Cards.jsx
diff --git a/src/games/Cards.module.scss b/src/games/Cards.module.scss
diff --git a/src/games/joingame/JoinGame.jsx b/src/games/joingame/JoinGame.jsx
@@ -171,7 +171,7 @@ JoinGame.propTypes = {
 };
 
 const mapStateToProps = state => {
-    const games = state.firestore.data.available_games;
+    const {games} = state.firestore.data;
     return {
         games
     };
@@ -184,6 +184,6 @@ const mapDispatchToProps = {
 export default compose(
     connect(mapStateToProps, mapDispatchToProps),
     firestoreConnect([{
-        collection: 'available_games'
+        collection: 'games'
     }])
 )(JoinGame);
diff --git a/src/games/perudo/Perudo.jsx b/src/games/perudo/Perudo.jsx
@@ -31,11 +31,10 @@ const Perudo = props => {
     const color = useMemo(() => colors.find(x => x.id === props.playerNum), [props.playerNum]);
 
     useEffect(() => {
-        if (props.diceFetched) {
+        if (props.diceFetched && props.rolled) {
             diceRef.current.rollAll(props.diceArray);
         }
-    }, [props.rolled, props.diceArray]);
-    console.log(props);
+    }, [props.rolled, props.diceFetched, props.diceArray]);
 
     return (
         <div className={styles.gameContainer}>

diff --git a/src/games/perudo/PerudoContainer.jsx b/src/games/perudo/PerudoContainer.jsx
@@ -48,7 +48,7 @@ const PerudoContainer = ({
     },
     [props.startGame, props.gameId]);
 
-    const activePlayer = fp.get('name')(Object.values(props.players).find(x => x.playerNumber === props.game.activePlayerNum));
+    const activePlayer = fp.get('name')(Object.values(props.players).find(x => fp.get('playerNumber')(x) === props.game.activePlayerNum));
 
     const playerNum = fp.get('playerNumber')(Object.values(props.players).find(x => x.id === props.auth.uid));
     const rolled = fp.get('rolled')(Object.values(props.players).find(x => x.id === props.auth.uid));
@@ -212,8 +212,29 @@ PerudoContainer.defaultProps = {
     shakerUp: false,
     rolling: false,
     toggleShaker: fp.noop,
-    game: {},
-    players: {},
+    game: {
+        creator: {
+            id: '',
+            name: ''
+        },
+        game_started: false,
+        name: '',
+        activePlayerNum: 1,
+        currentBid: {
+            quantity: 0,
+            value: 0
+        },
+        round: 1
+    },
+    players: {
+        '': {
+            id: '',
+            name: '',
+            numOfDice: 5,
+            readyToPlay: false,
+            rolled: false
+        }
+    },
     diceRolled: {},
     gameId: '',
     readyToPlay: fp.noop,
@@ -253,19 +274,19 @@ export default compose(
     connect(mapStateToProps, mapDispatchToProps),
     firestoreConnect(props => [
         {
-            collection: 'available_games',
+            collection: 'games',
             doc: getGameId(props),
             subcollections: [
                 { collection: 'players' }
             ],
             storeAs: 'players'
         },
         {
-            collection: 'available_games',
+            collection: 'games',
             doc: getGameId(props)
         },
         {
-            collection: 'available_games',
+            collection: 'games',
             doc: getGameId(props),
             subcollections: [
                 { collection: 'diceRolled' }

diff --git a/src/games/perudo/selectors.js b/src/games/perudo/selectors.js
@@ -21,7 +21,7 @@ export const getGameId = props => fp.flow(
 export const getGame = (state, props) => fp.flow(
     fp.get('firestore'),
     fp.get('data'),
-    fp.get('available_games'),
+    fp.get('games'),
     fp.get(getGameId(props))
 )(state);
 

diff --git a/src/index.js b/src/index.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,4 @@ const store = createStore(rootReducer, composeEnhancers(applyMiddleware(sagaMidd

		sagaMiddleware.run(rootSaga);

		export default store;
		export default store;