Skip to content

Commit

Permalink
feat: put 'new proposal' form in a modal (#230)
Browse files Browse the repository at this point in the history
  • Loading branch information
helmturner authored Apr 27, 2024
1 parent eb740e8 commit 269012b
Show file tree
Hide file tree
Showing 6 changed files with 218 additions and 45 deletions.
37 changes: 37 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"@astrojs/react": "3.3.1",
"@astrojs/tailwind": "5.1.0",
"@radix-ui/react-avatar": "^1.0.4",
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-label": "^2.0.2",
"@radix-ui/react-radio-group": "^1.1.3",
"@radix-ui/react-select": "^2.0.0",
Expand Down
7 changes: 5 additions & 2 deletions src/components/ProposalForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
CardHeader,
CardContent,
Card,
CardFooter,
} from './ui/card.tsx';
import { Label } from './ui/label.tsx';
import { Input } from './ui/input.tsx';
Expand All @@ -34,6 +35,8 @@ export type Proposal = {
type: 'topic' | 'project';
};

// TODO: Replace `card` components with `dialogue` components

export default function ProposalForm() {
const [isDraft, setIsDraft] = useState(false);

Expand Down Expand Up @@ -172,7 +175,7 @@ export default function ProposalForm() {
maxLength={200}
/>
</div>
<div className="flex justify-end">
<CardFooter className="flex justify-end p-2">
<Button
className="mr-2"
type="submit"
Expand All @@ -190,7 +193,7 @@ export default function ProposalForm() {
>
Submit Proposal
</Button>
</div>
</CardFooter>
</form>
</CardContent>
</Card>
Expand Down
93 changes: 52 additions & 41 deletions src/components/ProposalsPagenatedList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* @see https://v0.dev/t/G5YG5bM9kDB
* Documentation: https://v0.dev/docs#integrating-generated-code-into-your-nextjs-app
*/
import React from 'react';
import { Button } from './ui/button.tsx';
import { ProposalVoteCard } from './ProposalVoteCard.tsx';
import {
Expand All @@ -16,6 +15,9 @@ import {
Pagination,
} from './ui/pagination.tsx';

import { Dialog, DialogContent, DialogTrigger } from './ui/dialog.tsx';
import ProposalForm from './ProposalForm.tsx';

export type Proposal = {
status: 'draft' | 'rfc' | 'open' | 'closed';
id: string;
Expand All @@ -41,56 +43,65 @@ export default function VoteList(props: VoteListProps) {
return (
<div
key="1"
className="flex flex-col w-full max-w-2xl mx-auto p-6 bg-white rounded-lg shadow-md dark:bg-gray-800"
className="flex flex-col w-full min-h-screen max-w-2xl mx-auto p-6 bg-white rounded-lg shadow-md dark:bg-gray-800"
>
<div className="flex items-center justify-between mb-6">
<h2 className="text-2xl font-bold dark:text-gray-200">
Vote on Proposals
</h2>
<Button size="sm" variant="outline">
Add Proposal
</Button>
</div>
<div className="space-y-4">
{props.proposals.map((proposal) => (
<ProposalVoteCard
key={proposal.id}
title={proposal.title}
description={proposal.summary}
created={proposal.created}
author="John Doe"
/>
))}
<Dialog modal>
<DialogTrigger asChild>
<Button size="sm" variant="outline">
Add Proposal
</Button>
</DialogTrigger>
<DialogContent className="max-w-max min-w-min max-h-[90%] overflow-scroll p-0 mx-0 my-0">
<ProposalForm />
</DialogContent>
</Dialog>
</div>
<div className="flex items-center justify-between mt-6">
<Pagination>
<PaginationContent>
{props.hasPreviousPage && (
<div className="flex flex-grow flex-shrink-0 flex-col justify-between">
<div className="space-y-4">
{props.proposals.map((proposal) => (
<ProposalVoteCard
key={proposal.id}
title={proposal.title}
description={proposal.summary}
created={proposal.created}
author="John Doe"
/>
))}
</div>
<div className="flex items-center justify-between mt-6">
<Pagination>
<PaginationContent>
{props.hasPreviousPage && (
<PaginationItem>
<PaginationPrevious href="#" />
</PaginationItem>
)}
<PaginationItem>
<PaginationLink href="#">1</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationLink href="#" isActive>
2
</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationPrevious href="#" />
<PaginationLink href="#">3</PaginationLink>
</PaginationItem>
)}
<PaginationItem>
<PaginationLink href="#">1</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationLink href="#" isActive>
2
</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationLink href="#">3</PaginationLink>
</PaginationItem>
<PaginationItem>
<PaginationEllipsis />
</PaginationItem>
{props.hasNextPage && (
<PaginationItem>
<PaginationNext href="#" />
<PaginationEllipsis />
</PaginationItem>
)}
</PaginationContent>
</Pagination>
{props.hasNextPage && (
<PaginationItem>
<PaginationNext href="#" />
</PaginationItem>
)}
</PaginationContent>
</Pagination>
</div>
</div>
</div>
);
Expand Down
121 changes: 121 additions & 0 deletions src/components/ui/dialog.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
/* eslint-disable -- Generated Component */
import * as React from 'react';
import * as DialogPrimitive from '@radix-ui/react-dialog';
import { X } from 'lucide-react';

import { cn } from '../../utils.ts';

const Dialog = DialogPrimitive.Root;

const DialogTrigger = DialogPrimitive.Trigger;

const DialogPortal = DialogPrimitive.Portal;

const DialogClose = DialogPrimitive.Close;

const DialogOverlay = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Overlay>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
>(({ className, ...props }, ref) => (
<DialogPrimitive.Overlay
ref={ref}
className={cn(
'fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
className,
)}
{...props}
/>
));
DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;

const DialogContent = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
>(({ className, children, ...props }, ref) => (
<DialogPortal>
<DialogOverlay />
<DialogPrimitive.Content
ref={ref}
className={cn(
'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border border-neutral-200 bg-white p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg dark:border-neutral-800 dark:bg-neutral-950',
className,
)}
{...props}
>
{children}
<DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-white transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-neutral-950 focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-neutral-100 data-[state=open]:text-neutral-500 dark:ring-offset-neutral-950 dark:focus:ring-neutral-300 dark:data-[state=open]:bg-neutral-800 dark:data-[state=open]:text-neutral-400">
<X className="h-4 w-4" />
<span className="sr-only">Close</span>
</DialogPrimitive.Close>
</DialogPrimitive.Content>
</DialogPortal>
));
DialogContent.displayName = DialogPrimitive.Content.displayName;

const DialogHeader = ({
className,
...props
}: React.HTMLAttributes<HTMLDivElement>) => (
<div
className={cn(
'flex flex-col space-y-1.5 text-center sm:text-left',
className,
)}
{...props}
/>
);
DialogHeader.displayName = 'DialogHeader';

const DialogFooter = ({
className,
...props
}: React.HTMLAttributes<HTMLDivElement>) => (
<div
className={cn(
'flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2',
className,
)}
{...props}
/>
);
DialogFooter.displayName = 'DialogFooter';

const DialogTitle = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Title>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
>(({ className, ...props }, ref) => (
<DialogPrimitive.Title
ref={ref}
className={cn(
'text-lg font-semibold leading-none tracking-tight',
className,
)}
{...props}
/>
));
DialogTitle.displayName = DialogPrimitive.Title.displayName;

const DialogDescription = React.forwardRef<
React.ElementRef<typeof DialogPrimitive.Description>,
React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
>(({ className, ...props }, ref) => (
<DialogPrimitive.Description
ref={ref}
className={cn('text-sm text-neutral-500 dark:text-neutral-400', className)}
{...props}
/>
));
DialogDescription.displayName = DialogPrimitive.Description.displayName;

export {
Dialog,
DialogPortal,
DialogOverlay,
DialogClose,
DialogTrigger,
DialogContent,
DialogHeader,
DialogFooter,
DialogTitle,
DialogDescription,
};
4 changes: 2 additions & 2 deletions src/pages/proposals.astro
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
import Layout from '../layouts/Layout.astro';
import VoteList from '../components/ProposalsPagenatedList.tsx';
import ProposeForm from '../components/ProposalForm.tsx';
---

<script>
Expand Down Expand Up @@ -49,6 +48,8 @@ import ProposeForm from '../components/ProposalForm.tsx';
<Layout title="Tulsa Web Devs">
<main class="grid w-screen h-screen bg-white text-4xl place-items-center">
<VoteList
hasNextPage={false}
hasPreviousPage={false}
client:load
proposals={[
{
Expand All @@ -74,5 +75,4 @@ import ProposeForm from '../components/ProposalForm.tsx';
]}
/>
</main>
<ProposeForm client:load/>
</Layout>

0 comments on commit 269012b

Please sign in to comment.