Skip to content

Commit

Permalink
Merge pull request #2 from devnoot/replace-vaul-with-dialog
Browse files Browse the repository at this point in the history
Replace vaul with dialog
  • Loading branch information
devnoot authored May 18, 2024
2 parents 23e9a58 + e884774 commit d0d77fd
Show file tree
Hide file tree
Showing 10 changed files with 343 additions and 571 deletions.
9 changes: 8 additions & 1 deletion app/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { Button } from './components/ui/button'
// import { UserSettingsDrawer } from './components/user-settings-menu'
import { File, ModType, getRandomWad } from './lib/idgames'
import { cn } from './lib/utils'
import { ModDialog } from './components/mod-dialog'

const DoomRouletteBrandImage = () => (
<img
Expand Down Expand Up @@ -70,12 +71,18 @@ export const App = () => {
className='my-8'
/>
<RollTheDiceButton className='mb-3' />
<ModDrawer
<ModDialog
mod={mod}
isOpen={modDrawerIsOpen}
onOpenChange={setModDrawerIsOpen}
onClose={() => setMod(undefined)}
/>
{/* <ModDrawer
mod={mod}
isOpen={modDrawerIsOpen}
onOpenChange={setModDrawerIsOpen}
onClose={() => setMod(undefined)}
/> */}
{/* <UserSettingsDrawer /> */}
</Layout>
</ThemeProvider>
Expand Down
97 changes: 97 additions & 0 deletions app/components/mod-dialog.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
import { MouseEventHandler } from 'react';
import {
Dialog,
DialogContent,
DialogHeader,
DialogTitle
} from '../components/ui/dialog';
import { Rating } from './ui/rating';
import { cn } from '../lib/utils';
import { Button } from './ui/button';
import { File } from '../lib/idgames'
import CountUp from 'react-countup'

export type ModDialogProps = {
isOpen: boolean
onOpenChange: (open: boolean) => void
onClose: MouseEventHandler<HTMLButtonElement>
mod: File
}


export const ModDialog = ({
isOpen,
onOpenChange,
onClose,
mod
}: ModDialogProps) => {

const onDownloadClick = (mod: File) => {
const a = document.createElement('a')
const mirror = `https://youfailit.net/pub/`
const downloadURL = `${mirror}/idgames/${mod.idgamesurl.replace('idgames://', '')}`
a.href = downloadURL
a.style.display = 'none'
a.click()
}

const onIdGamesButtonClick = (mod: File) => {
const a = document.createElement('a')
a.href = mod.url
a.target = "_blank"
a.style.display = 'none'
a.click()
}

return (
<Dialog open={isOpen} onOpenChange={onOpenChange}>
<DialogContent>
<DialogHeader>
<DialogTitle>
<p>
<strong>{mod?.title}</strong>{mod?.author && " by " + mod?.author}
</p>
</DialogTitle>
</DialogHeader>

<div className={cn('flex', 'justify-between', 'mb-2', 'items-center')}>
<p className={cn('flex', 'flex-col', "font-['Kode_Mono']")}>
<span className="text-lg">{mod?.votes.toString() === '0' ? 'No' : <CountUp start={0} end={+mod?.votes} />}</span>
<span>votes</span>
</p>
<div>
<Rating rating={+mod?.rating} />
</div>
</div>

<div>

<div className={cn("max-h-[420px]", 'border', 'rounded', 'overflow-y-scroll', 'mb-5', 'p-3', 'min-h-32')}>
<p>
{mod?.description
? mod?.description
: 'No description available for this mod'}
</p>
</div>

<Button
className={cn(
'h-16',
'w-full',
'bg-amber-600',
'text-white',
'hover:bg-amber-400',
'cursor-pointer'
)}
onClick={() => onDownloadClick(mod)}
>
Download Mod
</Button>

<Button className={cn('w-full')} size="sm" variant="link" onClick={() => onIdGamesButtonClick(mod)}>Check it out on the igames archive</Button>
</div>
</DialogContent>

</Dialog>
);
};
86 changes: 0 additions & 86 deletions app/components/mod-drawer.tsx

This file was deleted.

120 changes: 120 additions & 0 deletions app/components/ui/dialog.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
import * as React from "react"
import * as DialogPrimitive from "@radix-ui/react-dialog"
import { X } from "lucide-react"

import { cn } from "../../lib/utils"

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 bg-background 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",
className
)}
{...props}
>
{children}
<DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
<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-muted-foreground", className)}
{...props}
/>
))
DialogDescription.displayName = DialogPrimitive.Description.displayName

export {
Dialog,
DialogPortal,
DialogOverlay,
DialogClose,
DialogTrigger,
DialogContent,
DialogHeader,
DialogFooter,
DialogTitle,
DialogDescription,
}
Loading

0 comments on commit d0d77fd

Please sign in to comment.