diff --git a/client/app/(auth)/components/index.tsx b/client/app/(auth)/components/index.tsx
index 0aab279f..a00c7854 100644
--- a/client/app/(auth)/components/index.tsx
+++ b/client/app/(auth)/components/index.tsx
@@ -3,9 +3,11 @@
import { useState } from "react"
import styles from "./auth.module.css"
import Link from "../../components/link"
-import { Button, Input, Note } from "@geist-ui/core/dist"
import { signIn } from "next-auth/react"
import { Github as GithubIcon } from "@geist-ui/icons"
+import Input from "@components/input"
+import Button from "@components/button"
+import Note from "@components/note"
const Auth = ({
page,
@@ -50,7 +52,7 @@ const Auth = ({
{/* sign in with github */}
{requiresServerPassword && (
@@ -62,11 +64,13 @@ const Auth = ({
/>
)}
}
+ style={{
+ color: 'var(--fg)'
+ }}
+ iconLeft={}
onClick={(e) => {
e.preventDefault()
signIn("github", {
diff --git a/client/app/components/button/index.tsx b/client/app/components/button/index.tsx
index 786beb91..f0a50d1b 100644
--- a/client/app/components/button/index.tsx
+++ b/client/app/components/button/index.tsx
@@ -1,5 +1,6 @@
import styles from "./button.module.css"
import { forwardRef, Ref } from "react"
+import clsx from "clsx"
type Props = React.HTMLProps & {
children?: React.ReactNode
@@ -44,17 +45,15 @@ const Button = forwardRef(
{...props}
>
{children && iconLeft && (
-
- {iconLeft}
-
+ {iconLeft}
)}
{children ? (
children
) : (
- {iconLeft || iconRight}
+ {iconLeft || iconRight}
)}
{children && iconRight && (
-
+
{iconRight}
)}
diff --git a/client/app/components/header/header.module.css b/client/app/components/header/header.module.css
index eca83145..87c94290 100644
--- a/client/app/components/header/header.module.css
+++ b/client/app/components/header/header.module.css
@@ -76,3 +76,8 @@
justify-content: space-between;
align-items: center;
}
+
+.active a,
+.active button {
+ color: var(--fg);
+}
diff --git a/client/app/components/header/index.tsx b/client/app/components/header/index.tsx
index ccfb81db..ffb0bab7 100644
--- a/client/app/components/header/index.tsx
+++ b/client/app/components/header/index.tsx
@@ -22,6 +22,7 @@ import { usePathname } from "next/navigation"
import { signOut } from "next-auth/react"
import { useTheme } from "@components/theme/ThemeClientContextProvider"
import Button from "@components/button"
+import clsx from "clsx"
type Tab = {
name: string
@@ -101,7 +102,9 @@ const Header = ({ signedIn = false, isAdmin = false }) => {
name: "Sign Out",
icon: ,
value: "signout",
- onClick: () => signOut()
+ onClick: () => signOut({
+ callbackUrl: "/",
+ })
},
...defaultPages
]
@@ -148,7 +151,7 @@ const Header = ({ signedIn = false, isAdmin = false }) => {
key={tab.value}
iconLeft={tab.icon}
onClick={() => onTabChange(tab.value)}
- className={`${styles.tab} ${activeStyle}`}
+ className={clsx(styles.tab, activeStyle)}
aria-label={tab.name}
aria-current={isActive ? "page" : undefined}
>
@@ -160,7 +163,7 @@ const Header = ({ signedIn = false, isAdmin = false }) => {
diff --git a/client/app/components/input/index.tsx b/client/app/components/input/index.tsx
index 8c6d3504..0c3faed7 100644
--- a/client/app/components/input/index.tsx
+++ b/client/app/components/input/index.tsx
@@ -31,7 +31,7 @@ const Input = React.forwardRef(