Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/apis/auth/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import axiosClientHelper from '@/utils/network/axiosClientHelper';
import { LoginFormData, LoginResponse, loginResponseSchema, PutPasswordFormData } from './types';
import { safeResponse } from '@/utils/network/safeResponse';
import { LoginFormData, LoginResponse, loginResponseSchema, PutPasswordFormData } from '@/apis/auth/types';

/**
* login
Expand Down
4 changes: 2 additions & 2 deletions src/apis/auth/queries.tsx → src/apis/auth/queries.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { login, logout, putPassword } from '.';
import { LoginFormData, PutPasswordFormData } from './types';
import { login, logout, putPassword } from '@/apis/auth';
import { LoginFormData, PutPasswordFormData } from '@/apis/auth/types';

export const useLogin = () => {
return useMutation({
Expand Down
4 changes: 2 additions & 2 deletions src/apis/cards/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import axiosClientHelper from '@/utils/network/axiosClientHelper';
import { Card, CardRequest, cardSchema, CardsResponse, cardsResponseSchema, GetCardsParams } from './types';
import { Column } from '../columns/types';
import { safeResponse } from '@/utils/network/safeResponse';
import { Card, CardRequest, cardSchema, CardsResponse, cardsResponseSchema, GetCardsParams } from '@/apis/cards/types';
import { Column } from '@/apis/columns/types';

/**
* card 생성
Expand Down
6 changes: 3 additions & 3 deletions src/apis/cards/queries.tsx → src/apis/cards/queries.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use client';

import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { deleteCard, getCard, getCards, moveCard, postCard, putCard } from '.';
import { Card, CardRequest, CardsResponse, GetCardsParams } from './types';
import { Column } from '../columns/types';
import { deleteCard, getCard, getCards, moveCard, postCard, putCard } from '@/apis/cards';
import { Card, CardRequest, CardsResponse, GetCardsParams } from '@/apis/cards/types';
import { Column } from '@/apis/columns/types';

export const useCardsQuery = (params: GetCardsParams) => {
return useInfiniteQuery({
Expand Down
2 changes: 1 addition & 1 deletion src/apis/cards/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import isValidDate from '@/utils/isValidDate';
import { z } from 'zod';
import isValidDate from '@/utils/isValidDate';

const IMAGE_URL = 'https://sprint-fe-project.s3.ap-northeast-2.amazonaws.com/taskify/task_image/';

Expand Down
2 changes: 1 addition & 1 deletion src/apis/columns/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import axiosClientHelper from '@/utils/network/axiosClientHelper';
import { CardImageForm, CardImageResponse, cardImageResponseSchema, Column, ColumnForm, columnSchema, ColumnsResponse, columnsResponseSchema, GetColumnsParams } from './types';
import { safeResponse } from '@/utils/network/safeResponse';
import { CardImageForm, CardImageResponse, cardImageResponseSchema, Column, ColumnForm, columnSchema, ColumnsResponse, columnsResponseSchema, GetColumnsParams } from '@/apis/columns/types';

/**
* column 생성
Expand Down
4 changes: 2 additions & 2 deletions src/apis/columns/queries.tsx → src/apis/columns/queries.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use client';

import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { deleteColumn, getColumns, postColumn, putColumn } from '.';
import { ColumnForm } from './types';
import { deleteColumn, getColumns, postColumn, putColumn } from '@/apis/columns';
import { ColumnForm } from '@/apis/columns/types';

export const useColumnsQuery = (dashboardId: number) => {
return useQuery({
Expand Down
2 changes: 1 addition & 1 deletion src/apis/comments/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import axiosClientHelper from '@/utils/network/axiosClientHelper';
import { Comment, CommentForm, commentSchema, CommentsResponse, commentsResponseSchema, GetCommentsParams, PutCommentForm } from './types';
import { safeResponse } from '@/utils/network/safeResponse';
import { Comment, CommentForm, commentSchema, CommentsResponse, commentsResponseSchema, GetCommentsParams, PutCommentForm } from '@/apis/comments/types';

/**
* comment 생성
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { InfiniteData, useInfiniteQuery, useMutation, useQueryClient } from '@tanstack/react-query';
import { getComments, postComment, putComment, deleteComment } from '.';
import { getComments, postComment, putComment, deleteComment } from '@/apis/comments';
import type { CommentForm, CommentsResponse, GetCommentsParams, PutCommentForm } from '@/apis/comments/types';

export const useCommentsQuery = (params: GetCommentsParams) => {
Expand Down
4 changes: 2 additions & 2 deletions src/apis/dashboards/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import axiosClientHelper from '@/utils/network/axiosClientHelper';
import { safeResponse } from '@/utils/network/safeResponse';
import {
Dashboard,
DashboardInvitation,
Expand All @@ -14,8 +15,7 @@ import {
InviteDashboardRequest,
dashboardInvitationSchema,
CancelInviteDashboardRequest,
} from './types';
import { safeResponse } from '@/utils/network/safeResponse';
} from '@/apis/dashboards/types';

/**
* dashboard 생성
Expand Down
12 changes: 10 additions & 2 deletions src/apis/dashboards/queries.tsx → src/apis/dashboards/queries.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
'use client';

import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { cancelDashboardInvitation, createDashboard, deleteDashboard, getDashboardDetails, getDashboardInvitations, getDashboards, inviteDashboard, updateDashboard } from '.';
import { CancelInviteDashboardRequest, CreateDashboardRequest, Dashboard, GetDashboardInvitationsRequest, GetDashboardsRequest, InviteDashboardRequest, UpdateDashboardRequest } from './types';
import { cancelDashboardInvitation, createDashboard, deleteDashboard, getDashboardDetails, getDashboardInvitations, getDashboards, inviteDashboard, updateDashboard } from '@/apis/dashboards';
import {
CancelInviteDashboardRequest,
CreateDashboardRequest,
Dashboard,
GetDashboardInvitationsRequest,
GetDashboardsRequest,
InviteDashboardRequest,
UpdateDashboardRequest,
} from '@/apis/dashboards/types';

export const useDashboardsQuery = (params: GetDashboardsRequest) => {
return useQuery({
Expand Down
2 changes: 1 addition & 1 deletion src/apis/dashboards/types.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { z } from 'zod';
import { userSchema } from '@/apis/users/types';
import { DASHBOARD_FORM_ERROR_MESSAGE, DASHBOARD_FORM_VALID_LENGTH } from '@/constants/dashboard';
import { DEFAULT_COLORS } from '@/constants/colors';
import { userSchema } from '@/apis/users/types';
import { BasePagination, NavigationMethod } from '@/types/common';

export const dashboardSchema = z.object({
Expand Down
4 changes: 2 additions & 2 deletions src/apis/invitations/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import axiosClientHelper from '@/utils/network/axiosClientHelper';
import { GetMyInvitationsRequest, MyInvitations, myInvitationsSchema, RespondToInvitationRequest } from './types';
import { DashboardInvitation, dashboardInvitationSchema } from '../dashboards/types';
import { safeResponse } from '@/utils/network/safeResponse';
import { GetMyInvitationsRequest, MyInvitations, myInvitationsSchema, RespondToInvitationRequest } from '@/apis/invitations/types';
import { DashboardInvitation, dashboardInvitationSchema } from '@/apis/dashboards/types';

/**
* 내가 받은 초대 목록 조회
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use client';

import { useInfiniteQuery, useMutation, useQueryClient } from '@tanstack/react-query';
import { getMyInvitations, respondToInvitation } from '.';
import { GetMyInvitationsRequest, RespondToInvitationRequest } from './types';
import { getMyInvitations, respondToInvitation } from '@/apis/invitations/';
import { GetMyInvitationsRequest, RespondToInvitationRequest } from '@/apis/invitations/types';

export const useMyInvitationsQuery = (params: GetMyInvitationsRequest) => {
return useInfiniteQuery({
Expand Down
2 changes: 1 addition & 1 deletion src/apis/invitations/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { z } from 'zod';
import { DashboardInvitation, dashboardInvitationSchema } from '../dashboards/types';
import { DashboardInvitation, dashboardInvitationSchema } from '@/apis/dashboards/types';
import { BaseCursor } from '@/types/common';

export type GetMyInvitationsRequest = Partial<BaseCursor> & {
Expand Down
2 changes: 1 addition & 1 deletion src/apis/members/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import axiosClientHelper from '@/utils/network/axiosClientHelper';
import { DeleteMemberRequest, GetMembersRequest, Members, membersSchema } from './types';
import { safeResponse } from '@/utils/network/safeResponse';
import { DeleteMemberRequest, GetMembersRequest, Members, membersSchema } from '@/apis/members/types';

/**
* 대시보드 멤버 목록 조회
Expand Down
4 changes: 2 additions & 2 deletions src/apis/members/queries.tsx → src/apis/members/queries.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { deleteMember, getMembers } from '.';
import { DeleteMemberRequest, GetMembersRequest } from './types';
import { deleteMember, getMembers } from '@/apis/members/';
import { DeleteMemberRequest, GetMembersRequest } from '@/apis/members/types';

export const useMembersQuery = (params: GetMembersRequest) => {
return useQuery({
Expand Down
4 changes: 2 additions & 2 deletions src/apis/members/types.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { z } from 'zod';
import { User, userSchema } from '../users/types';
import { User, userSchema } from '@/apis//users/types';
import { Dashboard } from '@/apis/dashboards/types';
import { BasePagination } from '@/types/common';
import { Dashboard } from '../dashboards/types';

export type GetMembersRequest = BasePagination & {
dashboardId: Dashboard['id'];
Expand Down
2 changes: 1 addition & 1 deletion src/apis/users/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import axiosClientHelper from '@/utils/network/axiosClientHelper';
import { CreateProfileImageForm, ProfileImageUrlResponse, profileImageUrlResponseSchema, SignupFormData, SignupResponse, UpdateUserForm, User, userSchema } from './types';
import { safeResponse } from '@/utils/network/safeResponse';
import { CreateProfileImageForm, ProfileImageUrlResponse, profileImageUrlResponseSchema, SignupFormData, SignupResponse, UpdateUserForm, User, userSchema } from '@/apis/users/types';

/**
* signup
Expand Down
4 changes: 2 additions & 2 deletions src/apis/users/queries.tsx → src/apis/users/queries.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { createProfileImage, getUser, signup, updateUser } from '.';
import { CreateProfileImageForm, SignupFormData, UpdateUserForm } from './types';
import { createProfileImage, getUser, signup, updateUser } from '@/apis/users';
import { CreateProfileImageForm, SignupFormData, UpdateUserForm } from '@/apis/users/types';

export const useGetUser = () => {
return useQuery({
Expand Down
2 changes: 1 addition & 1 deletion src/apis/users/types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { z } from 'zod';
import { SIGNUP_FORM_VALID_LENGTH, SIGNUP_FORM_ERROR_MESSAGE } from '@/constants/auth';
import { PROFILEEDIT_FORM_VALID_LENGTH, PROFILEEDIT_FORM_ERROR_MESSAGE } from '@/constants/profileEdit';
import { PROFILEEDIT_FORM_VALID_LENGTH, PROFILEEDIT_FORM_ERROR_MESSAGE } from '@/constants/user';

interface FailResponse {
message: string;
Expand Down
2 changes: 1 addition & 1 deletion src/app/(after-login)/dashboard/[id]/edit/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ReactNode } from 'react';
import { Metadata } from 'next';
import axiosServerHelper from '@/utils/network/axiosServerHelper';
import { Dashboard, dashboardSchema } from '@/apis/dashboards/types';
import { safeResponse } from '@/utils/network/safeResponse';
import { Dashboard, dashboardSchema } from '@/apis/dashboards/types';

export async function generateMetadata({ params }: { params: Promise<{ id: string }> }): Promise<Metadata> {
const resolvedParams = await params;
Expand Down
2 changes: 1 addition & 1 deletion src/app/(after-login)/dashboard/[id]/edit/loading.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Page, PageInner } from '@/components/layout/Page';
import { CardSkeleton } from '@/components/ui/Card/Card';
import { CardSkeleton } from '@/components/ui/Card';
import { GoBackSkeleton } from '@/components/ui/Link/GoBackLink';

export default function loading() {
Expand Down
8 changes: 4 additions & 4 deletions src/app/(after-login)/dashboard/[id]/edit/page.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { redirect } from 'next/navigation';
import { Dashboard, dashboardSchema } from '@/apis/dashboards/types';
import axiosServerHelper from '@/utils/network/axiosServerHelper';
import { safeResponse } from '@/utils/network/safeResponse';
import { Page, PageInner } from '@/components/layout/Page';
import DetailModify from '@/components/dashboard/DetailModify';
import DetailMembers from '@/components/dashboard/DetailMembers';
import DetailInvited from '@/components/dashboard/DetailInvited';
import GoBackLink from '@/components/ui/Link/GoBackLink';
import DetailDelete from '@/components/dashboard/DetailDelete';
import axiosServerHelper from '@/utils/network/axiosServerHelper';
import { redirect } from 'next/navigation';
import { Dashboard, dashboardSchema } from '@/apis/dashboards/types';
import { safeResponse } from '@/utils/network/safeResponse';

export default async function DashboardEditPage({ params }: { params: Promise<{ id: string }> }) {
const id = (await params).id;
Expand Down
4 changes: 2 additions & 2 deletions src/app/(after-login)/dashboard/[id]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import ColumnList from '@/components/columns/ColumnList';
import { Metadata } from 'next';
import axiosServerHelper from '@/utils/network/axiosServerHelper';
import ColumnList from '@/components/columns/ColumnList';
import { Dashboard, dashboardSchema } from '@/apis/dashboards/types';
import axiosServerHelper from '@/utils/network/axiosServerHelper';
import { safeResponse } from '@/utils/network/safeResponse';

export async function generateMetadata({ params }: { params: Promise<{ id: string }> }): Promise<Metadata> {
Expand Down
4 changes: 2 additions & 2 deletions src/app/(after-login)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { PropsWithChildren } from 'react';
import Header from '@/components/dashboard-header/Header';
import Sidebar from '@/components/dashboard/Sidebar';
import Header from '@/components/dashboard/header/Header';
import Sidebar from '@/components/dashboard/sidebar/Sidebar';

export default function layout({ children }: PropsWithChildren) {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/app/(after-login)/mypage/loading.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Page, PageInner } from '@/components/layout/Page';
import { CardSkeleton } from '@/components/ui/Card/Card';
import { CardSkeleton } from '@/components/ui/Card';
import { GoBackSkeleton } from '@/components/ui/Link/GoBackLink';

export default function loading() {
Expand Down
4 changes: 2 additions & 2 deletions src/app/(after-login)/mypage/page.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { redirect } from 'next/navigation';
import { User, userSchema } from '@/apis/users/types';
import axiosServerHelper from '@/utils/network/axiosServerHelper';
import { safeResponse } from '@/utils/network/safeResponse';
import { Page, PageInner } from '@/components/layout/Page';
import PasswordEdit from '@/components/profile/PasswordEdit';
import ProfileEdit from '@/components/profile/ProfileEdit';
import GoBackLink from '@/components/ui/Link/GoBackLink';
import axiosServerHelper from '@/utils/network/axiosServerHelper';
import { safeResponse } from '@/utils/network/safeResponse';

export const metadata = {
title: 'Taskify - 마이페이지',
Expand Down
4 changes: 2 additions & 2 deletions src/app/api/[...endpoint]/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
*
*/

import { NextRequest, NextResponse } from 'next/server';
import { isEmpty, omit } from 'es-toolkit/compat';
import axiosServerHelper from '@/utils/network/axiosServerHelper';
import errorResponse from '@/utils/network/errorResponse';
import { isEmpty, omit } from 'es-toolkit/compat';
import { NextRequest, NextResponse } from 'next/server';

export const GET = async (request: NextRequest) => {
const url = new URL(request.url);
Expand Down
8 changes: 4 additions & 4 deletions src/app/error.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
'use client';

import Image from 'next/image';
import React from 'react';
import LogoCi from '@/assets/images/logo_ci.svg';
import LogoBi from '@/assets/images/logo_bi.svg';
import Button from '@/components/ui/Button/Button';
import Image from 'next/image';
import Link from 'next/link';
import axios from 'axios';
import Button from '@/components/ui/Button';
import LogoCi from '@/assets/images/logo_ci.svg';
import LogoBi from '@/assets/images/logo_bi.svg';

interface ErrorProps {
error: Error;
Expand Down
4 changes: 2 additions & 2 deletions src/app/not-found.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use client';

import Image from 'next/image';
import Link from 'next/link';
import { useRouter } from 'next/navigation';
import Button from '@/components/ui/Button';
import LogoCi from '@/assets/images/logo_ci.svg';
import LogoBi from '@/assets/images/logo_bi.svg';
import Button from '@/components/ui/Button/Button';
import Link from 'next/link';

export default function NotFound() {
const router = useRouter();
Expand Down
6 changes: 3 additions & 3 deletions src/components/auth/Field.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import OpendEyeIcon from '@/assets/icons/opend_eye.svg';
import ClosedEyeIcon from '@/assets/icons/closed_eye.svg';
import Image from 'next/image';
import { useState } from 'react';
import Image from 'next/image';
import { UseFormRegisterReturn } from 'react-hook-form';
import { isEmpty } from 'es-toolkit/compat';
import OpendEyeIcon from '@/assets/icons/opend_eye.svg';
import ClosedEyeIcon from '@/assets/icons/closed_eye.svg';

type Input = 'text' | 'email' | 'password';

Expand Down
4 changes: 2 additions & 2 deletions src/components/auth/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { PropsWithChildren } from 'react';
import Image from 'next/image';
import Link from 'next/link';
import LogoCi from '@/assets/images/logo_ci.svg';
import { ReactNode } from 'react';

export default function Header({ children }: { children: ReactNode }) {
export default function Header({ children }: PropsWithChildren) {
return (
<header className='flex flex-col items-center gap-[10px]'>
<Link href={'/'} className='flex flex-col items-center gap-4'>
Expand Down
10 changes: 5 additions & 5 deletions src/components/auth/LoginForm.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
'use client';

import { zodResolver } from '@hookform/resolvers/zod';
import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
import useAlert from '@/hooks/useAlert';
import { loginSchema, LoginFormData } from '@/apis/auth/types';
import { useLogin } from '@/apis/auth/queries';
import { getErrorMessage } from '@/utils/network/errorMessage';
import Field from '@/components/auth/Field';
import SubmitButton from '@/components/auth/SubmitButton';
import { LOGIN_FORM_PLACEHOLDER } from '@/constants/auth';
import { loginSchema, LoginFormData } from '@/apis/auth/types';
import useAlert from '@/hooks/useAlert';
import { useLogin } from '@/apis/auth/queries';
import { getErrorMessage } from '@/utils/errorMessage';

export default function LoginForm() {
const {
Expand Down
14 changes: 7 additions & 7 deletions src/components/auth/SignupForm.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
'use client';

import { zodResolver } from '@hookform/resolvers/zod';
import { useRouter } from 'next/navigation';
import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
import useAlert from '@/hooks/useAlert';
import { signupSchema, SignupFormData } from '@/apis/users/types';
import { useSignup } from '@/apis/users/queries';
import { getErrorMessage } from '@/utils/network/errorMessage';
import Field from '@/components/auth/Field';
import SubmitButton from '@/components/auth/SubmitButton';
import Checkbox from './Checkbox';
import Checkbox from '@/components/auth/Checkbox';
import { SIGNUP_FORM_PLACEHOLDER } from '@/constants/auth';
import { signupSchema, SignupFormData } from '@/apis/users/types';
import useAlert from '@/hooks/useAlert';
import { useRouter } from 'next/navigation';
import { useSignup } from '@/apis/users/queries';
import { getErrorMessage } from '@/utils/errorMessage';

export default function SignupForm() {
const {
Expand Down
Loading