Skip to content

Commit

Permalink
Merge pull request #122 from game-node-app/dev
Browse files Browse the repository at this point in the history
Latest dev changes
  • Loading branch information
Lamarcke authored Oct 28, 2024
2 parents 4a6e06f + caec232 commit 66d4f3c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
5 changes: 4 additions & 1 deletion src/components/game/info/share/GameInfoSharePreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@ const GameInfoSharePreview = ({
</Stack>
)}
<Flex justify={"center"} className={"mt-16 mb-8"}>
<GameNodeLogo className={"w-20 h-auto"} withBadge={false} />
<GameNodeLogo
className={"w-20 h-auto"}
withBetaBadge={false}
/>
</Flex>
</Stack>
</Paper>
Expand Down
9 changes: 6 additions & 3 deletions src/components/general/GameNodeLogo.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
import React from "react";
import { Badge, Group, Image } from "@mantine/core";
interface GameNodeLogoProps extends React.ComponentPropsWithoutRef<"img"> {
withBadge?: boolean;
withBetaBadge?: boolean;
}
const GameNodeLogo = ({ withBadge = true, ...props }: GameNodeLogoProps) => {
const GameNodeLogo = ({
withBetaBadge = true,
...props
}: GameNodeLogoProps) => {
return (
<Group gap={10}>
<img
className="w-full h-auto max-h-full "
{...props}
src={"/img/main-logo.png"}
/>
{withBadge && <Badge>BETA</Badge>}
{withBetaBadge && <Badge>BETA</Badge>}
</Group>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ export default function GlobalShellHeader({
size="sm"
/>
<Link href={"/"}>
<GameNodeLogo className="ms-6 w-22 h-auto max-h-full" />
<GameNodeLogo
className="ms-6 w-22 h-auto max-h-full"
withBetaBadge={false}
/>
</Link>
<Group className="ms-auto">
{!userId && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
IconLogout,
IconHeart,
IconHeartFilled,
IconRefresh,
} from "@tabler/icons-react";
import { UserButton } from "@/components/general/input/UserButton/UserButton";
import Link from "next/link";
Expand Down Expand Up @@ -48,8 +49,7 @@ const links: NavbarItem[] = [
{ icon: IconUser, label: "Library", href: "/library" },
{ icon: IconCheckbox, label: "Achievements", href: "/achievements" },
{ icon: IconBulb, label: "Activity", href: "/activity" },
// It's disabled during beta, if you are reading this you're cheating :p
// { icon: IconRefresh, label: "Importer", href: "/importer" },
{ icon: IconRefresh, label: "Importer", href: "/importer" },
];

interface IGlobalShellNavbarProps extends BaseModalChildrenProps {
Expand Down

0 comments on commit 66d4f3c

Please sign in to comment.