adds user accounts, service requests, dashboard, admin panel, better layout, db+altcha+auth support

This commit is contained in:
Aidan 2025-07-07 20:01:59 -04:00
parent dfbc3cade9
commit 0043a5bf3c
40 changed files with 3981 additions and 188 deletions

View file

@ -0,0 +1,57 @@
"use client"
import { useEffect, useRef, useState, forwardRef, useImperativeHandle } from 'react'
interface AltchaProps {
onStateChange?: (ev: Event | CustomEvent) => void
}
const Altcha = forwardRef<{ value: string | null }, AltchaProps>(({ onStateChange }, ref) => {
const widgetRef = useRef<AltchaWidget & AltchaWidgetMethods & HTMLElement>(null)
const [value, setValue] = useState<string | null>(null)
useEffect(() => {
import('altcha')
}, [])
useImperativeHandle(ref, () => {
return {
get value() {
return value
}
}
}, [value])
useEffect(() => {
const handleStateChange = (ev: Event | CustomEvent) => {
if ('detail' in ev) {
setValue(ev.detail.payload || null)
onStateChange?.(ev)
}
}
const { current } = widgetRef
if (current) {
current.addEventListener('statechange', handleStateChange)
return () => current.removeEventListener('statechange', handleStateChange)
}
}, [onStateChange])
return (
<altcha-widget
challengeurl="/api/captcha"
ref={widgetRef}
style={{
'--altcha-max-width': '100%',
}}
debug={process.env.NODE_ENV === "development"}
aria-label="Security check"
aria-describedby="altcha-description"
></altcha-widget>
)
})
Altcha.displayName = 'Altcha'
export default Altcha

View file

@ -1,6 +1,36 @@
"use client"
import Link from "next/link";
import { authClient } from "@/util/auth-client";
import { useRouter } from "next/navigation";
interface ExtendedUser {
id: string;
name: string;
email: string;
emailVerified: boolean;
createdAt: Date;
updatedAt: Date;
image?: string | null;
role?: string;
}
export function Nav() {
const { data: session, isPending } = authClient.useSession();
const router = useRouter();
const handleSignOut = async () => {
try {
await fetch("/api/logout", {
method: "POST",
});
await authClient.signOut();
router.refresh();
} catch (error) {
console.error("Sign out error:", error);
}
};
return (
<div className="flex flex-col sm:flex-row items-center justify-between px-4 sm:px-5 py-3 gap-3 sm:gap-0">
<Link href="/">
@ -13,6 +43,31 @@ export function Nav() {
<Link href="/about" className="hover:underline">About</Link>
<Link href="/servers" className="hover:underline">Servers</Link>
<Link href="/services" className="hover:underline">Services</Link>
{isPending ? (
<div className="text-gray-500">Loading...</div>
) : session ? (
<div className="flex items-center gap-3">
<Link href="/dashboard" className="hover:underline">Dashboard</Link>
<Link href="/requests" className="hover:underline">Requests</Link>
{(session.user as ExtendedUser).role === 'admin' && (
<Link href="/admin" className="hover:underline text-red-500">Admin</Link>
)}
<span className="text-foreground-muted-light ml-6">Hi, <span className="font-bold text-foreground">{session.user.name || session.user.email}</span></span>
<button
onClick={handleSignOut}
className="text-red-400 hover:underline cursor-pointer"
>
Sign Out
</button>
</div>
) : (
<div className="flex items-center gap-3">
<Link href="/login" className="hover:underline">Login</Link>
<Link href="/signup" className="bg-blue-400 text-white px-3 py-1 rounded-md hover:bg-blue-500">
Sign Up
</Link>
</div>
)}
</div>
</div>
);

View file

@ -1,7 +1,33 @@
"use client"
import Link from "next/link";
import { Nav } from "../core/nav";
import { services } from "@/config/services";
import { TbArrowLeft, TbEye, TbLink, TbShieldLock } from "react-icons/tb";
import { TbArrowLeft, TbEye, TbLink, TbShieldLock, TbSend, TbExternalLink, TbLogin } from "react-icons/tb";
import { authClient } from "@/util/auth-client";
import { useEffect, useState } from "react";
import Altcha from "../core/altcha";
interface UserService {
serviceId: string;
serviceName: string;
serviceDescription: string;
priceStatus: string;
joinLink?: string;
grantedAt: string | null;
isOpen: boolean;
}
interface ServiceRequest {
id: string;
reason: string;
status: 'pending' | 'approved' | 'denied';
adminNotes?: string;
reviewedAt?: string;
createdAt: string;
serviceName: string;
serviceDescription: string;
}
function HumanPriceStatus(priceStatus: "open" | "invite-only" | "by-request") {
switch (priceStatus) {
@ -25,6 +51,20 @@ function HumanPriceStatusColor(priceStatus: "open" | "invite-only" | "by-request
}
}
function getUserAccessStatusColor(hasAccess: boolean, requestStatus?: string) {
if (hasAccess) return "bg-green-500";
if (requestStatus === 'pending') return "bg-yellow-500";
if (requestStatus === 'denied') return "bg-red-500";
return "bg-gray-500";
}
function getUserAccessStatusText(hasAccess: boolean, requestStatus?: string) {
if (hasAccess) return "You Have Access";
if (requestStatus === 'pending') return "Request Pending";
if (requestStatus === 'denied') return "Request Denied";
return "No Access";
}
function PriceStatusDesc(priceStatus: "open" | "invite-only" | "by-request", serviceName: string) {
switch (priceStatus) {
case "open":
@ -36,10 +76,171 @@ function PriceStatusDesc(priceStatus: "open" | "invite-only" | "by-request", ser
}
}
function getServiceButtonContent(
service: { name: string; priceStatus: string; joinLink?: string } | undefined,
session: { user: { id: string; email: string } } | null,
hasAccess: boolean,
joinLink: string | undefined,
serviceRequest: ServiceRequest | undefined,
setShowRequestForm: (show: boolean) => void
) {
const isLoggedIn = !!session;
if (isLoggedIn && hasAccess && joinLink) {
return (
<Link href={joinLink} target="_blank" rel="noopener noreferrer">
<button className="flex flex-row items-center justify-center gap-1 text-white bg-green-600 px-3 py-1.5 rounded-lg text-sm hover:bg-green-700 transition-all duration-300 cursor-pointer">
<TbExternalLink size={14} />
Open
</button>
</Link>
);
}
if (isLoggedIn && !hasAccess && (service?.priceStatus === 'by-request' || service?.priceStatus === 'invite-only')) {
if (service?.priceStatus === 'by-request' && !serviceRequest) {
return (
<button
onClick={() => setShowRequestForm(true)}
className="flex flex-row items-center justify-center gap-1 text-white bg-blue-600 px-3 py-1.5 rounded-lg text-sm hover:bg-blue-700 transition-all duration-300 cursor-pointer"
>
<TbSend size={14} />
Request
</button>
);
} else {
return (
<Link href="/requests">
<button className="flex flex-row items-center justify-center gap-1 text-white bg-blue-600 px-3 py-1.5 rounded-lg text-sm hover:bg-blue-700 transition-all duration-300 cursor-pointer">
<TbSend size={14} />
Request
</button>
</Link>
);
}
}
if (isLoggedIn && service?.priceStatus === 'open' && joinLink) {
return (
<Link href={joinLink} target="_blank" rel="noopener noreferrer">
<button className="flex flex-row items-center justify-center gap-1 text-white bg-green-600 px-3 py-1.5 rounded-lg text-sm hover:bg-green-700 transition-all duration-300 cursor-pointer">
<TbExternalLink size={14} />
Join
</button>
</Link>
);
}
if (!isLoggedIn && service?.priceStatus === 'open' && joinLink) {
return (
<Link href={joinLink} target="_blank" rel="noopener noreferrer">
<button className="flex flex-row items-center justify-center gap-1 text-white bg-green-600 px-3 py-1.5 rounded-lg text-sm hover:bg-green-700 transition-all duration-300 cursor-pointer">
<TbExternalLink size={14} />
Join
</button>
</Link>
);
}
if (!isLoggedIn && (service?.priceStatus === 'invite-only' || service?.priceStatus === 'by-request')) {
return (
<Link href="/login">
<button className="flex flex-row items-center justify-center gap-1 text-white bg-blue-600 px-3 py-1.5 rounded-lg text-sm hover:bg-blue-700 transition-all duration-300 cursor-pointer">
<TbLogin size={14} />
Login
</button>
</Link>
);
}
return null;
}
export function ServicesShell({ slug }: { slug: string }) {
const { data: session, isPending } = authClient.useSession();
const [userAccess, setUserAccess] = useState<UserService[]>([]);
const [userRequests, setUserRequests] = useState<ServiceRequest[]>([]);
const [, setLoading] = useState(true);
const [showRequestForm, setShowRequestForm] = useState(false);
const [requestReason, setRequestReason] = useState("");
const [captchaToken, setCaptchaToken] = useState("");
const [submitting, setSubmitting] = useState(false);
const service = services.find((service) => service.name === slug);
const Icon = service?.icon;
useEffect(() => {
if (session) {
fetchUserData();
} else if (!isPending) {
setLoading(false);
}
}, [session, isPending]);
const fetchUserData = async () => {
try {
const [accessResponse, requestsResponse] = await Promise.all([
fetch("/api/user-services"),
fetch("/api/service-requests")
]);
if (accessResponse.ok) {
const accessData = await accessResponse.json();
setUserAccess(accessData.services);
}
if (requestsResponse.ok) {
const requestsData = await requestsResponse.json();
setUserRequests(requestsData.requests);
}
} catch (error) {
console.error("Error fetching user data:", error);
} finally {
setLoading(false);
}
};
const submitRequest = async () => {
if (!requestReason.trim() || !captchaToken) return;
setSubmitting(true);
try {
const response = await fetch("/api/service-requests", {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
serviceId: service?.name,
reason: requestReason,
captchaToken
}),
});
if (response.ok) {
setShowRequestForm(false);
setRequestReason("");
setCaptchaToken("");
fetchUserData();
} else {
const error = await response.json();
console.error("Request failed:", error.error);
}
} catch (error) {
console.error("Error submitting request:", error);
} finally {
setSubmitting(false);
}
};
const hasAccess = userAccess.some(access => access.serviceName === service?.name);
const userService = userAccess.find(access => access.serviceName === service?.name);
const isOpen = userService?.isOpen || false;
const serviceRequest = userRequests.find(request => request.serviceName === service?.name);
const joinLink = hasAccess
? userAccess.find(access => access.serviceName === service?.name)?.joinLink || service?.joinLink
: service?.joinLink;
return (
<main>
<Nav />
@ -61,23 +262,86 @@ export function ServicesShell({ slug }: { slug: string }) {
</Link>
</div>
<div className="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-4 gap-4 px-4 sm:px-8 lg:px-14">
<div className={`flex flex-col justify-between gap-4 rounded-2xl px-6 sm:px-8 py-4 ${HumanPriceStatusColor(service?.priceStatus as "open" | "invite-only" | "by-request")}`}>
<div className={`flex flex-col justify-between gap-4 rounded-2xl px-6 sm:px-8 py-4 ${
session ? getUserAccessStatusColor(hasAccess, serviceRequest?.status) : HumanPriceStatusColor(service?.priceStatus as "open" | "invite-only" | "by-request")
}`}>
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-2 w-full my-2">
<h2 className="text-xl sm:text-2xl font-semibold text-white">
{HumanPriceStatus(service?.priceStatus as "open" | "invite-only" | "by-request")}
{session ? getUserAccessStatusText(hasAccess, serviceRequest?.status) : HumanPriceStatus(service?.priceStatus as "open" | "invite-only" | "by-request")}
</h2>
{service?.joinLink && (
<Link href={service.joinLink}>
<button className="flex flex-row items-center justify-center gap-2 text-white bg-green-600 px-4 py-2 rounded-full hover:underline transition-all duration-300 cursor-pointer w-full sm:w-auto">
Join!
</button>
</Link>
{getServiceButtonContent(service, session, hasAccess, joinLink, serviceRequest, setShowRequestForm)}
</div>
<div className="text-sm sm:text-base text-white mb-3">
{session ? (
hasAccess ? (
<div>
<p>You have access to {service?.name}! Click the button above to get started.</p>
{isOpen && (
<p className="mt-2 text-xs opacity-80">
Open service: {service?.quickLinks && service.quickLinks.length > 0 ? "Create an account to get started" : "Available for public registration"}
</p>
)}
</div>
) : serviceRequest ? (
<div>
<p>Request Status: <strong>{serviceRequest.status}</strong></p>
{serviceRequest.adminNotes && (
<p className="mt-2">Admin Notes: {serviceRequest.adminNotes}</p>
)}
<p className="mt-2 text-xs">
Submitted: {new Date(serviceRequest.createdAt).toLocaleDateString()}
</p>
</div>
) : (
<p>{PriceStatusDesc(service?.priceStatus as "open" | "invite-only" | "by-request", service?.name as string)}</p>
)
) : (
<p>{PriceStatusDesc(service?.priceStatus as "open" | "invite-only" | "by-request", service?.name as string)} Please sign in to check your access status.</p>
)}
</div>
<p className="text-sm sm:text-base text-white mb-3">
{PriceStatusDesc(service?.priceStatus as "open" | "invite-only" | "by-request", service?.name as string)}
</p>
</div>
{showRequestForm && (
<div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50 p-4">
<div className="bg-white dark:bg-gray-800 rounded-xl p-6 w-full max-w-md">
<h3 className="text-lg font-semibold mb-4">Request Access to {service?.name}</h3>
<div className="space-y-4">
<div>
<label className="block text-sm font-medium mb-2">Reason for Request</label>
<textarea
value={requestReason}
onChange={(e) => setRequestReason(e.target.value)}
className="w-full p-3 border border-gray-300 dark:border-gray-600 rounded-lg dark:bg-gray-700"
rows={3}
placeholder="Please explain why you need access to this service..."
/>
</div>
<div>
<label className="block text-sm font-medium mb-2">Verify you&apos;re human</label>
<Altcha onStateChange={(ev) => {
if ('detail' in ev) {
setCaptchaToken(ev.detail.payload || "");
}
}} />
</div>
<div className="flex gap-3">
<button
onClick={submitRequest}
disabled={!requestReason.trim() || !captchaToken || submitting}
className="flex-1 bg-blue-500 text-white px-4 py-2 rounded-lg hover:bg-blue-600 disabled:bg-gray-400 transition-colors"
>
{submitting ? "Submitting..." : "Submit Request"}
</button>
<button
onClick={() => setShowRequestForm(false)}
className="flex-1 bg-gray-500 text-white px-4 py-2 rounded-lg hover:bg-gray-600 transition-colors"
>
Cancel
</button>
</div>
</div>
</div>
</div>
)}
<div className={`flex flex-col justify-between gap-4 rounded-2xl px-6 sm:px-8 py-4 bg-gray-200`}>
<div className="flex flex-row items-center gap-2 w-full my-2">
<h2 className="flex flex-row items-center gap-2 text-xl sm:text-2xl font-semibold text-black">
@ -128,7 +392,7 @@ export function ServicesShell({ slug }: { slug: string }) {
</h2>
</div>
<ul className="list-disc list-inside text-sm sm:text-base text-black">
{service.quickLinks.map((link, index) => (
{service?.quickLinks?.map((link, index) => (
<Link href={link.url} key={index}>
<button className="flex flex-row items-center gap-2 text-black hover:underline transition-all duration-300 cursor-pointer">
<link.icon size={16} /> {link.name}