diff --git a/src/layout/components/Button.tsx b/src/layout/components/Button.tsx index c5e3529..370533f 100644 --- a/src/layout/components/Button.tsx +++ b/src/layout/components/Button.tsx @@ -1,10 +1,23 @@ import React, {ButtonHTMLAttributes, DetailedHTMLProps, FunctionComponent} from "react"; -export const GHButton: FunctionComponent, HTMLButtonElement>> = (props) => { +interface ButtonProps extends DetailedHTMLProps, HTMLButtonElement> { + +} + +export const GHButton: FunctionComponent = (props) => { const {className, ...rest} = props; return ( ); +} + +export const NoButton: FunctionComponent = (props) => { + + const {className, ...rest} = props; + + return ( + + ); } \ No newline at end of file diff --git a/src/layout/components/Deck.tsx b/src/layout/components/Deck.tsx index c43221e..a7419ac 100644 --- a/src/layout/components/Deck.tsx +++ b/src/layout/components/Deck.tsx @@ -20,7 +20,7 @@ const Deck: FunctionComponent = ({currentCard, actionOnClick}) => {

- +
); diff --git a/src/layout/pages/MainLobby.tsx b/src/layout/pages/MainLobby.tsx index 37e8454..5dad41e 100644 --- a/src/layout/pages/MainLobby.tsx +++ b/src/layout/pages/MainLobby.tsx @@ -2,6 +2,7 @@ import React from "react"; import useTitle from "../../utils/hooks/TitleHook"; import Card from "../components/Card"; import {useNavigate} from "react-router"; +import {NoButton} from "../components/Button"; const ROOM_URL = `${process.env.REACT_APP_API_URL}/room`; @@ -23,14 +24,14 @@ const MainLobby = () => {

Mau-Mau

-
+

Host Game

-
-
navigateTo('/rooms')}> + + navigateTo('/rooms')}>

Join Game

-
+
); diff --git a/src/layout/pages/Rooms.tsx b/src/layout/pages/Rooms.tsx index 394a661..b5bdbc3 100644 --- a/src/layout/pages/Rooms.tsx +++ b/src/layout/pages/Rooms.tsx @@ -19,11 +19,11 @@ const Rooms = () => { return (
-

Rooms

+

Rooms

    { rooms.map((room, index) => { - return
  • navigateTo(`/room/${room}`)}>{room}
  • }) } diff --git a/src/styles/App.scss b/src/styles/App.scss index 9bd1017..2a810b9 100644 --- a/src/styles/App.scss +++ b/src/styles/App.scss @@ -7,9 +7,21 @@ src: local('Mau'), url(../assets/fonts/OrientalCatsLight.otf) format('opentype'); } -.app { - width: 100vw; - height: 100vh; +* { + box-sizing: border-box; +} + +body { + margin: 0; + height: 100dvh; + width: 100dvw; + overflow: hidden; +} + +#root, .app { + @extend .dark; + padding: 1rem; + height: 100%; } .mau { diff --git a/src/styles/layout/components/button.scss b/src/styles/layout/components/button.scss index d60cc65..d3fc8c8 100644 --- a/src/styles/layout/components/button.scss +++ b/src/styles/layout/components/button.scss @@ -53,4 +53,11 @@ ::-webkit-details-marker { display: none; } +} + +.no-button { + background-color: transparent; + border: none; + color: inherit; + cursor: pointer; } \ No newline at end of file diff --git a/src/styles/layout/pages/mainlobby.scss b/src/styles/layout/pages/mainlobby.scss index 4effd35..1a3cff9 100644 --- a/src/styles/layout/pages/mainlobby.scss +++ b/src/styles/layout/pages/mainlobby.scss @@ -1,5 +1,4 @@ .main-lobby { - width: 100vw; height: 75vh; display: flex; flex-direction: column; diff --git a/src/styles/utils/pointer.scss b/src/styles/utils/pointer.scss index 57cca58..0a90b81 100644 --- a/src/styles/utils/pointer.scss +++ b/src/styles/utils/pointer.scss @@ -1,4 +1,9 @@ -.clickable { +.mouse-pointer { cursor: pointer; user-select: none; +} + +.mouse-default { + cursor: default; + user-select: none; } \ No newline at end of file