Merge pull request #370 from dread557/dev

FORFEIT BUTTON FOR POPUP NOTIFICATION

.github/workflows/main.yml

@@ -2,9 +2,9 @@
 name: Chessboard Deployment Pipeline
 
 on:
-  # Triggers the workflow on push or pull request events but only for the dev branch
+  # Triggers the workflow on push or pull request events but only for the main branch
   push:
-    branches: [dev]
+    branches: [main]
 
 
   # Allows you to run this workflow manually from the Actions tab
@@ -24,7 +24,7 @@ jobs:
           username: ${{ secrets.USERNAME }}
           script: |
             cd /var/www/zc_plugin_chessboard/
-            git pull origin dev
+            git pull origin main
             cd server
             yarn install
             yarn build

client/package.json

@@ -6,7 +6,6 @@
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",
-    "chessboardjsx": "^2.4.7",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-icons": "^4.2.0",

client/src/App.js

@@ -3,21 +3,27 @@ import Games from './'
 
 import "./App.css";
 import HomePage from "./Pages/Homepage.js/Homepage"
-import MainGame from "./Pages/GameScreen/MainGame"
-import Input from './components/Chat/Input/Input';
+import MainGame from './Pages/GameScreen/MainGame.jsx'
 
 function App() {
   return (
     <div className="App">
+      <header class="main-header">
+        <nav>
+          <h1 id="logo">Chess Board Room Plugin</h1>
+        </nav>
+      </header>
+      <section class="hero">
+        <h2>Welcome to the Chess Board Update</h2>
+        <button>Start Game</button>
+      </section>
       <Router>
         <Switch>
           /* <Route exact path='/' render={HomePage} /> */
           <Route exact path='/game' render={MainGame} />
-
         </Switch>
       </Router>
-     {/* <HomePage /> */}
-
+
     </div>
   );
 }

client/src/Pages/Forfeitbtn/Forfeitbtn.js

@@ -0,0 +1,13 @@
+import './Forfeitbtn.css';
+import ForfeitBtn from './components/ForfeitBtn/ForfeitBtn'
+
+
+const Forfeitbtn = () => {
+    return ( 
+        <div className="forfeitbtnmain">
+            <ForfeitBtn />
+        </div>
+     );
+}
+
+export default Forfeitbtn;

client/src/components/Button/Button.css

@@ -1,3 +1,5 @@
+<<<<<<< HEAD
+=======
 .request-challenge-btn{
     background: #27AE60;
     border-radius: 3px;
@@ -73,4 +75,5 @@ background-color: transparent;
     width: 20rem;    
 
 }
-}
+}
+>>>>>>> c5bf923a6576b9f4fe50e15f17066af8430b4126

client/src/components/ForfeitBtn/ForfeitBtn.css

@@ -0,0 +1,10 @@
+
+.forfeitBtn button{
+    width: 339px;
+    height: 69px;
+    background-color: rgb(114, 2, 2);
+    color: white;
+    border-radius: 1rem;
+    border: none;
+    outline: none;
+}

client/src/components/ForfeitBtn/ForfeitBtn.js

@@ -0,0 +1,12 @@
+import './ForfeitBtn.css';
+
+function Forfeit () {
+
+    return (
+        <div className = "forfeitBtn">
+        <Link to path = ""><button>Forfeit Game</button></Link>
+        </div>
+    )
+}
+
+export default Forfeit;