0.0.2 FR 1

2025-01-01 12:24:47 -05:00
parent 9777e46316
commit da807296f3
15 changed files with 212 additions and 10 deletions
--- a/resources/js/Pages/Comic/Chapters.jsx
+++ b/resources/js/Pages/Comic/Chapters.jsx
@@ -48,7 +48,7 @@ export default function Chapters({ auth, comic, chapters, histories, offset }) {
            <TooltipProvider>
                <Tooltip>
                    <TooltipTrigger asChild>
-                        <Button size="sm" variant="outline" asChild className={ isRead ? 'bg-gray-200 hover:bg-gray-300' : '' }>
+                        <Button size="sm" variant="outline" asChild className={ isRead ? 'bg-gray-200 hover:bg-gray-300 dark:bg-slate-800 dark:hover:bg-slate-700' : '' }>
                            <Link className="relative" href={ `/comic/${ comic.comic.path_word }/${ props.uuid }` }>
                                { props.name }
                                { isNew && <Plus size={ 16 } className="text-xs absolute right-0 top-0" /> }
--- a/resources/js/Pages/Comic/Read.jsx
+++ b/resources/js/Pages/Comic/Read.jsx
@@ -1,7 +1,7 @@
 import { Head, Link, router } from '@inertiajs/react';
 import AppLayout from '@/Layouts/AppLayout.jsx';
 import React, { useEffect, useLayoutEffect, useRef, useState } from 'react';
-import { ChevronFirst, ChevronLast, Rows3, Settings } from "lucide-react";
+import { ChevronFirst, ChevronLast, Rows3, Settings } from 'lucide-react';
 import { Tooltip, TooltipProvider, TooltipTrigger } from '@radix-ui/react-tooltip';

 import { throttle } from 'lodash';
@@ -10,6 +10,7 @@ import { BreadcrumbItem, BreadcrumbLink, BreadcrumbPage, BreadcrumbSeparator } f
 import { Button } from '@/components/ui/button';
 import { Dialog, DialogClose, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from '@/components/ui/dialog';
 import PrimaryButton from '@/components/PrimaryButton';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
 import { Switch } from '@/components/ui/switch';
 import { TooltipContent } from '@/components/ui/tooltip';

@@ -21,6 +22,8 @@ export default function Read({ auth, comic, chapter }) {
    const [isTwoPagesPerScreen, setIsTwoPagePerScreen] = useState(false); // TODO
    const [currentImage, setCurrentImage] = useState(1);

+    const [isJumpToPageOpen, setIsJumpToPageOpen] = useState(false);
+
    const windowSize = useWindowSize();
    const ref = useRef();

@@ -61,6 +64,12 @@ export default function Read({ auth, comic, chapter }) {
        }
    }

+    const selectOnChangeHandler = (e) => {
+        document.getElementById(`image-${e - 1}`)?.scrollIntoView();
+        setCurrentImage(e);
+        setIsJumpToPageOpen(false);
+    }
+
    const setViewPort = (e) => {
        //console.log(e.target.childNodes);
        //console.log(e.target.naturalHeight);
@@ -102,11 +111,11 @@ export default function Read({ auth, comic, chapter }) {

        return (<div className="basis-full">
            <img
-                id={ `image-${img.innerKey}` }
+                id={ `image-${ img.innerKey }` }
                ref={ imgRef }
                style={ imgStyles }
                className={` m-auto comic-img `}
-                src={ `/image/${btoa(img.url)}` }
+                src={ `/image/${ btoa(img.url) }` }
                onClick={ handleImageClick }
                alt={ comic.comic.name }
            />
@@ -156,9 +165,47 @@ export default function Read({ auth, comic, chapter }) {
                    </DialogContent>
                </Dialog>

-                    <Button variant="ghost">
-                     { currentImage } / { chapter.sorted.length }
-                </Button>
+                <Dialog open={ isJumpToPageOpen }>
+                    <DialogTrigger>
+                        <TooltipProvider>
+                            <Tooltip>
+                                <TooltipTrigger>
+                                    <Button variant="ghost" onClick={ () => setIsJumpToPageOpen(!isJumpToPageOpen) }>
+                                         { currentImage } / { chapter.sorted.length }
+                                    </Button>
+                                </TooltipTrigger>
+                                <TooltipContent>
+                                    <p>Jump To</p>
+                                </TooltipContent>
+                            </Tooltip>
+                        </TooltipProvider>
+                    </DialogTrigger>
+                    <DialogContent className="max-w-[600px]">
+                        <DialogHeader>
+                            <DialogTitle>Jump to</DialogTitle>
+                            <DialogDescription>
+
+                            </DialogDescription>
+                        </DialogHeader>
+                        <div className="space-y-4">
+                            <Select defaultOpen onValueChange={ (e) => selectOnChangeHandler(e) } defaultValue={ currentImage}>
+                                <SelectTrigger>
+                                    <SelectValue />
+                                </SelectTrigger>
+                                <SelectContent>
+                                    { chapter.sorted.map((img, i) => (
+                                        <SelectItem key={ i + 1 } value={ i + 1 }>{ i + 1 } / { chapter.sorted.length }</SelectItem>
+                                    ))}
+                                </SelectContent>
+                            </Select>
+                        </div>
+                        <DialogFooter>
+                            <DialogClose asChild>
+                                <PrimaryButton onClick={ () => setIsJumpToPageOpen(false) }>Done</PrimaryButton>
+                            </DialogClose>
+                        </DialogFooter>
+                    </DialogContent>
+                </Dialog>

                <TooltipProvider>
                    <Tooltip>
@@ -170,7 +217,7 @@ export default function Read({ auth, comic, chapter }) {
                            </Button>
                        </TooltipTrigger>
                        <TooltipContent>
-                            <p>Content Page</p>
+                            <p>TOC</p>
                        </TooltipContent>
                    </Tooltip>
                </TooltipProvider>
--- a/resources/js/Pages/Pages/Updates.jsx
+++ b/resources/js/Pages/Pages/Updates.jsx
@@ -11,6 +11,20 @@ export default function Updates({ auth }) {
                <title>Updates</title>
            </Head>
            <div className="p-3 pt-1">
+                <Card className="w-[90%] m-3 mx-auto">
+                    <CardHeader>
+                        <CardTitle>0.0.2 FR1</CardTitle>
+                        <CardDescription>Release: 01 Jan 2025</CardDescription>
+                    </CardHeader>
+                    <CardContent>
+                        <ul>
+                            <li>iOS Add to home screen</li>
+                            <li>Updated icons</li>
+                            <li>Fixed: Darkmode read chapters colour</li>
+                            <li>Beta: Jump to page via reading mode</li>
+                        </ul>
+                    </CardContent>
+                </Card>
                <Card className="w-[90%] m-3 mx-auto">
                    <CardHeader>
                        <CardTitle>0.0.2</CardTitle>
--- a/resources/js/components/ui/app-sidebar.jsx
+++ b/resources/js/components/ui/app-sidebar.jsx
@@ -57,7 +57,7 @@ export function AppSidebar({ auth }) {
                                    </div>
                                    <div className="flex flex-col gap-0.5 leading-none">
                                        <span className="font-semibold">Comic</span>
-                                        <span>0.0.2</span>
+                                        <span>0.0.2 FR1</span>
                                    </div>
                                </Link>
                            </SidebarMenuButton>
@@ -65,7 +65,7 @@ export function AppSidebar({ auth }) {
                    </SidebarMenu>
                    <SidebarGroup className="py-0">
                        <SidebarGroupContent className="relative">
-                            <form onSubmit={ (e) => searchOnSubmitHandler(e)} >
+                            <form autoCorrect="false" autoComplete="false" autoFocus="false" onSubmit={ (e) => searchOnSubmitHandler(e)} >
                                <label htmlFor="search" className="sr-only">Search</label>
                                <SidebarInput onChange={ (e) => setSearch(e.target.value) } id="search" placeholder="Search" className="pl-8" />
                                <Search className="pointer-events-none absolute left-2 top-1/2 size-4 -translate-y-1/2 select-none opacity-50" />
--- a/resources/js/components/ui/select.jsx
+++ b/resources/js/components/ui/select.jsx
@@ -0,0 +1,119 @@
+import * as React from "react"
+import * as SelectPrimitive from "@radix-ui/react-select"
+import { Check, ChevronDown, ChevronUp } from "lucide-react"
+
+import { cn } from "@/lib/utils"
+
+const Select = SelectPrimitive.Root
+
+const SelectGroup = SelectPrimitive.Group
+
+const SelectValue = SelectPrimitive.Value
+
+const SelectTrigger = React.forwardRef(({ className, children, ...props }, ref) => (
+  <SelectPrimitive.Trigger
+    ref={ref}
+    className={cn(
+      "flex h-9 w-full items-center justify-between whitespace-nowrap rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1",
+      className
+    )}
+    {...props}>
+    {children}
+    <SelectPrimitive.Icon asChild>
+      <ChevronDown className="h-4 w-4 opacity-50" />
+    </SelectPrimitive.Icon>
+  </SelectPrimitive.Trigger>
+))
+SelectTrigger.displayName = SelectPrimitive.Trigger.displayName
+
+const SelectScrollUpButton = React.forwardRef(({ className, ...props }, ref) => (
+  <SelectPrimitive.ScrollUpButton
+    ref={ref}
+    className={cn("flex cursor-default items-center justify-center py-1", className)}
+    {...props}>
+    <ChevronUp className="h-4 w-4" />
+  </SelectPrimitive.ScrollUpButton>
+))
+SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName
+
+const SelectScrollDownButton = React.forwardRef(({ className, ...props }, ref) => (
+  <SelectPrimitive.ScrollDownButton
+    ref={ref}
+    className={cn("flex cursor-default items-center justify-center py-1", className)}
+    {...props}>
+    <ChevronDown className="h-4 w-4" />
+  </SelectPrimitive.ScrollDownButton>
+))
+SelectScrollDownButton.displayName =
+  SelectPrimitive.ScrollDownButton.displayName
+
+const SelectContent = React.forwardRef(({ className, children, position = "popper", ...props }, ref) => (
+  <SelectPrimitive.Portal>
+    <SelectPrimitive.Content
+      ref={ref}
+      className={cn(
+        "relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md 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-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+        position === "popper" &&
+          "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
+        className
+      )}
+      position={position}
+      {...props}>
+      <SelectScrollUpButton />
+      <SelectPrimitive.Viewport
+        className={cn("p-1", position === "popper" &&
+          "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]")}>
+        {children}
+      </SelectPrimitive.Viewport>
+      <SelectScrollDownButton />
+    </SelectPrimitive.Content>
+  </SelectPrimitive.Portal>
+))
+SelectContent.displayName = SelectPrimitive.Content.displayName
+
+const SelectLabel = React.forwardRef(({ className, ...props }, ref) => (
+  <SelectPrimitive.Label
+    ref={ref}
+    className={cn("px-2 py-1.5 text-sm font-semibold", className)}
+    {...props} />
+))
+SelectLabel.displayName = SelectPrimitive.Label.displayName
+
+const SelectItem = React.forwardRef(({ className, children, ...props }, ref) => (
+  <SelectPrimitive.Item
+    ref={ref}
+    className={cn(
+      "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+      className
+    )}
+    {...props}>
+    <span className="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
+      <SelectPrimitive.ItemIndicator>
+        <Check className="h-4 w-4" />
+      </SelectPrimitive.ItemIndicator>
+    </span>
+    <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
+  </SelectPrimitive.Item>
+))
+SelectItem.displayName = SelectPrimitive.Item.displayName
+
+const SelectSeparator = React.forwardRef(({ className, ...props }, ref) => (
+  <SelectPrimitive.Separator
+    ref={ref}
+    className={cn("-mx-1 my-1 h-px bg-muted", className)}
+    {...props} />
+))
+SelectSeparator.displayName = SelectPrimitive.Separator.displayName
+
+export {
+  Select,
+  SelectGroup,
+  SelectValue,
+  SelectTrigger,
+  SelectContent,
+  SelectLabel,
+  SelectItem,
+  SelectSeparator,
+  SelectScrollUpButton,
+  SelectScrollDownButton,
+}