Browse Source

chore: format

imwald
codytseng 11 months ago
parent
commit
ccbce0e317
  1. 5
      index.html
  2. 19
      src/components/PostEditor/NormalPostContent.tsx
  3. 357
      src/components/ui/carousel.tsx
  4. 12
      src/components/ui/tabs.tsx
  5. 5
      tailwind.config.js

5
index.html

@ -5,7 +5,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
<title>Jumble</title> <title>Jumble</title>
<meta name="description" content="A user-friendly Nostr client focused on relay feed browsing and relay discovery" /> <meta
name="description"
content="A user-friendly Nostr client focused on relay feed browsing and relay discovery"
/>
<meta <meta
name="keywords" name="keywords"
content="jumble, nostr, web, client, relay, feed, social, pwa, simple, clean" content="jumble, nostr, web, client, relay, feed, social, pwa, simple, clean"

19
src/components/PostEditor/NormalPostContent.tsx

@ -1,4 +1,6 @@
import Note from '@/components/Note'
import { Button } from '@/components/ui/button' import { Button } from '@/components/ui/button'
import { ScrollArea } from '@/components/ui/scroll-area'
import { useToast } from '@/hooks/use-toast' import { useToast } from '@/hooks/use-toast'
import { createCommentDraftEvent, createShortTextNoteDraftEvent } from '@/lib/draft-event' import { createCommentDraftEvent, createShortTextNoteDraftEvent } from '@/lib/draft-event'
import { useNostr } from '@/providers/NostrProvider' import { useNostr } from '@/providers/NostrProvider'
@ -14,9 +16,6 @@ import Preview from './Preview'
import SendOnlyToSwitch from './SendOnlyToSwitch' import SendOnlyToSwitch from './SendOnlyToSwitch'
import Uploader from './Uploader' import Uploader from './Uploader'
import { preprocessContent } from './utils' import { preprocessContent } from './utils'
import Note from '@/components/Note'
import { ScrollArea } from "@/components/ui/scroll-area"
export default function NormalPostContent({ export default function NormalPostContent({
defaultContent = '', defaultContent = '',
@ -117,13 +116,13 @@ export default function NormalPostContent({
return ( return (
<div className="space-y-4"> <div className="space-y-4">
{parentEvent && ( {parentEvent && (
<ScrollArea className="max-h-48 rounded-lg border bg-muted/40 overflow-y-auto"> <ScrollArea className="max-h-48 rounded-lg border bg-muted/40 overflow-y-auto">
<div className="p-2 sm:p-3 pointer-events-none"> <div className="p-2 sm:p-3 pointer-events-none">
<Note size="small" event={parentEvent} hideStats hideParentNotePreview /> <Note size="small" event={parentEvent} hideStats hideParentNotePreview />
</div> </div>
</ScrollArea> </ScrollArea>
)} )}
<TextareaWithMentions <TextareaWithMentions
className="h-32" className="h-32"
setTextValue={setContent} setTextValue={setContent}

357
src/components/ui/carousel.tsx

@ -1,11 +1,9 @@
import * as React from "react" import * as React from 'react'
import useEmblaCarousel, { import useEmblaCarousel, { type UseEmblaCarouselType } from 'embla-carousel-react'
type UseEmblaCarouselType, import { ArrowLeft, ArrowRight } from 'lucide-react'
} from "embla-carousel-react"
import { ArrowLeft, ArrowRight } from "lucide-react"
import { cn } from "@/lib/utils" import { cn } from '@/lib/utils'
import { Button } from "@/components/ui/button" import { Button } from '@/components/ui/button'
type CarouselApi = UseEmblaCarouselType[1] type CarouselApi = UseEmblaCarouselType[1]
type UseCarouselParameters = Parameters<typeof useEmblaCarousel> type UseCarouselParameters = Parameters<typeof useEmblaCarousel>
@ -15,7 +13,7 @@ type CarouselPlugin = UseCarouselParameters[1]
type CarouselProps = { type CarouselProps = {
opts?: CarouselOptions opts?: CarouselOptions
plugins?: CarouselPlugin plugins?: CarouselPlugin
orientation?: "horizontal" | "vertical" orientation?: 'horizontal' | 'vertical'
setApi?: (api: CarouselApi) => void setApi?: (api: CarouselApi) => void
} }
@ -34,7 +32,7 @@ function useCarousel() {
const context = React.useContext(CarouselContext) const context = React.useContext(CarouselContext)
if (!context) { if (!context) {
throw new Error("useCarousel must be used within a <Carousel />") throw new Error('useCarousel must be used within a <Carousel />')
} }
return context return context
@ -43,218 +41,193 @@ function useCarousel() {
const Carousel = React.forwardRef< const Carousel = React.forwardRef<
HTMLDivElement, HTMLDivElement,
React.HTMLAttributes<HTMLDivElement> & CarouselProps React.HTMLAttributes<HTMLDivElement> & CarouselProps
>( >(({ orientation = 'horizontal', opts, setApi, plugins, className, children, ...props }, ref) => {
( const [carouselRef, api] = useEmblaCarousel(
{ {
orientation = "horizontal", ...opts,
opts, axis: orientation === 'horizontal' ? 'x' : 'y'
setApi,
plugins,
className,
children,
...props
}, },
ref plugins
) => { )
const [carouselRef, api] = useEmblaCarousel( const [canScrollPrev, setCanScrollPrev] = React.useState(false)
{ const [canScrollNext, setCanScrollNext] = React.useState(false)
...opts,
axis: orientation === "horizontal" ? "x" : "y", const onSelect = React.useCallback((api: CarouselApi) => {
}, if (!api) {
plugins return
) }
const [canScrollPrev, setCanScrollPrev] = React.useState(false)
const [canScrollNext, setCanScrollNext] = React.useState(false) setCanScrollPrev(api.canScrollPrev())
setCanScrollNext(api.canScrollNext())
const onSelect = React.useCallback((api: CarouselApi) => { }, [])
if (!api) {
return const scrollPrev = React.useCallback(() => {
api?.scrollPrev()
}, [api])
const scrollNext = React.useCallback(() => {
api?.scrollNext()
}, [api])
const handleKeyDown = React.useCallback(
(event: React.KeyboardEvent<HTMLDivElement>) => {
if (event.key === 'ArrowLeft') {
event.preventDefault()
scrollPrev()
} else if (event.key === 'ArrowRight') {
event.preventDefault()
scrollNext()
} }
},
[scrollPrev, scrollNext]
)
setCanScrollPrev(api.canScrollPrev()) React.useEffect(() => {
setCanScrollNext(api.canScrollNext()) if (!api || !setApi) {
}, []) return
}
const scrollPrev = React.useCallback(() => {
api?.scrollPrev()
}, [api])
const scrollNext = React.useCallback(() => {
api?.scrollNext()
}, [api])
const handleKeyDown = React.useCallback( setApi(api)
(event: React.KeyboardEvent<HTMLDivElement>) => { }, [api, setApi])
if (event.key === "ArrowLeft") {
event.preventDefault()
scrollPrev()
} else if (event.key === "ArrowRight") {
event.preventDefault()
scrollNext()
}
},
[scrollPrev, scrollNext]
)
React.useEffect(() => { React.useEffect(() => {
if (!api || !setApi) { if (!api) {
return return
} }
setApi(api) onSelect(api)
}, [api, setApi]) api.on('reInit', onSelect)
api.on('select', onSelect)
React.useEffect(() => { return () => {
if (!api) { api?.off('select', onSelect)
return }
} }, [api, onSelect])
onSelect(api) return (
api.on("reInit", onSelect) <CarouselContext.Provider
api.on("select", onSelect) value={{
carouselRef,
api: api,
opts,
orientation: orientation || (opts?.axis === 'y' ? 'vertical' : 'horizontal'),
scrollPrev,
scrollNext,
canScrollPrev,
canScrollNext
}}
>
<div
ref={ref}
onKeyDownCapture={handleKeyDown}
className={cn('relative', className)}
role="region"
aria-roledescription="carousel"
{...props}
>
{children}
</div>
</CarouselContext.Provider>
)
})
Carousel.displayName = 'Carousel'
return () => { const CarouselContent = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
api?.off("select", onSelect) ({ className, ...props }, ref) => {
} const { carouselRef, orientation } = useCarousel()
}, [api, onSelect])
return ( return (
<CarouselContext.Provider <div ref={carouselRef} className="overflow-hidden">
value={{
carouselRef,
api: api,
opts,
orientation:
orientation || (opts?.axis === "y" ? "vertical" : "horizontal"),
scrollPrev,
scrollNext,
canScrollPrev,
canScrollNext,
}}
>
<div <div
ref={ref} ref={ref}
onKeyDownCapture={handleKeyDown} className={cn(
className={cn("relative", className)} 'flex',
role="region" orientation === 'horizontal' ? '-ml-4' : '-mt-4 flex-col',
aria-roledescription="carousel" className
)}
{...props} {...props}
> />
{children} </div>
</div>
</CarouselContext.Provider>
) )
} }
) )
Carousel.displayName = "Carousel" CarouselContent.displayName = 'CarouselContent'
const CarouselContent = React.forwardRef< const CarouselItem = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
HTMLDivElement, ({ className, ...props }, ref) => {
React.HTMLAttributes<HTMLDivElement> const { orientation } = useCarousel()
>(({ className, ...props }, ref) => {
const { carouselRef, orientation } = useCarousel()
return ( return (
<div ref={carouselRef} className="overflow-hidden">
<div <div
ref={ref} ref={ref}
role="group"
aria-roledescription="slide"
className={cn( className={cn(
"flex", 'min-w-0 shrink-0 grow-0 basis-full',
orientation === "horizontal" ? "-ml-4" : "-mt-4 flex-col", orientation === 'horizontal' ? 'pl-4' : 'pt-4',
className className
)} )}
{...props} {...props}
/> />
</div> )
) }
}) )
CarouselContent.displayName = "CarouselContent" CarouselItem.displayName = 'CarouselItem'
const CarouselItem = React.forwardRef<
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement>
>(({ className, ...props }, ref) => {
const { orientation } = useCarousel()
return (
<div
ref={ref}
role="group"
aria-roledescription="slide"
className={cn(
"min-w-0 shrink-0 grow-0 basis-full",
orientation === "horizontal" ? "pl-4" : "pt-4",
className
)}
{...props}
/>
)
})
CarouselItem.displayName = "CarouselItem"
const CarouselPrevious = React.forwardRef< const CarouselPrevious = React.forwardRef<HTMLButtonElement, React.ComponentProps<typeof Button>>(
HTMLButtonElement, ({ className, variant = 'outline', size = 'icon', ...props }, ref) => {
React.ComponentProps<typeof Button> const { orientation, scrollPrev, canScrollPrev } = useCarousel()
>(({ className, variant = "outline", size = "icon", ...props }, ref) => {
const { orientation, scrollPrev, canScrollPrev } = useCarousel()
return ( return (
<Button <Button
ref={ref} ref={ref}
variant={variant} variant={variant}
size={size} size={size}
className={cn( className={cn(
"absolute h-8 w-8 rounded-full", 'absolute h-8 w-8 rounded-full',
orientation === "horizontal" orientation === 'horizontal'
? "-left-12 top-1/2 -translate-y-1/2" ? '-left-12 top-1/2 -translate-y-1/2'
: "-top-12 left-1/2 -translate-x-1/2 rotate-90", : '-top-12 left-1/2 -translate-x-1/2 rotate-90',
className className
)} )}
disabled={!canScrollPrev} disabled={!canScrollPrev}
onClick={scrollPrev} onClick={scrollPrev}
{...props} {...props}
> >
<ArrowLeft className="h-4 w-4" /> <ArrowLeft className="h-4 w-4" />
<span className="sr-only">Previous slide</span> <span className="sr-only">Previous slide</span>
</Button> </Button>
) )
}) }
CarouselPrevious.displayName = "CarouselPrevious" )
CarouselPrevious.displayName = 'CarouselPrevious'
const CarouselNext = React.forwardRef< const CarouselNext = React.forwardRef<HTMLButtonElement, React.ComponentProps<typeof Button>>(
HTMLButtonElement, ({ className, variant = 'outline', size = 'icon', ...props }, ref) => {
React.ComponentProps<typeof Button> const { orientation, scrollNext, canScrollNext } = useCarousel()
>(({ className, variant = "outline", size = "icon", ...props }, ref) => {
const { orientation, scrollNext, canScrollNext } = useCarousel()
return ( return (
<Button <Button
ref={ref} ref={ref}
variant={variant} variant={variant}
size={size} size={size}
className={cn( className={cn(
"absolute h-8 w-8 rounded-full", 'absolute h-8 w-8 rounded-full',
orientation === "horizontal" orientation === 'horizontal'
? "-right-12 top-1/2 -translate-y-1/2" ? '-right-12 top-1/2 -translate-y-1/2'
: "-bottom-12 left-1/2 -translate-x-1/2 rotate-90", : '-bottom-12 left-1/2 -translate-x-1/2 rotate-90',
className className
)} )}
disabled={!canScrollNext} disabled={!canScrollNext}
onClick={scrollNext} onClick={scrollNext}
{...props} {...props}
> >
<ArrowRight className="h-4 w-4" /> <ArrowRight className="h-4 w-4" />
<span className="sr-only">Next slide</span> <span className="sr-only">Next slide</span>
</Button> </Button>
) )
}) }
CarouselNext.displayName = "CarouselNext" )
CarouselNext.displayName = 'CarouselNext'
export { export { type CarouselApi, Carousel, CarouselContent, CarouselItem, CarouselPrevious, CarouselNext }
type CarouselApi,
Carousel,
CarouselContent,
CarouselItem,
CarouselPrevious,
CarouselNext,
}

12
src/components/ui/tabs.tsx

@ -1,7 +1,7 @@
import * as React from "react" import * as React from 'react'
import * as TabsPrimitive from "@radix-ui/react-tabs" import * as TabsPrimitive from '@radix-ui/react-tabs'
import { cn } from "@/lib/utils" import { cn } from '@/lib/utils'
const Tabs = TabsPrimitive.Root const Tabs = TabsPrimitive.Root
@ -12,7 +12,7 @@ const TabsList = React.forwardRef<
<TabsPrimitive.List <TabsPrimitive.List
ref={ref} ref={ref}
className={cn( className={cn(
"inline-flex h-9 items-center justify-center rounded-lg bg-muted p-1 text-muted-foreground", 'inline-flex h-9 items-center justify-center rounded-lg bg-muted p-1 text-muted-foreground',
className className
)} )}
{...props} {...props}
@ -27,7 +27,7 @@ const TabsTrigger = React.forwardRef<
<TabsPrimitive.Trigger <TabsPrimitive.Trigger
ref={ref} ref={ref}
className={cn( className={cn(
"inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow", 'inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow',
className className
)} )}
{...props} {...props}
@ -42,7 +42,7 @@ const TabsContent = React.forwardRef<
<TabsPrimitive.Content <TabsPrimitive.Content
ref={ref} ref={ref}
className={cn( className={cn(
"mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2", 'mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2',
className className
)} )}
{...props} {...props}

5
tailwind.config.js

@ -1,10 +1,7 @@
/** @type {import('tailwindcss').Config} */ /** @type {import('tailwindcss').Config} */
export default { export default {
darkMode: ['class'], darkMode: ['class'],
content: [ content: ['./index.html', './src/**/*.{ts,tsx}'],
'./index.html',
'./src/**/*.{ts,tsx}',
],
theme: { theme: {
extend: { extend: {
borderRadius: { borderRadius: {

Loading…
Cancel
Save