Merge pull request #319 from h8570rg/develop

0.1.7

.github/workflows/ci.yaml

@@ -12,7 +12,7 @@ jobs:
       GOOGLE_SECRET: "dummy"
       OPENAI_API_KEY: "dummy"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - uses: supabase/setup-cli@v1
 

.github/workflows/production.yaml

@@ -19,7 +19,7 @@ jobs:
       OPENAI_API_KEY: "dummy"
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - uses: supabase/setup-cli@v1
 

.github/workflows/staging.yaml

@@ -19,7 +19,7 @@ jobs:
       OPENAI_API_KEY: "dummy"
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - uses: supabase/setup-cli@v1
 

.lintstagedrc.js

@@ -1,5 +1,8 @@
 const path = require("path");
 
+// TODO: エラーで使えないのでpackage.jsonのpre-commitを変更している。
+// see https://github.com/eslint/eslint/issues/19322
+
 const buildEslintCommand = (filenames) =>
   `next lint --fix --file ${filenames
     .map((f) => path.relative(process.cwd(), f))

.vscode/settings.json

@@ -4,7 +4,7 @@
     "inbucket",
     "jankiroku",
     "nextjs",
-    "nextui",
+    "heroui",
     "oidc",
     "OPENAI",
     "orioledb",

README.md

@@ -74,11 +74,11 @@ Supabase Studio URL: http://localhost:54323
 
 ## 用語一覧
 
-| コード | 意味 |
-| ---- | ---- |
-| user | ログインしているユーザー |
-| match | 成績表 |
-| game | 半荘 |
-| score | ポイント |
-| points | 点数 |
-| result | 収支 |
+| コード | 意味                     |
+| ------ | ------------------------ |
+| user   | ログインしているユーザー |
+| match  | 成績表                   |
+| game   | 半荘                     |
+| score  | ポイント                 |
+| points | 点数                     |
+| result | 収支                     |

app/(lp)/page.tsx

@@ -1,9 +1,4 @@
-import {
-  Navbar,
-  NavbarBrand,
-  NavbarContent,
-  NavbarItem,
-} from "@nextui-org/react";
+import { Navbar, NavbarBrand, NavbarContent, NavbarItem } from "@heroui/react";
 import Image from "next/image";
 import Link from "next/link";
 import { Button } from "@/components/Button";

app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/index.tsx

@@ -69,7 +69,7 @@ export async function MatchTable({
 
   const rowStyle: CSSProperties = {
     display: "grid",
-    gridTemplateColumns: `46px repeat(${columns.length}, minmax(80px, 1fr))`,
+    gridTemplateColumns: `46px repeat(${columns.length}, minmax(56px, 1fr))`,
     width: "100%",
   };
 
@@ -79,7 +79,7 @@ export async function MatchTable({
         {/* ヘッダー */}
         <PlayersModalTrigger
           style={rowStyle}
-          className="rounded-lg bg-default-100 text-foreground-500"
+          className="mb-1 rounded-lg bg-default-100 text-foreground-500"
         >
           <div />
           {columns.map((column) => (
@@ -104,14 +104,14 @@ export async function MatchTable({
                 gameId={item.gameId}
                 style={rowStyle}
               >
-                <div className="flex h-full items-center justify-center truncate px-1 py-2 text-tiny text-default-500">
+                <div className="flex h-full items-center justify-center break-all px-1 py-2 text-tiny text-default-500">
                   {index + 1}
                 </div>
                 {columns.map((column) => (
                   <div
                     key={column.id}
                     className={classNames(
-                      "truncate px-1 py-2 text-center text-small",
+                      "flex h-full items-center justify-center break-all px-1 py-2 text-center text-small",
                       {
                         "text-danger": item.players[column.id] < 0,
                       },
@@ -123,6 +123,7 @@ export async function MatchTable({
               </GameRow>
             ))}
           <GameModalTrigger
+            className="mt-1"
             fullWidth
             size="lg"
             startContent={<Icon className="size-5" name="edit" />}
@@ -178,7 +179,7 @@ export async function MatchTable({
                 key={column.id}
               >
                 {column.result}
-                <span className="text-[10px]">円</span>
+                <span className="contents text-[10px]">円</span>
               </div>
             ))}
           </div>

app/(maintenance)/(routes)/maintenance/page.tsx

@@ -1,10 +1,6 @@
 "use client";
 
-import {
-  Navbar as NextUINavbar,
-  NavbarBrand,
-  NavbarContent,
-} from "@nextui-org/react";
+import { Navbar, NavbarBrand, NavbarContent } from "@heroui/react";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { useState } from "react";
@@ -18,15 +14,15 @@ export default function MaintenancePage() {
   const [isRefreshing, setIsRefreshing] = useState(false);
   return (
     <main className="relative flex min-h-screen flex-col">
-      <NextUINavbar position="static" className="absolute inset-x-0 top-0">
+      <Navbar position="static" className="absolute inset-x-0 top-0">
         <NavbarContent>
           <NavbarBrand>
             <Link color="foreground" href="/">
               <Logo className="text-large" />
             </Link>
           </NavbarBrand>
         </NavbarContent>
-      </NextUINavbar>
+      </Navbar>
       <div className="flex grow items-center justify-center px-4">
         <div className="flex flex-col items-center gap-4">
           <h1 className="text-center text-large">メンテナンス中</h1>

app/layout.tsx

@@ -4,7 +4,7 @@ import { IconDefs } from "@/components/Icon";
 import { SERVICE_NAME } from "@/lib/config";
 import { fontClassNames } from "./fonts";
 import "./globals.css";
-import { NextUIProvider } from "./nextUiProvider";
+import { Providers } from "./providers";
 
 export const metadata: Metadata = {
   title: {
@@ -35,9 +35,9 @@ export default function RootLayout({
       </head>
       <body className="h-full font-rocknroll">
         <IconDefs />
-        <NextUIProvider>
+        <Providers>
           <div className="h-full bg-background text-foreground">{children}</div>
-        </NextUIProvider>
+        </Providers>
       </body>
     </html>
   );

app/providers.tsx

@@ -0,0 +1,17 @@
+"use client";
+
+import { HeroUIProvider } from "@heroui/react";
+import { ThemeProvider as NextThemesProvider } from "next-themes";
+
+/**
+ * @see https://heroui.org/docs/frameworks/nextjs#tailwind-css-setup
+ */
+export function Providers({ children }: { children: React.ReactNode }) {
+  return (
+    <HeroUIProvider className="h-full">
+      <NextThemesProvider attribute="class" defaultTheme="system">
+        {children}
+      </NextThemesProvider>
+    </HeroUIProvider>
+  );
+}

components/Accordion/index.tsx

@@ -1,3 +1,3 @@
 "use client";
 
-export { Accordion, AccordionItem } from "@nextui-org/react";
+export { Accordion, AccordionItem } from "@heroui/react";

components/Alert/index.tsx

@@ -1,3 +1,3 @@
 "use client";
 
-export { Alert } from "@nextui-org/react";
+export { Alert } from "@heroui/react";

components/Avatar/index.tsx

@@ -1,3 +1,3 @@
 "use client";
 
-export { Avatar, AvatarGroup } from "@nextui-org/react";
+export { Avatar, AvatarGroup } from "@heroui/react";

components/Button/index.tsx

@@ -1 +1 @@
-export { Button, ButtonGroup, type ButtonProps } from "@nextui-org/react";
+export { Button, ButtonGroup, type ButtonProps } from "@heroui/react";

components/Card/index.tsx

@@ -1,3 +1,3 @@
 "use client";
 
-export { Card, CardHeader, CardBody, CardFooter } from "@nextui-org/react";
+export { Card, CardHeader, CardBody, CardFooter } from "@heroui/react";

components/Chip/index.tsx

@@ -1,3 +1,3 @@
 "use client";
 
-export { Chip } from "@nextui-org/react";
+export { Chip } from "@heroui/react";

components/Divider/index.tsx

@@ -1,3 +1,3 @@
 "use client";
 
-export { Divider } from "@nextui-org/react";
+export { Divider } from "@heroui/react";

components/Dropdown/index.tsx

@@ -6,4 +6,4 @@ export {
   DropdownMenu,
   DropdownSection,
   DropdownItem,
-} from "@nextui-org/react";
+} from "@heroui/react";

components/Input/index.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { Input as NextUiInput, InputProps } from "@nextui-org/react";
+import { Input as HeroUiInput, InputProps } from "@heroui/react";
 import classNames from "classnames";
 import { forwardRef } from "react";
 
@@ -9,7 +9,7 @@ export const Input = forwardRef<
   Omit<InputProps, "isInvalid">
 >(function Input({ classNames: propsClassNames, ...props }, ref) {
   return (
-    <NextUiInput
+    <HeroUiInput
       classNames={{
         ...propsClassNames,
         input: classNames("text-medium", propsClassNames?.input), // ios safariで拡大されるのを防ぐ

components/Link/index.tsx

@@ -1,15 +1,15 @@
 "use client";
 
 import {
-  Link as NextUILink,
-  LinkProps as NextUILinkProps,
-} from "@nextui-org/react";
+  Link as HeroUiLink,
+  LinkProps as HeroUiLinkProps,
+} from "@heroui/react";
 import NextLink, { LinkProps as NextLinkProps } from "next/link";
 import { forwardRef } from "react";
 
 export const Link = forwardRef<
   HTMLAnchorElement,
-  NextLinkProps & NextUILinkProps
+  NextLinkProps & HeroUiLinkProps
 >(function Link(props, ref) {
-  return <NextUILink as={NextLink} ref={ref} {...props} />;
+  return <HeroUiLink as={NextLink} ref={ref} {...props} />;
 });

components/Listbox/index.tsx

@@ -1,3 +1,3 @@
 "use client";
 
-export { Listbox, ListboxItem, ListboxSection } from "@nextui-org/react";
+export { Listbox, ListboxItem, ListboxSection } from "@heroui/react";

components/Modal/index.tsx

@@ -1,15 +1,15 @@
 "use client";
 
-import { useDisclosure } from "@nextui-org/react";
+import { useDisclosure } from "@heroui/react";
 
-export type { ModalProps } from "@nextui-org/react";
+export type { ModalProps } from "@heroui/react";
 export {
   Modal,
   ModalContent,
   ModalHeader,
   ModalBody,
   ModalFooter,
-} from "@nextui-org/react";
+} from "@heroui/react";
 
 export type UseModalReturn = {
   isOpen: boolean;

components/Navbar/index.tsx

@@ -1,3 +1,3 @@
 "use client";
 
-export { Navbar, NavbarBrand, NavbarContent } from "@nextui-org/react";
+export { Navbar, NavbarBrand, NavbarContent } from "@heroui/react";

components/Popover/index.tsx

@@ -1,3 +1,3 @@
 "use client";
 
-export { Popover, PopoverTrigger, PopoverContent } from "@nextui-org/react";
+export { Popover, PopoverTrigger, PopoverContent } from "@heroui/react";

components/Progress/index.tsx

@@ -1,3 +1,3 @@
 "use client";
 
-export { Progress } from "@nextui-org/react";
+export { Progress } from "@heroui/react";

components/ScrollShadow/index.tsx

@@ -1,3 +1,3 @@
 "use client";
 
-export { ScrollShadow } from "@nextui-org/react";
+export { ScrollShadow } from "@heroui/react";

components/Select/index.tsx

@@ -1,3 +1,3 @@
 "use client";
 
-export { Select, SelectItem } from "@nextui-org/react";
+export { Select, SelectItem } from "@heroui/react";