Merge pull request #271 from h8570rg/develop

0.1.6
h8570rg · Jan 3, 2025 · 69402f2 · 69402f2
2 parents 62e9c25 + 4da2774
commit 69402f2
Show file tree

Hide file tree

Showing 14 changed files with 132 additions and 302 deletions.
diff --git a/app/(auth)/(routes)/login/page.tsx b/app/(auth)/(routes)/login/page.tsx
@@ -11,7 +11,7 @@ export const metadata: Metadata = {
 export default function LoginPage() {
   return (
     <>
-      <h1 className="mx-auto mb-4 w-fit text-large font-bold">ログイン</h1>
+      <h1 className="mx-auto mb-4 w-fit text-large">ログイン</h1>
       <SocialProviders />
       <div className="my-4 flex items-center gap-4">
         <Divider className="shrink" />

diff --git a/app/(auth)/(routes)/register/page.tsx b/app/(auth)/(routes)/register/page.tsx
@@ -19,9 +19,7 @@ export default async function RegisterPage() {
 
   return (
     <>
-      <h1 className="mx-auto mb-2 w-fit text-large font-bold">
-        ユーザー情報登録
-      </h1>
+      <h1 className="mx-auto mb-2 w-fit text-large">ユーザー情報登録</h1>
       <p className="mb-6 mt-4 text-small text-foreground-light">
         ユーザーIDと名前を決めてください。
         <br />

diff --git a/app/(auth)/(routes)/sign-up/page.tsx b/app/(auth)/(routes)/sign-up/page.tsx
@@ -9,7 +9,7 @@ export const metadata: Metadata = {
 export default function SignUpPage() {
   return (
     <>
-      <h1 className="mx-auto mb-2 w-fit text-large font-bold">新規登録</h1>
+      <h1 className="mx-auto mb-2 w-fit text-large">新規登録</h1>
       <SignUpForm />
       <p className="text-center text-small">
         既にアカウントをお持ちの方は

diff --git a/app/(lp)/page.tsx b/app/(lp)/page.tsx
@@ -126,16 +126,12 @@ export default function LandingPage() {
       <div className="container mx-auto space-y-24 px-5 py-16">
         {/* 機能紹介 */}
         <section id="features" className="">
-          <h2 className="mb-12 text-center text-large font-semibold">
-            主な機能
-          </h2>
+          <h2 className="mb-12 text-center text-large">主な機能</h2>
           <div className="grid grid-cols-1 gap-8 md:grid-cols-2 lg:grid-cols-4">
             {features.map((feature, index) => (
               <Card key={index} className="px-3">
                 <CardBody className="py-8">
-                  <h3 className="mb-2 text-center font-semibold">
-                    {feature.title}
-                  </h3>
+                  <h3 className="mb-2 text-center">{feature.title}</h3>
                   <p>{feature.description}</p>
                 </CardBody>
               </Card>
@@ -146,18 +142,14 @@ export default function LandingPage() {
         {/* 使用方法 */}
         <section className="">
           <div className="container mx-auto">
-            <h2 className="mb-12 text-center text-large font-semibold">
-              使い方
-            </h2>
+            <h2 className="mb-12 text-center text-large">使い方</h2>
             <div className="grid grid-cols-1 gap-8 md:grid-cols-2 lg:grid-cols-4">
               {steps.map((step) => (
                 <div key={step.number} className="text-center">
-                  <div className="mx-auto mb-4 flex size-16 items-center justify-center rounded-full bg-secondary text-large font-bold text-secondary-foreground">
+                  <div className="mx-auto mb-4 flex size-16 items-center justify-center rounded-full bg-secondary text-large text-secondary-foreground">
                     {step.number}
                   </div>
-                  <h3 className="mb-2 text-medium font-semibold">
-                    {step.title}
-                  </h3>
+                  <h3 className="mb-2 text-medium">{step.title}</h3>
                   <p>{step.description}</p>
                 </div>
               ))}
@@ -168,9 +160,7 @@ export default function LandingPage() {
         {/* FAQ */}
         <section className="">
           <div className="container mx-auto">
-            <h2 className="mb-12 text-center text-large font-semibold">
-              よくある質問
-            </h2>
+            <h2 className="mb-12 text-center text-large">よくある質問</h2>
             <FAQ faqs={faqs} />
           </div>
         </section>

diff --git a/app/(main)/(components)/Appbar/Avatar/Menu/index.tsx b/app/(main)/(components)/Appbar/Avatar/Menu/index.tsx
@@ -39,8 +39,8 @@ export function AppbarAvatarMenu({
         className="h-14 gap-2"
         textValue={`${name}@${displayId}`}
       >
-        <p className="text-wrap break-all font-semibold">{name}</p>
-        <p className="text-wrap break-all font-semibold">@{displayId}</p>
+        <p className="text-wrap break-all">{name}</p>
+        <p className="text-wrap break-all">@{displayId}</p>
       </DropdownItem>
       <DropdownItem key="friends">フレンド</DropdownItem>
       <DropdownItem key="signOut" color="danger">

diff --git a/app/(main)/(routes)/matches/(components)/MatchCard/index.tsx b/app/(main)/(routes)/matches/(components)/MatchCard/index.tsx
@@ -20,7 +20,7 @@ export function MatchCard({ match, userId }: { match: Match; userId: string }) {
     <NavigationCard matchId={match.id}>
       <CardHeader>
         <div className="flex w-full items-center justify-between">
-          <p className="font-bold">{displayDate}</p>
+          <p>{displayDate}</p>
           <AvatarGroup size="sm" isBordered max={4}>
             {match.players.map((player) => (
               <Avatar key={player.id} />
@@ -33,7 +33,7 @@ export function MatchCard({ match, userId }: { match: Match; userId: string }) {
         <div className="flex items-center">
           <div className="flex grow flex-col items-center px-8">
             <div className="mb-2 text-tiny text-foreground-light">平均着順</div>
-            <div className="text-large font-bold">
+            <div className="text-large">
               {data.averageRank?.toFixed(2) ?? "なし"}
             </div>
           </div>
@@ -47,7 +47,7 @@ export function MatchCard({ match, userId }: { match: Match; userId: string }) {
                   {match.rule.playersCount === 4 && <th>4位</th>}
                 </tr>
               </thead>
-              <tbody className="text-small font-bold">
+              <tbody className="text-small">
                 <tr>
                   <td>{data.rankCounts[0]}</td>
                   <td>{data.rankCounts[1]}</td>

diff --git a/...routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameRow/index.tsx b/...routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameRow/index.tsx
@@ -5,25 +5,26 @@ import { GameUpdateModal, useGameUpdateModal } from "../GameUpdateModal";
 
 export function GameRow({
   index,
-  className,
   children,
   matchId,
   gameId,
+  style,
 }: {
   index: number;
-  className?: string;
   children: React.ReactNode;
   matchId: string;
   gameId: string;
+  style?: React.CSSProperties;
 }) {
   const gameUpdateModal = useGameUpdateModal();
   return (
     <>
       <Card
         isPressable
         isHoverable
-        className={className}
+        className="bg-transparent shadow-none"
         onPress={gameUpdateModal.onOpen}
+        style={style}
       >
         {children}
       </Card>