Fix incosistencies in the custom commission types

This commit is contained in:
2026-02-01 23:21:35 +01:00
parent 145770afbe
commit d6695e4c1d
3 changed files with 145 additions and 114 deletions

View File

@ -42,6 +42,10 @@ export default async function CommissionsPage() {
<div className="mx-auto w-full max-w-6xl px-4 py-8 flex flex-col gap-8"> <div className="mx-auto w-full max-w-6xl px-4 py-8 flex flex-col gap-8">
<div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between"> <div className="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
<h1 className="text-3xl font-bold">Commission Pricing</h1> <h1 className="text-3xl font-bold">Commission Pricing</h1>
<div className="flex flex-wrap gap-3">
<Button asChild>
<a href="#commission-request-form">Get to the request form</a>
</Button>
{guidelines?.exampleImageUrl ? ( {guidelines?.exampleImageUrl ? (
<Dialog> <Dialog>
<DialogTrigger asChild> <DialogTrigger asChild>
@ -65,6 +69,7 @@ export default async function CommissionsPage() {
</Dialog> </Dialog>
) : null} ) : null}
</div> </div>
</div>
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6 items-start"> <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6 items-start">
{commissions.map((commission) => ( {commissions.map((commission) => (
<CommissionCard key={commission.id} commission={commission} /> <CommissionCard key={commission.id} commission={commission} />
@ -75,7 +80,9 @@ export default async function CommissionsPage() {
<CommissionGuidelines /> <CommissionGuidelines />
</div> </div>
<hr /> <hr />
<h2 className="text-2xl font-semibold">Request a Commission</h2> <h2 id="commission-request-form" className="text-2xl font-semibold scroll-mt-24">
Request a Commission
</h2>
<CommissionOrderForm types={commissions} customCards={customCards} /> <CommissionOrderForm types={commissions} customCards={customCards} />
</div> </div>
); );

View File

@ -8,6 +8,7 @@ import {
DialogTitle, DialogTitle,
DialogTrigger, DialogTrigger,
} from "@/components/ui/dialog"; } from "@/components/ui/dialog";
import { cn } from "@/lib/utils";
import Image from "next/image"; import Image from "next/image";
type CustomCardOption = { type CustomCardOption = {
@ -43,9 +44,17 @@ export function CommissionCustomCard({
}) { }) {
return ( return (
<div className="flex flex-col h-full"> <div className="flex flex-col h-full">
<Card className="flex flex-col flex-1 relative overflow-hidden border-2 border-primary/50 shadow-sm"> <div className="overflow-hidden h-full">
<Card
className={cn(
"flex flex-col h-full relative shadow-sm",
card.isSpecialOffer
? "border-2 border-primary/50"
: "border-border"
)}
>
{card.isSpecialOffer ? ( {card.isSpecialOffer ? (
<div className="pointer-events-none absolute right-0 top-0 z-10"> <div className="pointer-events-none absolute right-0 top-0 z-10 overflow-visible">
<div className="absolute right-0 top-16 h-7 w-36 origin-top-right translate-x-10 rotate-45 bg-primary text-primary-foreground shadow-md"> <div className="absolute right-0 top-16 h-7 w-36 origin-top-right translate-x-10 rotate-45 bg-primary text-primary-foreground shadow-md">
<span className="flex h-full w-full items-center justify-center text-xs font-semibold uppercase tracking-wide"> <span className="flex h-full w-full items-center justify-center text-xs font-semibold uppercase tracking-wide">
Special Special
@ -95,7 +104,7 @@ export function CommissionCustomCard({
) : null} ) : null}
</CardHeader> </CardHeader>
<CardContent className="flex flex-col justify-start gap-4"> <CardContent className="flex flex-1 flex-col justify-start gap-4">
<div> <div>
<h4 className="font-semibold">Options</h4> <h4 className="font-semibold">Options</h4>
<ul className="pl-4 list-disc"> <ul className="pl-4 list-disc">
@ -136,5 +145,6 @@ export function CommissionCustomCard({
</CardContent> </CardContent>
</Card> </Card>
</div> </div>
</div>
); );
} }

View File

@ -5,6 +5,7 @@ import { Button } from "@/components/ui/button";
import { import {
Form, Form,
FormControl, FormControl,
FormDescription,
FormField, FormField,
FormItem, FormItem,
FormLabel, FormLabel,
@ -13,10 +14,10 @@ import {
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import { Textarea } from "@/components/ui/textarea"; import { Textarea } from "@/components/ui/textarea";
import type { import type {
CommissionCustomInput,
CommissionCustomCard, CommissionCustomCard,
CommissionCustomCardExtra, CommissionCustomCardExtra,
CommissionCustomCardOption, CommissionCustomCardOption,
CommissionCustomInput,
CommissionExtra, CommissionExtra,
CommissionOption, CommissionOption,
CommissionType, CommissionType,
@ -319,8 +320,15 @@ export function CommissionOrderForm({ types, customCards }: Props) {
<FormItem> <FormItem>
<FormLabel>Your Name</FormLabel> <FormLabel>Your Name</FormLabel>
<FormControl> <FormControl>
<Input placeholder="Nickname, real name, how you want to be called..." {...field} disabled={isSubmitting} /> <Input
placeholder="Nickname, real name, how you want to be called..."
{...field}
disabled={isSubmitting}
/>
</FormControl> </FormControl>
<FormDescription>
This name will be visible on the commission status page.
</FormDescription>
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
)} )}
@ -339,6 +347,9 @@ export function CommissionOrderForm({ types, customCards }: Props) {
disabled={isSubmitting} disabled={isSubmitting}
/> />
</FormControl> </FormControl>
<FormDescription>
Will be used for sending the invoice via paypal
</FormDescription>
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
)} )}
@ -357,6 +368,9 @@ export function CommissionOrderForm({ types, customCards }: Props) {
disabled={isSubmitting} disabled={isSubmitting}
/> />
</FormControl> </FormControl>
<FormDescription>
Optional. But if filled out, we need handle and which platform. Currently supported are fediverse, bsky and telegram
</FormDescription>
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
)} )}