Skip to content
Snippets Groups Projects
Commit e41a9996 authored by Taha's avatar Taha
Browse files

Merge branch 'menu' of gitlab.isima.fr:tabelkhiri/bataille-navale-front

parents 89545c3d 9ed399ce
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 349 additions and 68 deletions
package-lock.json
+ 11
− 0
View file @ e41a9996
......@@ -17,6 +17,7 @@
"react-dom": "^18.2.0",
"react-scripts": "5.0.1",
"three": "^0.149.0",
"typeface-quicksand": "^1.1.13",
"web-vitals": "^2.1.4"
}
},
......@@ -16132,6 +16133,11 @@
"is-typedarray": "^1.0.0"
}
},
"node_modules/typeface-quicksand": {
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/typeface-quicksand/-/typeface-quicksand-1.1.13.tgz",
"integrity": "sha512-sStzisPEpHfgPDE7EQvaDj9j5kxF56xeJgVc/8F2cchmI1IeuQ5ZE3ufTchSSpKbGRddgjgfWGUyjb7RqtJORA=="
},
"node_modules/typescript": {
"version": "4.9.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
......@@ -28723,6 +28729,11 @@
"is-typedarray": "^1.0.0"
}
},
"typeface-quicksand": {
"version": "1.1.13",
"resolved": "https://registry.npmjs.org/typeface-quicksand/-/typeface-quicksand-1.1.13.tgz",
"integrity": "sha512-sStzisPEpHfgPDE7EQvaDj9j5kxF56xeJgVc/8F2cchmI1IeuQ5ZE3ufTchSSpKbGRddgjgfWGUyjb7RqtJORA=="
},
"typescript": {
"version": "4.9.4",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz",
package.json
+ 1
− 0
View file @ e41a9996
......@@ -12,6 +12,7 @@
"react-dom": "^18.2.0",
"react-scripts": "5.0.1",
"three": "^0.149.0",
"typeface-quicksand": "^1.1.13",
"web-vitals": "^2.1.4"
},
"scripts": {
......
public/background.jpg 0 → 100644
+ 0
− 0
View file @ e41a9996
public/background.jpg

231 KiB

public/favicon.ico
+ 0
− 0
View replaced file @ 89545c3d View file @ e41a9996
public/favicon.ico

3.78 KiB | W: | H:

public/favicon.ico

5.77 KiB | W: | H:

public/favicon.ico
public/favicon.ico
public/favicon.ico
public/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
public/index.html
+ 2
− 2
View file @ e41a9996
......@@ -9,7 +9,7 @@
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
......@@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>SPATIAL WAR</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
......
public/logo.png 0 → 100644
+ 0
− 0
View file @ e41a9996
public/logo.png

198 KiB

src/App.css deleted 100644 → 0
+ 0
− 38
View file @ 89545c3d
.App {
text-align: center;
}
.App-logo {
height: 40vmin;
pointer-events: none;
}
@media (prefers-reduced-motion: no-preference) {
.App-logo {
animation: App-logo-spin infinite 20s linear;
}
}
.App-header {
background-color: #282c34;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
}
.App-link {
color: #61dafb;
}
@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
src/App.js
+ 0
− 2
View file @ e41a9996
import logo from './logo.svg';
import './App.css';
import Game from './Game.js';
function App(props) {
......
src/App.test.js deleted 100644 → 0
+ 0
− 8
View file @ 89545c3d
import { render, screen } from '@testing-library/react';
import App from './App';
test('renders learn react link', () => {
render(<App />);
const linkElement = screen.getByText(/learn react/i);
expect(linkElement).toBeInTheDocument();
});
src/Container.js 0 → 100644
+ 17
− 0
View file @ e41a9996
import React from 'react';
import App from './App';
class Container extends React.Component {
state = {isMounted: true};
render() {
const {isMounted = true, loadingPercentage = 0} = this.state;
return (
<>
{isMounted && <App onProgress={loadingPercentage => this.setState({ loadingPercentage })} />}
</>
)
}
}
export default Container;
\ No newline at end of file
src/components/CreateGame.css 0 → 100644
+ 10
− 0
View file @ e41a9996
.CreateGameForm{
text-align: center;
margin-top: 3%;
margin-left: 0%;
}
\ No newline at end of file
src/components/CreateGame.js 0 → 100644
+ 57
− 0
View file @ e41a9996
import './CreateGame.css';
import React from 'react';
import ReturnButton from './ReturnButton';
class CreateGame extends React.Component {
constructor(props) {
super(props);
this.state = {value: ''};
this.handleChange = this.handleChange.bind(this);
this.handleSubmit = this.handleSubmit.bind(this);
}
handleChange(event) {
this.setState({value: event.target.value});
}
handleSubmit(event) {
alert('A name was submitted: ' + this.state.value);
event.preventDefault();
}
render() {
return (
<React.StrictMode>
<div>
<button className="button" type="button" onClick={ReturnButton}>
BACK
</button>
</div>
<div className = "Title">
<h1>SPATIAL WAR</h1>
</div>
<div className = "CreateGameForm">
<form id='create' onSubmit={this.handleSubmit}>
<label>
<input type="text" placeholder='username' value={this.state.value} onChange={this.handleChange} />
</label>
<br />
<input type="submit" value="Submit" />
</form>
<button className="button" type="button" /*onClick={ CREER LA GAME AVEC LE FORMULAIRE PLUS HAUT }*/ >
CREATE
</button>
</div>
</React.StrictMode>
);
}
}
export default CreateGame;
\ No newline at end of file
src/components/JoinGame.css 0 → 100644
+ 10
− 0
View file @ e41a9996
.JoinGameForm{
text-align: center;
margin-top: 3%;
margin-left: 0%;
}
\ No newline at end of file
src/components/JoinGame.js 0 → 100644
+ 83
− 0
View file @ e41a9996
import './JoinGame.css';
import React from 'react';
import Container from '../Container';
import ReturnButton from './ReturnButton';
class JoinGame extends React.Component {
constructor(props) {
super(props);
this.state = {username: '',
gameid: '',
isGameStarted: false};
this.handleChange = this.handleChange.bind(this);
this.handleSubmit = this.handleSubmit.bind(this);
this.joinGame = this.joinGame.bind(this);
}
handleChange(event) {
this.setState({username: event.target.username,
gameid: event.target.gameid});
}
handleSubmit(event) {
alert('USER : ' + this.state.username +' want to join game : ' + this.state.gameid + '');
event.preventDefault();
}
joinGame(event) {
console.log(this)
this.setState({isGameStarted: true});
console.log("Joining game");
// call API to join game
}
render() {
if (this.state.isGameStarted) {
return (
<Container />
);
}
return (
<React.StrictMode>
<div>
<button className="button" type="button" onClick={ReturnButton}>
BACK
</button>
</div>
<div className = "Title">
<h1>SPATIAL WAR</h1>
</div>
<div className = "JoinGameForm">
<form onSubmit={this.handleSubmit}>
<label>
<input type="text"
placeholder='Username'
value={this.state.username}
onChange={this.handleChange} />
</label>
<br/>
<label>
<input type="text"
placeholder='GameId'
value={this.state.gameid}
onChange={this.handleChange} />
</label>
<br/>
</form>
<button className="button" type="button" onClick={ this.joinGame }>
JOIN
</button>
</div>
</React.StrictMode>
);
}
}
export default JoinGame;
\ No newline at end of file
src/components/ReturnButton.css 0 → 100644
+ 0
− 0
View file @ e41a9996
src/components/ReturnButton.js 0 → 100644
+ 52
− 0
View file @ e41a9996
import React from 'react';
import ReactDOM from 'react-dom/client';
import JoinGame from './JoinGame';
import CreateGame from './CreateGame';
function JoinGameMenu(){
root.render(
<React.StrictMode>
<JoinGame />
</React.StrictMode>
);
}
function CreateGameMenu(){
root.render(
<React.StrictMode>
<CreateGame />
</React.StrictMode>
);
}
const root = ReactDOM.createRoot(document.getElementById('root'));
function ReturnButton () {
root.render(
<React.StrictMode>
<div className = "Title">
<h1>SPATIAL WAR</h1>
</div>
<div className = "Buttons">
<button className="button" type="button" onClick={JoinGameMenu}>
JOIN GAME
</button>
<button className="button" type="button" onClick={CreateGameMenu}>
CREATE GAME
</button>
</div>
</React.StrictMode>
)
}
export default ReturnButton;
\ No newline at end of file
src/index.css
+ 52
− 1
View file @ e41a9996
body {
margin: 0;
margin: 0%;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
background-color: rgb(22, 22, 92);
background-image: url("../public/background.jpg");
}
code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace;
}
.Title {
font-size: xxx-large ;
font-family: Quicksand;
color : white;
text-align: center;
margin-top: 10%;
}
.Buttons {
margin-top: 14%;
display: flex;
flex-direction: row;
justify-content: space-evenly;
}
.button {
/*margin-bottom: 20%; règle le soucis de background mais sur un plus petit écran rajoute de la longueur sur la page*/
font-size: xxx-large ;
font-family: Quicksand;
color : white;
background-color: rgba(0, 0, 0, 0);
text-align: center;
border-radius: 100px;
}
.button:hover {
background-color: rgb(0, 0, 10);
}
@media only screen and (min-width: 1920px),(min-height: 1080px) {
body{
background-repeat: no-repeat;
background-size: cover;
background-position-y: top;
}
}
\ No newline at end of file
src/index.js
+ 54
− 16
View file @ e41a9996
import React, { Component } from "react";
import ReactDOM from "react-dom/client";
import '../node_modules/bootstrap/dist/css/bootstrap.min.css';
import 'typeface-quicksand';
import App from "./App";
import JoinGame from './components/JoinGame';
import CreateGame from './components/CreateGame';
import reportWebVitals from './reportWebVitals';
class Container extends React.Component {
state = {isMounted: true};
import './index.css';
render() {
const {isMounted = true, loadingPercentage = 0} = this.state;
return (
<>
{isMounted && <App onProgress={loadingPercentage => this.setState({ loadingPercentage })} />}
</>
)
function JoinGameMenu(){
root.render(
<React.StrictMode>
<JoinGame />
</React.StrictMode>
);
}
function CreateGameMenu(){
root.render(
<React.StrictMode>
<CreateGame />
</React.StrictMode>
);
}
const root = ReactDOM.createRoot(document.getElementById('root'));
function Menu(){
root.render(
<React.StrictMode>
<div className = "Title">
<h1>SPATIAL WAR</h1>
</div>
<div className = "Buttons">
<button className="button" type="button" onClick={JoinGameMenu}>
JOIN GAME
</button>
<button className="button" type="button" onClick={CreateGameMenu}>
CREATE GAME
</button>
</div>
</React.StrictMode>
);
}
const root = ReactDOM.createRoot(document.getElementById("root"));
root.render(
<React.StrictMode>
<Container />
<Menu />
</React.StrictMode>
);
// If you want to start measuring performance in your app, pass a function
// to log results (for example: reportWebVitals(console.log))
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
reportWebVitals();
src/logo.png 0 → 100644
+ 0
− 0
View file @ e41a9996
src/logo.png

33.7 KiB

src/logo.svg deleted 100644 → 0
+ 0
− 1
View file @ 89545c3d
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment