Merge pull request #289 from GiganticMinecraft/refactor/dir

ディレクトリ構成を変更

src/app/admin/page.tsx

@@ -1,8 +1,8 @@
-import { getAllAnswers } from '@/api/form';
-import { getCachedToken } from '@/api/mcToken';
-import DataTable from '@/components/dashboard';
-import DashboardMenu from '@/components/dashboardMenu';
+import DataTable from '@/components/Dashboard';
+import DashboardMenu from '@/components/DashboardMenu';
 import NavBar from '@/components/NavBar';
+import { getAllAnswers } from '@/features/form/api/form';
+import { getCachedToken } from '@/features/user/api/mcToken';
 import styles from '../page.module.css';
 
 const Home = async () => {

src/app/forms/[formId]/page.tsx

@@ -1,6 +1,6 @@
-import { getForm } from '@/api/form';
-import { getCachedToken } from '@/api/mcToken';
-import AnswerForm from '@/components/AnswerForm';
+import { getForm } from '@/features/form/api/form';
+import AnswerForm from '@/features/form/components/AnswerForm';
+import { getCachedToken } from '@/features/user/api/mcToken';
 
 const Home = async ({ params }: { params: { formId: number } }) => {
   const token = getCachedToken() ?? '';

src/app/forms/page.tsx

@@ -1,6 +1,6 @@
-import { getForms } from '@/api/form';
-import { getCachedToken } from '@/api/mcToken';
-import FormList from '@/components/FormList';
+import { getForms } from '@/features/form/api/form';
+import FormList from '@/features/form/components/FormList';
+import { getCachedToken } from '@/features/user/api/mcToken';
 
 const Home = async () => {
   const token = getCachedToken() ?? '';

src/app/layout.tsx

@@ -1,10 +1,10 @@
 import './globals.css';
 import { Inter } from 'next/font/google';
-import { AuthenticatedTemplate } from '@/components/AuthenticatedTemplate';
-import { MsalProvider } from '@/components/MsalProvider';
 import NavBar from '@/components/NavBar';
-import { NeedToSignin } from '@/components/NeedToSignin';
-import { UnauthenticatedTemplate } from '@/components/UnauthenticatedTemplate';
+import { AuthenticatedTemplate } from '@/features/user/components/AuthenticatedTemplate';
+import { MsalProvider } from '@/features/user/components/MsalProvider';
+import { NeedToSignin } from '@/features/user/components/NeedToSignin';
+import { UnauthenticatedTemplate } from '@/features/user/components/UnauthenticatedTemplate';
 import styles from './page.module.css';
 import type { Metadata } from 'next';
 import type { ReactNode } from 'react';

src/components/dashboard.tsx → src/components/Dashboard.tsx

@@ -1,7 +1,7 @@
 'use client';
 import { DataGrid, type GridColDef } from '@mui/x-data-grid';
 import * as React from 'react';
-import type { BatchAnswer } from '@/schemas/formSchema';
+import type { BatchAnswer } from '@/features/form/types/formSchema';
 
 const columns: GridColDef[] = [
   { field: 'category', headerName: '種別', width: 200 },

src/components/Menu.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { Box, Button, styled, Stack, Typography } from '@mui/material';
-import { Link } from './link';
+import { Link } from './Link';
 
 const Item = styled(Button)(({ theme }) => ({
   backgroundColor:

src/components/NavBar.tsx

@@ -1,10 +1,10 @@
 import MenuIcon from '@mui/icons-material/Menu';
 import { Box, AppBar, Toolbar, IconButton, Typography } from '@mui/material';
-import { AuthenticatedTemplate } from './AuthenticatedTemplate';
-import { Link } from './link';
-import { SigninButton } from './SigninButton';
-import { SignoutButton } from './SignoutButton';
-import { UnauthenticatedTemplate } from './UnauthenticatedTemplate';
+import { Link } from './Link';
+import { AuthenticatedTemplate } from '../features/user/components/AuthenticatedTemplate';
+import { SigninButton } from '../features/user/components/SigninButton';
+import { SignoutButton } from '../features/user/components/SignoutButton';
+import { UnauthenticatedTemplate } from '../features/user/components/UnauthenticatedTemplate';
 
 const NavBar = () => {
   return (

src/api/form.ts → src/features/form/api/form.ts

@@ -4,8 +4,8 @@ import {
   batchAnswersSchema,
   formSchema,
   formsSchema,
-} from '@/schemas/formSchema';
-import type { BatchAnswer, Form } from '@/schemas/formSchema';
+} from '../types/formSchema';
+import type { BatchAnswer, Form } from '../types/formSchema';
 
 export const getForms = async (token: string) => {
   const response = await fetch('http://localhost:9000/forms', {

src/components/AnswerForm.tsx → src/features/form/components/AnswerForm.tsx

@@ -19,13 +19,13 @@ import {
   Divider,
   Button,
   Typography,
+  Link,
 } from '@mui/material';
 import { useState } from 'react';
 import { useForm } from 'react-hook-form';
-import { postAnswers } from '@/api/form';
-import { getCachedToken } from '@/api/mcToken';
-import { Link } from './link';
-import type { Form, FormQuestion } from '@/schemas/formSchema';
+import { getCachedToken } from '@/features/user/api/mcToken';
+import { postAnswers } from '../api/form';
+import type { Form, FormQuestion } from '../types/formSchema';
 
 interface Props {
   form: Form;

src/components/FormList.tsx → src/features/form/components/FormList.tsx

@@ -14,8 +14,8 @@ import {
 import dayjs, { extend } from 'dayjs';
 import timezone from 'dayjs/plugin/timezone';
 import utc from 'dayjs/plugin/utc';
-import { Link } from './link';
-import type { Form } from '@/schemas/formSchema';
+import { Link } from '@/components/Link';
+import type { Form } from '../types/formSchema';
 
 extend(timezone);
 extend(utc);

src/api/login.ts → src/features/user/api/login.ts

@@ -1,10 +1,10 @@
 'use server';
 
 import {
+  xboxLiveServiceTokenResponseSchema,
   minecraftAccessTokenResponseSchema,
   minecraftProfileResponseSchema,
-  xboxLiveServiceTokenResponseSchema,
-} from '@/schemas/loginSchema';
+} from '../types/loginSchema';
 
 export const acquireXboxLiveToken = async (token: string) => {
   const URL = 'https://user.auth.xboxlive.com/user/authenticate';

src/components/AuthenticatedTemplate.tsx → src/features/user/components/AuthenticatedTemplate.tsx

@@ -1,4 +1,4 @@
-import { getCachedToken } from '@/api/mcToken';
+import { getCachedToken } from '../api/mcToken';
 import type { ReactNode } from 'react';
 
 type Props = { children: ReactNode };

src/components/MsalProvider.tsx → src/features/user/components/MsalProvider.tsx

@@ -2,7 +2,7 @@
 
 import { PublicClientApplication } from '@azure/msal-browser';
 import { MsalProvider as MsalLibProvider } from '@azure/msal-react';
-import { msalConfig } from '@/authConfig';
+import { msalConfig } from '../const/authConfig';
 import type { ReactNode } from 'react';
 
 const msalInstance = new PublicClientApplication(msalConfig);

src/components/SigninButton.tsx → src/features/user/components/SigninButton.tsx

@@ -7,9 +7,9 @@ import {
   acquireMinecraftAccessToken,
   acquireXboxLiveToken,
   acquireXboxServiceSecurityToken,
-} from '@/api/login';
-import { saveTokenToCache } from '@/api/mcToken';
-import { loginRequest } from '@/authConfig';
+} from '../api/login';
+import { saveTokenToCache } from '../api/mcToken';
+import { loginRequest } from '../const/authConfig';
 
 export const SigninButton = () => {
   const { instance } = useMsal();

src/components/SignoutButton.tsx → src/features/user/components/SignoutButton.tsx

@@ -3,7 +3,7 @@
 import { useMsal } from '@azure/msal-react';
 import { Button } from '@mui/material';
 import { useRouter } from 'next/navigation';
-import { clearCachedToken } from '@/api/mcToken';
+import { clearCachedToken } from '../api/mcToken';
 
 export const SignoutButton = () => {
   const { instance } = useMsal();

src/components/UnauthenticatedTemplate.tsx → src/features/user/components/UnauthenticatedTemplate.tsx

@@ -1,4 +1,4 @@
-import { getCachedToken } from '@/api/mcToken';
+import { getCachedToken } from '../api/mcToken';
 import type { ReactNode } from 'react';
 
 type Props = { children: ReactNode };

src/middleware.ts

@@ -1,5 +1,5 @@
 import { NextResponse } from 'next/server';
-import { getCachedToken } from './api/mcToken';
+import { getCachedToken } from '@/features/user/api/mcToken';
 import type { NextRequest } from 'next/server';
 
 export const middleware = (request: NextRequest) => {