Commit 676c246c authored by Ategon Dev's avatar Ategon Dev
Browse files

Merge branch canvas:main into main

parents d05a4124 24928c8b

packages/client/src/components/Chat/OpenChatButton.tsx

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ const OpenChatButton = () => { 
        config?.chat?.element_host && 

        <Button 

          onPress={doLogin}

          variant="ghost"

          variant="faded"

        >

          <FontAwesomeIcon icon={faComments} />

          <p>Chat</p>

packages/client/src/components/Header/HeaderLeft.tsx

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ export const HeaderLeft = () => { 
      <AccountStanding />

      <Button 

        onPress={() => setInfoSidebar(true)}

        variant="ghost"

        variant="faded"

      >

        <FontAwesomeIcon icon={faInfoCircle} />

        <p>Info</p>
@@ -21,7 +21,7 @@ export const HeaderLeft = () => { 
      {import.meta.env.DEV && (

        <Button 

          onPress={() => Debug.openDebugTools()}

          variant="ghost"

          variant="faded"

        >

          <FontAwesomeIcon icon={faTools} />

          <p>Debug Tools</p>

packages/client/src/components/Header/HeaderRight.tsx

+2 −2
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ export const HeaderRight = () => { 
      <div className="flex gap-2">

        <Button 

          onClick={() => setSettingsSidebar(true)}

          variant="ghost"

          variant="faded"

        >

          <FontAwesomeIcon icon={faGear} />

          <p>Settings</p>

        </Button>

        <ThemeSwitcher />

        {hasAdmin && (

          <Button href="/admin" target="_blank" as={Link}  variant="ghost" >

          <Button href="/admin" target="_blank" as={Link}  variant="faded" >

            <FontAwesomeIcon icon={faHammer} />

            <p>Admin</p>

          </Button>

packages/client/src/components/Header/ThemeSwitcher.tsx

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ export function ThemeSwitcher() { 
  if(!mounted) return null



  return (

    <Button onClick={() => { setToggle(!isToggled) }} variant="ghost">

    <Button onClick={() => { setToggle(!isToggled) }} variant="faded">

      <Classic toggled={isToggled} placeholder={undefined} />

      <p>{theme === 'dark' ? "Dark" : "Light"}</p>

    </Button>

packages/client/src/components/Header/User.tsx

+14 −14
Original line number Diff line number Diff line 
import { Card, User as UserElement } from "@nextui-org/react";

import { useAppContext } from "../../contexts/AppContext";



export const User = () => {

  const { user } = useAppContext();



  return user ? (

    <div className="user-card">

      <div className="user-card--overview">

        <div className="user-name">{user.user.username}</div>

        <div className="user-instance">{user.service.instance.hostname}</div>

      </div>

      {user.user.picture_url && (

        <img

          src={user.user.picture_url}

          alt="User Avatar"

          className="user-avatar"

    <Card>

      <UserElement

        name={user.user.username}

        description={user.service.instance.hostname}

        avatarProps={{

          showFallback: true,

          name: undefined,

          src: user.user.picture_url

        }}

        className="p-2"

      />

      )}

    </div>

    </Card>

  ) : (

    <></>

  );