-
{game.playerWhite}
-
{game.playerWhiteRank}
+
+
+
>
)
}
diff --git a/packages/play-node-go/play-node-go/src/components/Button/Game/Game.scss b/packages/play-node-go/play-node-go/src/components/Button/Game/Game.scss
index f0b722c..bd60edf 100644
--- a/packages/play-node-go/play-node-go/src/components/Button/Game/Game.scss
+++ b/packages/play-node-go/play-node-go/src/components/Button/Game/Game.scss
@@ -1,5 +1,113 @@
-div.Game__playerData {
+
+div.GameButton {
+ align-items: stretch;
+ background-color: #aa9933;
+ display: flex;
+ flex-flow: column nowrap;
+ height: 20vw;
+ justify-content: space-around;
+ margin: 1vw;
+ width: 20vw;
+}
+
+div.GameButton__seat {
+ background-color: red;
+ height: 10%;
+ margin: 0 auto;
+ width: 50%;
+
+ &.GameButton__seat--black {
+ border: transparent;
+ border-radius: 5vw 5vw 0 0;
+ }
+
+ &.GameButton__seat--white {
+ border: transparent;
+ border-radius: 0 0 5vw 5vw;
+ }
+
+}
+
+div.GameButton__table {
+ background-color: blue;
+ height: 80%;
+ margin: 0;
width: 100%;
+}
+
+div.GameButton__table__meta {
+ background-color: transparent;
+ display: flex;
+ flex-flow: column nowrap;
+ height: 100%;
+ justify-content: space-around;
+ width: 100%;
+ z-index: 2;
+}
+
+div.GameButton__table__meta * {
+ z-index: 2;
+}
+
+div.GameButton__table__image {
+ align-items: center;
+ background: radial-gradient(farthest-corner at 55% 40%, rgb(150, 200, 220) 0%, rgb(97, 166, 194) 65%, rgb(70,100,120) 100%);
+ border: 0.15vw solid rgb(150, 200, 220);
+ // ! change border sides
+ border-radius: 0.3vw;
+ display: flex;
+ flex-flow: column nowrap;
+ height: 100%;
+ justify-content: space-between;
+ position: relative;
+ top: -100%;
+ width: 100%;
+ z-index: 1;
+
+ div.table__game-board {
+ background: radial-gradient(farthest-corner at 55% 40%, rgb(244, 230, 120) 0%, rgb(234, 178, 78) 65%, rgb(200, 160, 90) 90%, rgb(200, 140, 90) 100%);
+ height: 60%;
+ width: 60%;
+ }
+}
+
+div.table__player-area {
+ height: 20%;
+ width: 60%;
+
+ div.table__player-bowl {
+ background: radial-gradient(farthest-corner at 48% 54%, rgb(30, 5, 0) 0%, rgb(30, 5, 0) 2%, rgb(30, 5, 0) 32%, rgb(0,0,0)35%, rgb(116,48,17) 48%, rgb(140, 60, 40) 52%, rgb(100, 40, 5) 55%, rgb(116, 48, 17) 58%, rgb(140,60,40) 65%, rgb(100, 40, 5) 80%, rgb(80, 20, 0) 90%);
+ border-radius: 50%;
+ height: 2.75vw;
+ width: 2.75vw;
+
+ &--white {
+ margin: auto 75% auto auto;
+ }
+
+ &--black {
+ margin: auto auto auto 75%;
+ }
+
+ }
+}
+
+div.GameButton__player-data {
+ background-color: rgba(155,155,155,0.5);
display: flex;
justify-content: space-between;
+ margin: 0.5vw;
+ max-width: 100%;
+
+ &.GameButton__player-data--white {
+ margin: 0 5vw 0 0.5vw;
+ }
+
+ &.GameButton__player-data--black {
+ margin: 0 0.5vw 0 5vw;
+ }
+}
+
+.GameButton__link {
+ margin: 0 auto;
}
\ No newline at end of file
diff --git a/packages/play-node-go/play-node-go/src/components/Display/Development/Development.js b/packages/play-node-go/play-node-go/src/components/Display/Development/Development.js
index 46dd204..7c0a811 100644
--- a/packages/play-node-go/play-node-go/src/components/Display/Development/Development.js
+++ b/packages/play-node-go/play-node-go/src/components/Display/Development/Development.js
@@ -2,7 +2,7 @@ import React from 'react';
const Development = () => {
return (<>
-
This Feature is in Development :{')'}
+
This Feature is in Development :)
>);
}
diff --git a/packages/play-node-go/play-node-go/src/components/Display/Message/Message.js b/packages/play-node-go/play-node-go/src/components/Display/Message/Message.js
index ac3db16..60345e2 100644
--- a/packages/play-node-go/play-node-go/src/components/Display/Message/Message.js
+++ b/packages/play-node-go/play-node-go/src/components/Display/Message/Message.js
@@ -4,7 +4,10 @@ import './Message.scss';
const Message = (props) => {
const messageData = props.message;
return (
-
+
{messageData.content}
{messageData.username}
{messageData.admin ? 'admin' : <>>}
diff --git a/packages/play-node-go/play-node-go/src/components/Error/ActionError/ActionError.js b/packages/play-node-go/play-node-go/src/components/Error/ActionError/ActionError.js
index 1d73746..20c49e0 100644
--- a/packages/play-node-go/play-node-go/src/components/Error/ActionError/ActionError.js
+++ b/packages/play-node-go/play-node-go/src/components/Error/ActionError/ActionError.js
@@ -4,7 +4,10 @@ import './ActionError.scss';
const ActionError = (props) => {
const errorMessage = props.error;
return (
-
+
{errorMessage}
);
diff --git a/packages/play-node-go/play-node-go/src/components/Error/FormError/FormError.js b/packages/play-node-go/play-node-go/src/components/Error/FormError/FormError.js
index 4804a30..42c5f08 100644
--- a/packages/play-node-go/play-node-go/src/components/Error/FormError/FormError.js
+++ b/packages/play-node-go/play-node-go/src/components/Error/FormError/FormError.js
@@ -4,7 +4,10 @@ import './FormError.scss';
const FormError = (props) => {
const errorMessage = props.error;
return (
-
+
{errorMessage}
);
diff --git a/packages/play-node-go/play-node-go/src/components/Form/Login/Login.js b/packages/play-node-go/play-node-go/src/components/Form/Login/Login.js
index 38d0911..e20f785 100644
--- a/packages/play-node-go/play-node-go/src/components/Form/Login/Login.js
+++ b/packages/play-node-go/play-node-go/src/components/Form/Login/Login.js
@@ -68,29 +68,42 @@ const Login = (props) => {
{formError(props.state.errors)}
diff --git a/packages/play-node-go/play-node-go/src/components/Form/Signup/Signup.js b/packages/play-node-go/play-node-go/src/components/Form/Signup/Signup.js
index 25180c1..2f37844 100644
--- a/packages/play-node-go/play-node-go/src/components/Form/Signup/Signup.js
+++ b/packages/play-node-go/play-node-go/src/components/Form/Signup/Signup.js
@@ -87,39 +87,56 @@ const Signup = (props) => {
{formError(props.state.errors)}
diff --git a/packages/play-node-go/play-node-go/src/pages/Account/AccountSidebar.js b/packages/play-node-go/play-node-go/src/pages/Account/AccountSidebar.js
index 61f0db1..0491d5d 100644
--- a/packages/play-node-go/play-node-go/src/pages/Account/AccountSidebar.js
+++ b/packages/play-node-go/play-node-go/src/pages/Account/AccountSidebar.js
@@ -2,8 +2,8 @@ import React from 'react';
const AccountSidebar = () => {
return (
- <>
- >
+
);
}
diff --git a/packages/play-node-go/play-node-go/src/pages/Game/Game.js b/packages/play-node-go/play-node-go/src/pages/Game/Game.js
index 7a928e9..b63eb52 100644
--- a/packages/play-node-go/play-node-go/src/pages/Game/Game.js
+++ b/packages/play-node-go/play-node-go/src/pages/Game/Game.js
@@ -66,10 +66,18 @@ const Game = (props) => {
// ! [end]
return (
-
+
Game
-
{socket ? '✓' : ' ⃠'}
+
+
{socket ? '✓' : ' ⃠'}
+
+
);
}
diff --git a/packages/play-node-go/play-node-go/src/pages/Home/Home.js b/packages/play-node-go/play-node-go/src/pages/Home/Home.js
index b5df138..93feaca 100644
--- a/packages/play-node-go/play-node-go/src/pages/Home/Home.js
+++ b/packages/play-node-go/play-node-go/src/pages/Home/Home.js
@@ -18,7 +18,8 @@ const Home = props => {
/>
))
}
- return
Loading Component
+ // TODO stub loader
+ return
Loading Component
}
const fetchRoomsAPI = async () => {
@@ -38,11 +39,8 @@ const Home = props => {
}, [])
return (
-
-
-
- {renderRooms()}
-
+
+ {renderRooms()}
);
}
diff --git a/packages/play-node-go/play-node-go/src/pages/Home/Home.scss b/packages/play-node-go/play-node-go/src/pages/Home/Home.scss
index ae4003c..1e2103d 100644
--- a/packages/play-node-go/play-node-go/src/pages/Home/Home.scss
+++ b/packages/play-node-go/play-node-go/src/pages/Home/Home.scss
@@ -1,4 +1,4 @@
-div.Page div.Home {
+div.Home {
display: flex;
flex-flow: row wrap;
align-items: flex-start;
diff --git a/packages/play-node-go/play-node-go/src/pages/Home/HomeSidebar.js b/packages/play-node-go/play-node-go/src/pages/Home/HomeSidebar.js
index 6c6b4e7..4d8899d 100644
--- a/packages/play-node-go/play-node-go/src/pages/Home/HomeSidebar.js
+++ b/packages/play-node-go/play-node-go/src/pages/Home/HomeSidebar.js
@@ -16,15 +16,34 @@ const HomeSidebar = (props) => {
>
const ifNoUser = <>
-
{setShowForm('login')}}>Login
- {showForm === 'login' ?
: <>>}
- {setShowForm('signup')}}>Signup
- {showForm === 'signup' ? : <>>}
+ {setShowForm('login')}}
+ >Login
+ {
+ showForm === 'login'
+ ?
+ : <>>
+ }
+
+ {setShowForm('signup')}}
+ >Signup
+ {
+ showForm === 'signup'
+ ?
+ : <>>
+ }
>
return (
);
}
diff --git a/packages/play-node-go/play-node-go/src/pages/Layout/NavBar/NavBar.js b/packages/play-node-go/play-node-go/src/pages/Layout/NavBar/NavBar.js
index 7c8014e..96f4c4a 100644
--- a/packages/play-node-go/play-node-go/src/pages/Layout/NavBar/NavBar.js
+++ b/packages/play-node-go/play-node-go/src/pages/Layout/NavBar/NavBar.js
@@ -12,15 +12,15 @@ const NavBar = (props) => {
- Find a Game
+ Find a Game
- News
+ News
- {props.user ? props.user.username : <>>}
+ {props.user ? props.user.username : <>>}
);
diff --git a/packages/play-node-go/play-node-go/src/pages/News/NewsSidebar.js b/packages/play-node-go/play-node-go/src/pages/News/NewsSidebar.js
index c438677..61140d8 100644
--- a/packages/play-node-go/play-node-go/src/pages/News/NewsSidebar.js
+++ b/packages/play-node-go/play-node-go/src/pages/News/NewsSidebar.js
@@ -2,8 +2,8 @@ import React from 'react';
const NewsSidebar = () => {
return (
- <>
- >
+
);
}
diff --git a/packages/play-node-go/play-node-go/src/pages/Room/Room.js b/packages/play-node-go/play-node-go/src/pages/Room/Room.js
index d808365..2902b09 100644
--- a/packages/play-node-go/play-node-go/src/pages/Room/Room.js
+++ b/packages/play-node-go/play-node-go/src/pages/Room/Room.js
@@ -80,7 +80,7 @@ const Room = (props) => {
return (
-
{state.currentRoom ? state.currentRoom.name : 'Loading'}
+
{state.currentRoom ? state.currentRoom.name : 'Loading'}
{/*
{socket ? '✓' : ' ⃠'} */}
{state.errors.joinGame ?
: <>>}
diff --git a/packages/play-node-go/play-node-go/src/pages/Room/RoomSidebar.js b/packages/play-node-go/play-node-go/src/pages/Room/RoomSidebar.js
index 7beb7a8..1d3101c 100644
--- a/packages/play-node-go/play-node-go/src/pages/Room/RoomSidebar.js
+++ b/packages/play-node-go/play-node-go/src/pages/Room/RoomSidebar.js
@@ -5,11 +5,11 @@ import RoomArchiveButton from '../../components/Button/RoomArchive/RoomArchive';
const RoomSidebar = () => {
return (
- <>
+
);
}