Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FORFEIT BUTTON FOR POPUP NOTIFICATION #370

Merged
merged 7 commits into from
Sep 3, 2021
Merged
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
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
16 changes: 11 additions & 5 deletions client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -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>
);
}
Expand Down
Empty file.
13 changes: 13 additions & 0 deletions client/src/Pages/Forfeitbtn/Forfeitbtn.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import './Forfeitbtn.css';
import ForfeitBtn from './components/ForfeitBtn/ForfeitBtn'


const Forfeitbtn = () => {
return (
<div className="forfeitbtnmain">
<ForfeitBtn />
</div>
);
}

export default Forfeitbtn;
Binary file removed client/src/assets/mini-board.png
Binary file not shown.
Binary file removed client/src/assets/people.png
Binary file not shown.
5 changes: 4 additions & 1 deletion client/src/components/Button/Button.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<<<<<<< HEAD
=======
.request-challenge-btn{
background: #27AE60;
border-radius: 3px;
Expand Down Expand Up @@ -73,4 +75,5 @@ background-color: transparent;
width: 20rem;

}
}
}
>>>>>>> c5bf923a6576b9f4fe50e15f17066af8430b4126
12 changes: 0 additions & 12 deletions client/src/components/Button/ExitButton.js

This file was deleted.

12 changes: 0 additions & 12 deletions client/src/components/ChessBoard/ChessBoard.js

This file was deleted.

10 changes: 10 additions & 0 deletions client/src/components/ForfeitBtn/ForfeitBtn.css
Original file line number Diff line number Diff line change
@@ -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;
}
12 changes: 12 additions & 0 deletions client/src/components/ForfeitBtn/ForfeitBtn.js
Original file line number Diff line number Diff line change
@@ -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;
15 changes: 0 additions & 15 deletions client/src/components/Modals/InviteModal/InviteModal.js

This file was deleted.

16 changes: 0 additions & 16 deletions client/src/components/Modals/InviteModal/InviteModalSearch.js

This file was deleted.

Loading