Skip to content

Commit

Permalink
Merge pull request #20 from JollyGrin/feat/visual-tune-ups
Browse files Browse the repository at this point in the history
Feat/visual tune ups
  • Loading branch information
JollyGrin authored Mar 25, 2024
2 parents 6668149 + 43718eb commit 8962782
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 4 deletions.
24 changes: 20 additions & 4 deletions pages/connect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ const ConnectPage = () => {
<Flex
h={"100svh"}
bg="slategray"
bgImage="background/choosefighter.png"
bgPosition="center"
bgSize="cover"
bgBlendMode="multiply"
justifyContent={"center"}
alignItems={"center"}
position="relative"
Expand All @@ -122,8 +126,9 @@ const ConnectPage = () => {
h="60%"
w="95%"
maxW="600px"
bg="white"
borderRadius={5}
bg="rgba(255,255,255,0.9)"
backdropFilter="blur(5px)"
borderRadius={9}
p={3}
justifyContent={"space-evenly"}
alignItems={"center"}
Expand All @@ -136,17 +141,20 @@ const ConnectPage = () => {
ref={nameRef}
defaultValue={router.query.username as string | undefined}
placeholder="Your name"
bg="white"
/>
<Input
ref={gidRef}
defaultValue={router.query.lobby as string | undefined}
placeholder="room name"
bg="white"
/>
</HStack>
<Button
// If we are loading a new lobby request, freeze the input values.
// isDisabled={(data && isLoading) || starredDeck === undefined}
isDisabled={loading || starredDeck === undefined}
bg="brand.primary"
onClick={() => {
if (!nameRef?.current?.value || !gidRef?.current?.value) {
alert("I need a name and a room name");
Expand All @@ -157,13 +165,13 @@ const ConnectPage = () => {
}}
>
{loading && <Spinner />}
Submit
Connect to Game
</Button>
</VStack>
</Flex>
<Flex
position="absolute"
bottom="0"
bottom="0.5rem"
flexDir={"column"}
alignItems="center"
onClick={onOpen}
Expand Down Expand Up @@ -219,6 +227,9 @@ const SelectedDeckContainer = () => {
w="100px"
h="100px"
bg={starredDeck.deck_data.appearance.highlightColour}
bgImage={starredDeck.deck_data?.appearance?.cardbackUrl}
bgSize="125%"
bgPosition="center"
border={`0.5rem solid ${starredDeck.deck_data.appearance.borderColour}`}
justifyContent="center"
alignItems="center"
Expand All @@ -230,6 +241,11 @@ const SelectedDeckContainer = () => {
cursor="pointer"
>
<Text
display={
starredDeck?.deck_data?.appearance?.cardbackUrl
? "none"
: "inline"
}
fontSize="4xl"
fontFamily={"monospace"}
color={starredDeck.deck_data.appearance.borderColour}
Expand Down
Binary file added public/background/choosefighter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8962782

Please sign in to comment.