monoid/ionian
1
0
Fork 0
Code Issues 9 Pull Requests Projects Releases Wiki Activity

Rework #6

Merged
monoid merged 38 commits from dev into main 2024-04-17 01:45:37 +09:00
Conversation 1 Commits 38 Files Changed 197 +33 -33
15 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3813dbfeff - Show all commits

14
packages/client/src/App.tsx
View File

@ -14,14 +14,14 @@ import './App.css'
// // TagsPage, // // TagsPage,
// } from "./page/mod"; // } from "./page/mod";
import { TooltipProvider } from "./components/ui/tooltip"; import { TooltipProvider } from "./components/ui/tooltip.tsx";
import Gallery from "./page/galleryPage"; import Gallery from "./page/galleryPage.tsx";
import Layout from "./components/layout/layout"; import Layout from "./components/layout/layout.tsx";
import NotFoundPage from "./page/404"; import NotFoundPage from "./page/404.tsx";
import LoginPage from "./page/loginPage"; import LoginPage from "./page/loginPage.tsx";
import ProfilePage from "./page/profilesPage"; import ProfilePage from "./page/profilesPage.tsx";
import ContentInfoPage from "./page/contentInfoPage"; import ContentInfoPage from "./page/contentInfoPage.tsx";
const App = () => { const App = () => {
return ( return (

6
packages/client/src/components/gallery/GalleryCard.tsx
View File

@ -1,9 +1,9 @@
import type { Document } from "dbtype/api"; import type { Document } from "dbtype/api";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"; import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card.tsx";
import TagBadge from "@/components/gallery/TagBadge"; import TagBadge from "@/components/gallery/TagBadge.tsx";
import { useEffect, useRef, useState } from "react"; import { useEffect, useRef, useState } from "react";
import { Link, useLocation } from "wouter"; import { Link, useLocation } from "wouter";
import { LazyImage } from "./LazyImage"; import { LazyImage } from "./LazyImage.tsx";
function clipTagsWhenOverflow(tags: string[], limit: number) { function clipTagsWhenOverflow(tags: string[], limit: number) {
let l = 0; let l = 0;

4
packages/client/src/components/gallery/TagBadge.tsx
View File

@ -1,6 +1,6 @@
import { badgeVariants } from "@/components/ui/badge"; import { badgeVariants } from "@/components/ui/badge.tsx";
import { Link } from "wouter"; import { Link } from "wouter";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils.ts";
const femaleTagPrefix = "female:"; const femaleTagPrefix = "female:";
const maleTagPrefix = "male:"; const maleTagPrefix = "male:";

6
packages/client/src/components/layout/nav.tsx
View File

@ -1,8 +1,8 @@
import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/tooltip"
import { Link } from "wouter" import { Link } from "wouter"
import { MagnifyingGlassIcon, GearIcon, ActivityLogIcon, ArchiveIcon, PersonIcon } from "@radix-ui/react-icons" import { MagnifyingGlassIcon, GearIcon, ActivityLogIcon, ArchiveIcon, PersonIcon } from "@radix-ui/react-icons"
import { buttonVariants } from "../ui/button" import { buttonVariants } from "@/components/ui/button.tsx"
import { useLogin } from "@/state/user"; import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip.tsx"
import { useLogin } from "@/state/user.ts";
interface NavItemProps { interface NavItemProps {
icon: React.ReactNode; icon: React.ReactNode;

2
packages/client/src/components/ui/badge.tsx
View File

@ -1,7 +1,7 @@
import * as React from "react" import * as React from "react"
import { cva, type VariantProps } from "class-variance-authority" import { cva, type VariantProps } from "class-variance-authority"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils.ts"
const badgeVariants = cva( const badgeVariants = cva(
"inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2", "inline-flex items-center rounded-md border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",

2
packages/client/src/components/ui/button.tsx
View File

@ -2,7 +2,7 @@ import * as React from "react"
import { Slot } from "@radix-ui/react-slot" import { Slot } from "@radix-ui/react-slot"
import { cva, type VariantProps } from "class-variance-authority" import { cva, type VariantProps } from "class-variance-authority"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils.ts"
const buttonVariants = cva( const buttonVariants = cva(
"inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50", "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50",

2
packages/client/src/components/ui/card.tsx
View File

@ -1,6 +1,6 @@
import * as React from "react" import * as React from "react"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils.ts"
const Card = React.forwardRef< const Card = React.forwardRef<
HTMLDivElement, HTMLDivElement,

2
packages/client/src/components/ui/input.tsx
View File

@ -1,6 +1,6 @@
import * as React from "react" import * as React from "react"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils.ts"
export interface InputProps export interface InputProps
extends React.InputHTMLAttributes<HTMLInputElement> {} extends React.InputHTMLAttributes<HTMLInputElement> {}

2
packages/client/src/components/ui/label.tsx
View File

@ -2,7 +2,7 @@ import * as React from "react"
import * as LabelPrimitive from "@radix-ui/react-label" import * as LabelPrimitive from "@radix-ui/react-label"
import { cva, type VariantProps } from "class-variance-authority" import { cva, type VariantProps } from "class-variance-authority"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils.ts"
const labelVariants = cva( const labelVariants = cva(
"text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"

2
packages/client/src/components/ui/resizable.tsx
View File

@ -1,7 +1,7 @@
import { DragHandleDots2Icon } from "@radix-ui/react-icons" import { DragHandleDots2Icon } from "@radix-ui/react-icons"
import * as ResizablePrimitive from "react-resizable-panels" import * as ResizablePrimitive from "react-resizable-panels"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils.ts"
const ResizablePanelGroup = ({ const ResizablePanelGroup = ({
className, className,

2
packages/client/src/components/ui/skeleton.tsx
View File

@ -1,4 +1,4 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils.ts"
function Skeleton({ function Skeleton({
className, className,

2
packages/client/src/components/ui/tooltip.tsx
View File

@ -1,7 +1,7 @@
import * as React from "react" import * as React from "react"
import * as TooltipPrimitive from "@radix-ui/react-tooltip" import * as TooltipPrimitive from "@radix-ui/react-tooltip"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils.ts"
const TooltipProvider = TooltipPrimitive.Provider const TooltipProvider = TooltipPrimitive.Provider

8
packages/client/src/page/galleryPage.tsx
View File

@ -1,10 +1,10 @@
import useSWR from "swr"; import useSWR from "swr";
import { useSearch } from "wouter"; import { useSearch } from "wouter";
import type { Document } from "dbtype/api"; import type { Document } from "dbtype/api";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input.tsx";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button.tsx";
import { GalleryCard } from "../components/gallery/GalleryCard"; import { GalleryCard } from "@/components/gallery/GalleryCard.tsx";
import TagBadge from "@/components/gallery/TagBadge"; import TagBadge from "@/components/gallery/TagBadge.tsx";
async function fetcher(url: string) { async function fetcher(url: string) {
const res = await fetch(url); const res = await fetch(url);

10
packages/client/src/page/loginPage.tsx
View File

@ -1,8 +1,8 @@
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button.tsx";
import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"; import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card.tsx";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input.tsx";
import { Label } from "@/components/ui/label"; import { Label } from "@/components/ui/label.tsx";
import { doLogin } from "@/state/user"; import { doLogin } from "@/state/user.ts";
import { useState } from "react"; import { useState } from "react";
import { useLocation } from "wouter"; import { useLocation } from "wouter";

2
packages/client/src/state/user.ts
View File

@ -1,4 +1,4 @@
import { atom, useAtomValue, setAtomValue } from "../lib/atom"; import { atom, useAtomValue, setAtomValue } from "../lib/atom.ts";
type LoginLocalStorage = { type LoginLocalStorage = {
username: string; username: string;