Commit 47fab419 authored by Chunchi Che's avatar Chunchi Che

Merge branch 'feat/ant_design' into 'main'

Feat/ant design

See merge request mycard/Neos!41
parents c23e90b8 2b4be758
Pipeline #18734 passed with stages
in 3 minutes and 8 seconds
This diff is collapsed.
...@@ -3,11 +3,11 @@ body { ...@@ -3,11 +3,11 @@ body {
justify-content: center; justify-content: center;
} }
div { .login_div {
margin: auto; margin: auto;
padding: 10%; padding: 10%;
} }
p { .login_p {
text-align: center; text-align: center;
} }
...@@ -7,4 +7,6 @@ ...@@ -7,4 +7,6 @@
.item { .item {
text-align: center; text-align: center;
flex: 1; flex: 1;
margin: auto;
padding: 10%;
} }
...@@ -7,10 +7,14 @@ ...@@ -7,10 +7,14 @@
.playerRegion { .playerRegion {
text-align: center; text-align: center;
flex: 1; flex: 1;
margin: auto;
padding: 10%;
} }
.roomRegion { .roomRegion {
flex: 1; flex: 1;
margin: auto;
padding: 10%;
} }
.roomRegion > p { .roomRegion > p {
text-align: start; text-align: start;
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
import React, { useState, ChangeEvent } from "react"; import React, { useState, ChangeEvent } from "react";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import "../css/JoinRoom.css"; import "../css/JoinRoom.css";
import { Input, Button } from "antd";
export default function JoinRoom() { export default function JoinRoom() {
const [player, setPlayer] = useState(""); const [player, setPlayer] = useState("");
...@@ -26,38 +27,38 @@ export default function JoinRoom() { ...@@ -26,38 +27,38 @@ export default function JoinRoom() {
}; };
return ( return (
<div> <div className="login_div">
<p> <p className="login_p">
<label>player: </label> <Input
<input
type="text" type="text"
title="player" style={{ width: "20%" }}
placeholder="player"
value={player} value={player}
onChange={handlePlayerChange} onChange={handlePlayerChange}
></input> />
</p> </p>
<p> <p className="login_p">
<label>addr: </label> <Input
<input
type="text" type="text"
title="ip" style={{ width: "20%" }}
placeholder="ip"
value={ip} value={ip}
onChange={handleIpChange} onChange={handleIpChange}
></input> />
</p> </p>
<p> <p className="login_p">
<label>passwd: </label> <Input
<input
type="text" type="text"
title="passwd" style={{ width: "20%" }}
placeholder="passwd"
value={passWd} value={passWd}
onChange={handlePasswdChange} onChange={handlePasswdChange}
></input> />
</p> </p>
<p> <p className="login_p">
<button> <Button>
<Link to={{ pathname: `/${player}/${passWd}/${ip}` }}>join</Link> <Link to={{ pathname: `/${player}/${passWd}/${ip}` }}>join</Link>
</button> </Button>
</p> </p>
</div> </div>
); );
......
...@@ -18,6 +18,7 @@ import { selectDuelHsStart } from "../reducers/duel/mod"; ...@@ -18,6 +18,7 @@ import { selectDuelHsStart } from "../reducers/duel/mod";
import { store } from "../store"; import { store } from "../store";
import { useEffect } from "react"; import { useEffect } from "react";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { Button } from "antd";
// TODO: 应该展示聊天信息 // TODO: 应该展示聊天信息
export default function Mora() { export default function Mora() {
...@@ -61,23 +62,23 @@ export default function Mora() { ...@@ -61,23 +62,23 @@ export default function Mora() {
return ( return (
<div className="container"> <div className="container">
<div className="item"> <div className="item">
<button disabled={!selectHandAble} onClick={handleSelectScissors}> <Button disabled={!selectHandAble} onClick={handleSelectScissors}>
scissors scissors
</button> </Button>
<button disabled={!selectHandAble} onClick={handleSelectRock}> <Button disabled={!selectHandAble} onClick={handleSelectRock}>
rock rock
</button> </Button>
<button disabled={!selectHandAble} onClick={handleSelectPaper}> <Button disabled={!selectHandAble} onClick={handleSelectPaper}>
paper paper
</button> </Button>
</div> </div>
<div className="item"> <div className="item">
<button disabled={!selectTpAble} onClick={handleSelectFirst}> <Button disabled={!selectTpAble} onClick={handleSelectFirst}>
first first
</button> </Button>
<button disabled={!selectTpAble} onClick={handleSelectSecond}> <Button disabled={!selectTpAble} onClick={handleSelectSecond}>
second second
</button> </Button>
</div> </div>
<div className="item"> <div className="item">
<p> <p>
......
...@@ -21,6 +21,7 @@ import { ...@@ -21,6 +21,7 @@ import {
sendHsStart, sendHsStart,
} from "../api/ocgcore/ocgHelper"; } from "../api/ocgcore/ocgHelper";
import socketMiddleWare, { socketCmd } from "../middleware/socket"; import socketMiddleWare, { socketCmd } from "../middleware/socket";
import { Button } from "antd";
const READY_STATE = "ready"; const READY_STATE = "ready";
...@@ -76,17 +77,17 @@ export default function WaitRoom() { ...@@ -76,17 +77,17 @@ export default function WaitRoom() {
<div className="playerRegion"> <div className="playerRegion">
<h2>{joined ? "Room Joined!" : "Room Not Joined."}</h2> <h2>{joined ? "Room Joined!" : "Room Not Joined."}</h2>
<p> <p>
<button disabled={!joined} onClick={handleChoseDeck}> <Button disabled={!joined} onClick={handleChoseDeck}>
choose hero.ydk choose hero.ydk
</button> </Button>
</p> </p>
<p> <p>
<button disabled={!choseDeck} onClick={handleChoseReady}> <Button disabled={!choseDeck} onClick={handleChoseReady}>
ready ready
</button> </Button>
</p> </p>
<p> <p>
<button onClick={handleChoseStart}> <Button onClick={handleChoseStart}>
<Link <Link
to={ to={
// 若当前玩家是房主并且对战双方都已准备完毕,跳转到猜拳页面; // 若当前玩家是房主并且对战双方都已准备完毕,跳转到猜拳页面;
...@@ -100,7 +101,7 @@ export default function WaitRoom() { ...@@ -100,7 +101,7 @@ export default function WaitRoom() {
> >
start start
</Link> </Link>
</button> </Button>
</p> </p>
</div> </div>
<div className="roomRegion"> <div className="roomRegion">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment