feat: Add increasing score by getting bouns

Fixes #1
mhdolatabadi · May 27, 2021 · 2fad091 · 2fad091
1 parent d45d27e
commit 2fad091
Show file tree

Hide file tree

Showing 26 changed files with 244 additions and 1,590 deletions.
diff --git a/backend/index.js b/backend/index.js
diff --git a/server/package.json → backend/package.json b/server/package.json → backend/package.json
diff --git a/backend/src/setup/config.js b/backend/src/setup/config.js
@@ -6,14 +6,14 @@ const production = process.env.NODE_ENV === 'production'
 const defaultConfig = {
   server: {
     host: production ? 'localhost' : undefined, // all IPs
-    port: 3000,
+    port: 13797,
   },
 }
 
 const getLocalConfig = () => {
   try {
     const config = fse.readJsonSync(process.env.WEBLITE_CONFIG_PATH)[
-      'نقطه‌بازی'
+      'dots-and-boxes'
     ]
     if (!R.is(Object, config) || R.is(Array, config)) throw new TypeError()
     return config

diff --git a/server/yarn.lock → backend/yarn.lock b/server/yarn.lock → backend/yarn.lock
diff --git a/frontend/7475741651600002657.svg b/frontend/7475741651600002657.svg
diff --git a/frontend/GameAnalytics.js b/frontend/GameAnalytics.js
diff --git a/frontend/Vazir-FD.ttf b/frontend/Vazir-FD.ttf
diff --git a/frontend/assets/123.png b/frontend/assets/123.png
diff --git a/frontend/assets/i-demand-attention-244.mp3 b/frontend/assets/i-demand-attention-244.mp3
diff --git a/frontend/assets/line2.mp3 b/frontend/assets/line2.mp3
diff --git a/frontend/assets/o61dl3IxvAXhsWiAOeGnHXCJGS1XmY9IPajl3OAB.png b/frontend/assets/o61dl3IxvAXhsWiAOeGnHXCJGS1XmY9IPajl3OAB.png
diff --git a/frontend/assets/what-302.mp3 b/frontend/assets/what-302.mp3
diff --git a/frontend/data.js b/frontend/data.js
diff --git a/frontend/game/src/components/rectangle/rectangle.js b/frontend/game/src/components/rectangle/rectangle.js
@@ -4,12 +4,16 @@ import useStyle from './rectangle.style'
 // localiztion
 import t from './rectangle.local'
 import {
+  addNewLine,
   elementColorView,
   getPlayerHasPermission,
+  increaseOpponentScore,
+  increasePlayerScore,
   playerColorView,
 } from '../../scenes/_slice/game.slice'
 import { useSelector } from 'react-redux'
 import { requestGift, sendBouns } from '../../services/backend/backend.service'
+import { dispatch } from '../../setup/store/store'
 
 export default function Rectangle({ i, j, lastMove }) {
   const classes = useStyle()
@@ -29,14 +33,16 @@ export default function Rectangle({ i, j, lastMove }) {
   if (i + 1 === lastI && j === lastJ) lastLineColor = downLineColor || ''
   if (i === lastI && j - 1 === lastJ) lastLineColor = leftLineColor || ''
   if (i === lastI && j + 1 === lastJ) lastLineColor = rightLineColor || ''
-  // if (i === 2 && j === 10) console.log(lastLineColor)
 
   const backgroundColor = background
-    ? `dark${background}`
+    ? background
     : !!topLineColor && !!rightLineColor && !!leftLineColor && !!downLineColor
-    ? `dark${lastLineColor}`
+    ? lastLineColor
     : ''
-
+  if (!background && backgroundColor) {
+    console.log({ backgroundColor })
+    dispatch(addNewLine({ i, j, color: backgroundColor }))
+  }
   if (
     ((i - 1 === lastI && j === lastJ) ||
       (i + 1 === lastI && j === lastJ) ||
@@ -47,18 +53,21 @@ export default function Rectangle({ i, j, lastMove }) {
     !!rightLineColor &&
     !!leftLineColor &&
     !!downLineColor &&
-    playerColor === lastColor
+    !playerHasPermission
   ) {
-    // console.log({ playerColor, lastColor, lastLineColor })
-    sendBouns(i, j, playerColor)
+    console.log({ playerColor, lastColor, background })
+    if (playerColor === lastColor) {
+      dispatch(increasePlayerScore())
+      sendBouns(i, j, playerColor)
+    } else dispatch(increaseOpponentScore())
   }
   return (
     <div
       className={classes.root}
       style={{
         gridColumn: `${j - 1} / ${j + 2}`,
         gridRow: `${i - 1} / ${i + 2}`,
-        backgroundColor,
+        backgroundColor: `dark${backgroundColor}`,
       }}
     >
       <span></span>

diff --git a/frontend/game/src/scenes/_slice/game.slice.js b/frontend/game/src/scenes/_slice/game.slice.js
@@ -91,6 +91,12 @@ const gameSlice = createSlice({
       const { history } = action.payload
       state.room.history = history
     },
+    increasePlayerScore: (state, aciton) => {
+      state.player.score += 1
+    },
+    increaseOpponentScore: (state, aciton) => {
+      state.opponent.score += 1
+    },
   },
 })
 
@@ -109,6 +115,8 @@ export const {
   setPlayerLastMove,
   setOpponentLastMove,
   setRoomLastMove,
+  increasePlayerScore,
+  increaseOpponentScore,
 } = actions
 export default reducer