{hasState
? <>
- {user === undefined &&
+ {session?.user === undefined &&
<>Loading ...}
- {user !== undefined && user !== null && <>
-
{user?.emailAddresses[0].emailAddress}
+ {session?.user.email && <>
+
{session.user.email}
signOut()}
className={LINK_STYLE}
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
new file mode 100644
index 00000000..d2589fc8
--- /dev/null
+++ b/src/components/Footer.tsx
@@ -0,0 +1,38 @@
+'use client';
+
+import { cc } from '@/utility/css';
+import SiteGrid from './SiteGrid';
+import ThemeSwitcher from '@/site/ThemeSwitcher';
+import { signOut } from 'next-auth/react';
+import Link from 'next/link';
+
+export default function Footer() {
+ return (
+
+
+
+ Admin
+
+
signOut()}
+ >
+ Sign out
+
+
}
+ />
+ );
+}
diff --git a/src/components/LoginButton.tsx b/src/components/LoginButton.tsx
new file mode 100644
index 00000000..4cc2c12f
--- /dev/null
+++ b/src/components/LoginButton.tsx
@@ -0,0 +1,14 @@
+'use client';
+
+import { signIn } from 'next-auth/react';
+
+export default function LoginButton() {
+ return (
+
signIn('github', { callbackUrl: '/' })}
+ >
+ Sign in
+
+ );
+}
\ No newline at end of file
diff --git a/src/middleware.ts b/src/middleware.ts
index d72cc397..4596922f 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -1,29 +1,5 @@
-import { authMiddleware, redirectToSignIn } from '@clerk/nextjs';
-import { NextResponse } from 'next/server';
-
-export default authMiddleware({
- afterAuth: (auth, req) => {
- if (!(
- auth.isPublicRoute ||
- auth.userId === process.env.CLERK_ADMIN_USER_ID
- )) {
- return redirectToSignIn({ returnBackUrl: req.url });
- } else {
- if (req.nextUrl.pathname === '/admin') {
- return NextResponse.redirect(new URL('/admin/photos', req.url));
- }
- }
- },
- publicRoutes: [
- '/',
- '/grid',
- '/photos/:photoId',
- '/photos/:photoId/share',
- '/photos/:photoId/image',
- '/deploy-image',
- ],
-});
+export { auth as middleware } from './auth';
export const config = {
- matcher: ['/((?!.*\\..*|_next).*)'],
+ matcher: ['/((?!api|_next/static|_next/image|favicon.ico).*)'],
};
diff --git a/src/site/globals.css b/src/site/globals.css
index 4026a3c5..d9259139 100644
--- a/src/site/globals.css
+++ b/src/site/globals.css
@@ -49,6 +49,7 @@
}
button, .button {
@apply
+ cursor-pointer
inline-flex gap-2 items-center
px-4
text-base