Merge pull request #10 from RuiOkazaki/chore/TSK-44

[TSK-44]デモで作成したファイル群をFSDアーキテクチャに沿うようにリファクタリングする

src/app/game/layout.tsx → app/game/layout.tsx

@@ -1,4 +1,4 @@
-import { GameModeLayout } from '@/shared/layout/game-mode-layout';
+import { GameModeLayout } from '@/widget/layout';
 
 export default function Layout({
   children,

src/app/layout.tsx → app/layout.tsx

@@ -1,7 +1,7 @@
-import { Auth0Provider } from '@/shared/libs/auth0/provider';
-import { JotaiProvider } from '@/shared/libs/jotai/provider';
+import '@/application/globals.css';
+import { Auth0Provider } from '@/shared/libs/auth0';
+import { JotaiProvider } from '@/shared/libs/jotai';
 import type { Metadata } from 'next';
-import './globals.css';
 
 export const metadata: Metadata = {
   title: 'Create Next App',

biome.json

@@ -71,7 +71,7 @@
   },
   "overrides": [
     {
-      "include": ["src/shared/libs/gql-codegen/generated/"],
+      "include": ["src/shared/libs/gql-codegen/api/generated/"],
       "linter": {
         "rules": {
           "suspicious": {
@@ -84,7 +84,7 @@
       }
     },
     {
-      "include": ["src/shared/libs/pathpida/$path.ts"],
+      "include": ["src/shared/libs/pathpida/lib/$path.ts"],
       "linter": {
         "rules": {
           "style": {

package.json

@@ -5,8 +5,8 @@
   "scripts": {
     "dev": "run-p dev:*",
     "dev:next": "next dev",
-    "dev:path": "pathpida --ignorePath .gitignore --output ./src/shared/libs/pathpida --watch",
-    "build": "pathpida --ignorePath .gitignore --output ./src/shared/libs/pathpida && next build",
+    "dev:path": "pathpida --ignorePath .gitignore --output ./src/shared/libs/pathpida/lib --watch",
+    "build": "pathpida --ignorePath .gitignore --output ./src/shared/libs/pathpida/lib && next build",
     "start": "next start",
     "test": "vitest run",
     "test:watch": "vitest watch",
@@ -18,7 +18,7 @@
     "typecheck": "tsc --noEmit",
     "lefthook:sync": "lefthook install",
     "add:component": "bunx shadcn-ui@latest add",
-    "gql:codegen": "graphql-codegen --config ./src/shared/libs/gql-codegen/config.ts && bun format:fix && bun lint:fix"
+    "gql:codegen": "graphql-codegen --config ./src/shared/libs/gql-codegen/api/config.ts && bun format:fix && bun lint:fix"
   },
   "dependencies": {
     "@auth0/nextjs-auth0": "^3.5.0",

src/entitie/dartsboard/stores/atoms.ts

@@ -1,4 +1,4 @@
-import type { Darts_Positions } from '@/shared/libs/gql-codegen/generated/graphql';
+import type { Darts_Positions } from '@/shared/libs/gql-codegen/api/generated/graphql';
 import { atom } from 'jotai';
 
 export type ConnectStatus = 'disconnected' | 'connecting' | 'connected';

src/page/game-configure/index.ts

@@ -0,0 +1,2 @@
+export * from './ui';
+export { default } from './ui';

src/page/game-configure/ui/difficulty-selector-tabs/difficulty-selector-tabs.tsx

@@ -3,7 +3,7 @@
 import * as TabsPrimitive from '@radix-ui/react-tabs';
 import * as React from 'react';
 
-import { cn } from '@/shared/libs/shadcn/utils';
+import { cn } from '@/shared/libs/shadcn';
 import { Typography } from '@/shared/ui/typography';
 
 const DifficultySelectorTabs = TabsPrimitive.Root;

src/page/game-configure/ui/index.ts

@@ -0,0 +1,2 @@
+export * from './screen';
+export { default } from './screen';

src/page/game-configure/ui/screen/index.ts

@@ -0,0 +1,2 @@
+export * from './screen';
+export { default } from './screen';

src/page/game-configure/index.tsx → src/page/game-configure/ui/screen/screen.tsx

@@ -1,9 +1,9 @@
 'use client';
 
-import { pagesPath } from '@/shared/libs/pathpida/$path';
+import { pagesPath } from '@/shared/libs/pathpida';
 import { Button } from '@/shared/ui/button';
 import { Typography } from '@/shared/ui/typography';
-import { GameHeader } from '@/widget/game-header';
+import { GameHeader } from '@/widget/ui/game-header';
 import { HomeIcon, MenuIcon } from 'lucide-react';
 import Link from 'next/link';
 import { useSearchParams } from 'next/navigation';
@@ -12,7 +12,7 @@ import {
   DifficultySelectorTabs,
   DifficultySelectorTabsList,
   DifficultySelectorTabsTrigger,
-} from './ui/difficulty-selector-tabs';
+} from '../difficulty-selector-tabs';
 
 export type Query = {
   game_name: 'target-bull' | 'cr-number';

src/page/game-home/index.ts

@@ -0,0 +1,2 @@
+export * from './ui';
+export { default } from './ui';

src/page/game-home/ui/index.ts

@@ -0,0 +1,2 @@
+export * from './screen';
+export { default } from './screen';

src/page/game-home/ui/screen/index.ts

@@ -0,0 +1,2 @@
+export * from './screen';
+export { default } from './screen';

src/page/game-home/index.tsx → src/page/game-home/ui/screen/screen.tsx

@@ -1,10 +1,10 @@
 'use client';
 
 import { useConnectDartsliveHome } from '@/entitie/dartsboard/hooks/use-connect-dartslive-home';
-import { pagesPath } from '@/shared/libs/pathpida/$path';
+import { pagesPath } from '@/shared/libs/pathpida';
 import { Button } from '@/shared/ui/button';
 import { Typography } from '@/shared/ui/typography';
-import { GameHeader } from '@/widget/game-header';
+import { GameHeader } from '@/widget/ui/game-header';
 import {
   BluetoothIcon,
   BluetoothOffIcon,

src/page/game-play/index.ts

@@ -0,0 +1,2 @@
+export * from './ui';
+export { default } from './ui';

src/page/game-play/ui/index.ts

@@ -0,0 +1,2 @@
+export * from './screen';
+export { default } from './screen';

src/page/game-play/ui/screen/index.ts

@@ -0,0 +1,2 @@
+export * from './screen';
+export { default } from './screen';

src/page/game-play/index.tsx → src/page/game-play/ui/screen/screen.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useConnectDartsliveHome } from '@/entitie/dartsboard/hooks/use-connect-dartslive-home';
-import { pagesPath } from '@/shared/libs/pathpida/$path';
+import { pagesPath } from '@/shared/libs/pathpida';
 import { Button } from '@/shared/ui/button';
 import { ScrollArea } from '@/shared/ui/scroll-area';
 import { Separator } from '@/shared/ui/separator';

src/page/game-result/index.ts

@@ -0,0 +1,2 @@
+export * from './ui';
+export { default } from './ui';

src/page/game-result/ui/index.ts

@@ -0,0 +1,2 @@
+export * from './screen';
+export { default } from './screen';

src/page/game-result/ui/screen/index.ts

@@ -0,0 +1,2 @@
+export * from './screen';
+export { default } from './screen';

src/page/game-result/index.tsx → src/page/game-result/ui/screen/screen.tsx

@@ -1,10 +1,10 @@
 'use client';
 
 import { useConnectDartsliveHome } from '@/entitie/dartsboard/hooks/use-connect-dartslive-home';
-import { pagesPath } from '@/shared/libs/pathpida/$path';
+import { pagesPath } from '@/shared/libs/pathpida';
 import { Button } from '@/shared/ui/button';
 import { Typography } from '@/shared/ui/typography';
-import { GameHeader } from '@/widget/game-header';
+import { GameHeader } from '@/widget/ui/game-header';
 import { HomeIcon, MenuIcon, RotateCcwIcon } from 'lucide-react';
 import Link from 'next/link';
 import { useMemo } from 'react';

src/page/home/index.ts

@@ -0,0 +1,2 @@
+export * from './ui';
+export { default } from './ui';

src/page/home/ui/demo/date-range-picker.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { cn } from '@/shared/libs/shadcn/utils';
+import { cn } from '@/shared/libs/shadcn';
 import { Button } from '@/shared/ui/button';
 import { Calendar } from '@/shared/ui/calendar';
 import { Popover, PopoverContent, PopoverTrigger } from '@/shared/ui/popover';

src/page/home/ui/demo/game-play-statistics-chart.tsx

@@ -1,4 +1,4 @@
-import { ApexchartsBase } from '@/shared/libs/apexcharts/apexcharts-base';
+import { ApexchartsBase } from '@/shared/libs/apexcharts';
 import { format } from '@formkit/tempo';
 import type { FC } from 'react';
 

src/page/home/ui/demo/main-nav.tsx

@@ -1,4 +1,4 @@
-import { cn } from '@/shared/libs/shadcn/utils';
+import { cn } from '@/shared/libs/shadcn';
 import Link from 'next/link';
 
 export function MainNav({

src/page/home/ui/demo/recent-30-days-mpr.tsx

@@ -1,4 +1,4 @@
-import { ApexchartsBase } from '@/shared/libs/apexcharts/apexcharts-base';
+import { ApexchartsBase } from '@/shared/libs/apexcharts';
 import { format } from '@formkit/tempo';
 import type { FC } from 'react';
 

src/page/home/ui/demo/recent-30-days-ppr.tsx

@@ -1,4 +1,4 @@
-import { ApexchartsBase } from '@/shared/libs/apexcharts/apexcharts-base';
+import { ApexchartsBase } from '@/shared/libs/apexcharts';
 import { format } from '@formkit/tempo';
 import type { FC } from 'react';
 

src/page/home/ui/demo/recent-30-days-rating.tsx

@@ -1,4 +1,4 @@
-import { ApexchartsBase } from '@/shared/libs/apexcharts/apexcharts-base';
+import { ApexchartsBase } from '@/shared/libs/apexcharts';
 import { format } from '@formkit/tempo';
 import type { FC } from 'react';
 

src/page/home/ui/demo/team-switcher.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { cn } from '@/shared/libs/shadcn/utils';
+import { cn } from '@/shared/libs/shadcn';
 import { Avatar, AvatarFallback, AvatarImage } from '@/shared/ui/avatar';
 import { Button } from '@/shared/ui/button';
 import {

src/page/home/ui/index.ts

@@ -0,0 +1,2 @@
+export * from './screen';
+export { default } from './screen';

src/page/home/ui/rating-charts/rating-charts.tsx

@@ -1,5 +1,5 @@
-import { ApexchartsBase } from '@/shared/libs/apexcharts/apexcharts-base';
-import { cn } from '@/shared/libs/shadcn/utils';
+import { ApexchartsBase } from '@/shared/libs/apexcharts';
+import { cn } from '@/shared/libs/shadcn';
 import { Typography } from '@/shared/ui/typography';
 import { ChevronDownIcon, ChevronUpIcon } from 'lucide-react';
 import type { FC } from 'react';

src/page/home/ui/screen/index.ts

@@ -0,0 +1,2 @@
+export * from './screen';
+export { default } from './screen';

src/page/home/index.tsx → src/page/home/ui/screen/screen.tsx

@@ -1,12 +1,12 @@
-import { pagesPath } from '@/shared/libs/pathpida/$path';
+import { pagesPath } from '@/shared/libs/pathpida';
 import { Button } from '@/shared/ui/button';
 import { Card, CardContent, CardHeader, CardTitle } from '@/shared/ui/card';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/shared/ui/tabs';
 import Link from 'next/link';
-import { GamePlayStatisticsChart } from './ui/demo/game-play-statistics-chart';
-import { Recent30DaysMPR } from './ui/demo/recent-30-days-mpr';
-import { Recent30DaysPPR } from './ui/demo/recent-30-days-ppr';
-import { Recent30DaysRating } from './ui/demo/recent-30-days-rating';
+import { GamePlayStatisticsChart } from '../demo/game-play-statistics-chart';
+import { Recent30DaysMPR } from '../demo/recent-30-days-mpr';
+import { Recent30DaysPPR } from '../demo/recent-30-days-ppr';
+import { Recent30DaysRating } from '../demo/recent-30-days-rating';
 
 export default function Home() {
   return (

src/shared/libs/apexcharts/index.ts

@@ -0,0 +1 @@
+export * from './ui';

src/shared/libs/apexcharts/apexcharts-base.tsx → src/shared/libs/apexcharts/ui/apexcharts-base.tsx

@@ -1,11 +1,12 @@
 'use client';
 
 import dynamic from 'next/dynamic';
-
+import type { FC } from 'react';
 import type { Props as ApexChartsProps } from 'react-apexcharts';
+
 const ApexCharts = dynamic(() => import('react-apexcharts'), { ssr: false });
 
-export const ApexchartsBase = (props: ApexChartsProps) => {
+export const ApexchartsBase: FC<ApexChartsProps> = props => {
   return (
     <>
       <ApexCharts {...props} />

src/shared/libs/apexcharts/ui/index.ts

@@ -0,0 +1 @@
+export { ApexchartsBase } from './apexcharts-base';

src/shared/libs/auth0/index.ts

@@ -0,0 +1 @@
+export * from './ui';

src/shared/libs/auth0/ui/index.ts

@@ -0,0 +1 @@
+export { Auth0Provider } from './provider';

src/shared/libs/gql-codegen/config.ts → src/shared/libs/gql-codegen/api/config.ts

@@ -14,7 +14,7 @@ const config: CodegenConfig = {
   ],
   documents: ['src/**/*.tsx', 'src/**/*.ts', 'src/**/*.graphql'],
   generates: {
-    'src/shared/libs/gql-codegen/generated/': {
+    'src/shared/libs/gql-codegen/api/generated/': {
       preset: 'client',
       config: {
         gqlTagName: 'graphql',
@@ -32,7 +32,7 @@ const config: CodegenConfig = {
         useTypeImports: true,
       },
     },
-    'src/shared/libs/gql-codegen/generated/sdk.ts': {
+    'src/shared/libs/gql-codegen/api/generated/sdk.ts': {
       plugins: [
         {
           add: {

src/shared/libs/gql-codegen/api/index.ts

@@ -0,0 +1 @@
+export { graphqlSdk } from './graphql-sdk';

src/shared/libs/gql-codegen/index.ts

@@ -0,0 +1 @@
+export * from './api';

src/shared/libs/jotai/index.ts

@@ -0,0 +1 @@
+export * from './ui';

src/shared/libs/jotai/ui/index.ts

@@ -0,0 +1 @@
+export { JotaiProvider } from './provider';

src/shared/libs/pathpida/index.ts

@@ -0,0 +1 @@
+export * from './lib';

src/shared/libs/pathpida/$path.ts → src/shared/libs/pathpida/lib/$path.ts

@@ -1,5 +1,5 @@
-import type { Query as Query_17iukn9 } from '../../../app/game/configure/page';
-import type { Query as Query_1iv4wk1 } from '../../../app/game/play/page';
+import type { Query as Query_18ddyjz } from '../../../../../app/game/configure/page';
+import type { Query as Query_ibwa07 } from '../../../../../app/game/play/page';
 
 const buildSuffix = (url?: {
   query?: Record<string, string>;
@@ -15,15 +15,15 @@ const buildSuffix = (url?: {
 export const pagesPath = {
   game: {
     configure: {
-      $url: (url: { query: Query_17iukn9; hash?: string }) => ({
+      $url: (url: { query: Query_18ddyjz; hash?: string }) => ({
         pathname: '/game/configure' as const,
         query: url.query,
         hash: url.hash,
         path: `/game/configure${buildSuffix(url)}`,
       }),
     },
     play: {
-      $url: (url: { query: Query_1iv4wk1; hash?: string }) => ({
+      $url: (url: { query: Query_ibwa07; hash?: string }) => ({
         pathname: '/game/play' as const,
         query: url.query,
         hash: url.hash,

src/shared/libs/pathpida/lib/index.ts

@@ -0,0 +1 @@
+export { pagesPath } from './$path';

src/shared/libs/shadcn/index.ts

@@ -0,0 +1 @@
+export * from './lib';

src/shared/libs/shadcn/utils.test.ts → src/shared/libs/shadcn/lib/cn.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'vitest';
-import { cn } from './utils';
+import { cn } from './cn';
 
 describe('cn', () => {
   test('配列を受け取り合成することができる', () => {

src/shared/libs/shadcn/lib/index.ts

@@ -0,0 +1 @@
+export { cn } from './cn';

src/shared/ui/avatar.tsx

@@ -3,7 +3,7 @@
 import * as AvatarPrimitive from '@radix-ui/react-avatar';
 import * as React from 'react';
 
-import { cn } from '@/shared/libs/shadcn/utils';
+import { cn } from '@/shared/libs/shadcn';
 
 const Avatar = React.forwardRef<
   React.ElementRef<typeof AvatarPrimitive.Root>,

src/shared/ui/button.tsx

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

src/shared/ui/calendar.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { cn } from '@/shared/libs/shadcn/utils';
+import { cn } from '@/shared/libs/shadcn';
 import { buttonVariants } from '@/shared/ui/button';
 import { ChevronLeft, ChevronRight } from 'lucide-react';
 import type * as React from 'react';

src/shared/ui/card.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { cn } from '@/shared/libs/shadcn/utils';
+import { cn } from '@/shared/libs/shadcn';
 
 const Card = React.forwardRef<
   HTMLDivElement,

src/shared/ui/command.tsx

@@ -5,7 +5,7 @@ import { Command as CommandPrimitive } from 'cmdk';
 import { Search } from 'lucide-react';
 import * as React from 'react';
 
-import { cn } from '@/shared/libs/shadcn/utils';
+import { cn } from '@/shared/libs/shadcn';
 import { Dialog, DialogContent } from '@/shared/ui/dialog';
 
 const Command = React.forwardRef<

src/shared/ui/dialog.tsx

@@ -4,7 +4,7 @@ import * as DialogPrimitive from '@radix-ui/react-dialog';
 import { X } from 'lucide-react';
 import * as React from 'react';
 
-import { cn } from '@/shared/libs/shadcn/utils';
+import { cn } from '@/shared/libs/shadcn';
 
 const Dialog = DialogPrimitive.Root;
 

src/shared/ui/dropdown-menu.tsx

@@ -4,7 +4,7 @@ import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';
 import { Check, ChevronRight, Circle } from 'lucide-react';
 import * as React from 'react';
 
-import { cn } from '@/shared/libs/shadcn/utils';
+import { cn } from '@/shared/libs/shadcn';
 
 const DropdownMenu = DropdownMenuPrimitive.Root;