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
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
import { useBannerQueries } from '@/hooks/queries/useMyPageQueries';
import Image from 'next/image';
import React from 'react';
import { Dispatch, SetStateAction, useState } from 'react';

Check warning on line 5 in src/app/(user-page)/my-meeting/_features/ModalUserList.tsx

View workflow job for this annotation

GitHub Actions / check

'useState' is defined but never used. Allowed unused vars must match /^_/u
import type { Member } from 'types/myMeeting';

import { Button } from '../../../components/ui/Button';
import { Button } from '../../../../components/ui/Button';

const ModalUserList = ({
memberList,
Expand All @@ -18,7 +18,7 @@
setIsUserProfileModalOpen: Dispatch<SetStateAction<boolean>>;
setIsUserListModalOpen: Dispatch<SetStateAction<boolean>>;
}) => {
const { data: currentUser, isLoading, error } = useBannerQueries();

Check warning on line 21 in src/app/(user-page)/my-meeting/_features/ModalUserList.tsx

View workflow job for this annotation

GitHub Actions / check

'error' is assigned a value but never used. Allowed unused vars must match /^_/u

Check warning on line 21 in src/app/(user-page)/my-meeting/_features/ModalUserList.tsx

View workflow job for this annotation

GitHub Actions / check

'isLoading' is assigned a value but never used. Allowed unused vars must match /^_/u

const handleProfileClick = (user: Member) => {
setSelectedUser(user);
Expand Down
2 changes: 1 addition & 1 deletion src/app/(user-page)/my-meeting/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import MeetingTypeTab from '../components/MeetingTypeTab';
import MeetingTypeTab from './_features/MeetingTypeTab';

export default function layout({
children,
Expand Down
4 changes: 2 additions & 2 deletions src/app/(user-page)/my-meeting/my/page.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import NotYet from '@/components/common/NotYet';

import Created from '../../components/Created';
import Created from '../_features/Created';
// import Joined from '../../components/Joined';
import Tab from '../../components/Tab';
import Tab from '../_features/Tab';

export default function Page({
searchParams,
Expand Down
16 changes: 8 additions & 8 deletions src/app/(user-page)/mypage/MyPageClient.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
import { useState } from 'react';

// 컴포넌트 임포트
import BasicEdit from './components/BasicEdit';
import BasicInfo from './components/BasicInfo';
import ContactEdit from './components/ContactEdit';
import ContactInfo from './components/ContactInfo';
import PasswordEdit from './components/PasswordEdit';
import PasswordInfo from './components/PasswordInfo';
import TechStackEdit from './components/TechStackEdit';
import TechStackInfo from './components/TechStackInfo';
import BasicEdit from './_features/BasicEdit';
import BasicInfo from './_features/BasicInfo';
import ContactEdit from './_features/ContactEdit';
import ContactInfo from './_features/ContactInfo';
import PasswordEdit from './_features/PasswordEdit';
import PasswordInfo from './_features/PasswordInfo';
import TechStackEdit from './_features/TechStackEdit';
import TechStackInfo from './_features/TechStackInfo';

// 기본 내보내기 (모든 섹션을 관리하는 상위 컴포넌트)
const MyPageClient = () => {
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/app/(user-page)/mypage/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import MyPageClient from './MyPageClient';
import ProfileImage from './components/ProfileImage';
import ProfileImage from './_features/ProfileImage';

export default function MyPage() {
return (
Expand Down
4 changes: 2 additions & 2 deletions src/app/login/page.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Button } from '@/components/ui/Button';
import { baseURL } from '@/lib/axios/defaultConfig';

import DummyUser from './components/DummyUser';
import LoginForm from './components/LoginForm';
import DummyUser from './_features/DummyUser';
import LoginForm from './_features/LoginForm';

export const metadata = {
metadataBase: new URL(`${baseURL}/login`),
Expand Down
14 changes: 7 additions & 7 deletions src/app/meeting/[category]/[id]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import FloatingButtonGroup from '@/components/common/FloatingButtonGroup';
import ReviewAvgCard from '@/components/common/review/ReviewAvgCard';

import BackButton from '../../components/BackButton';
import CardWrapper from '../../components/CardWrapper';
import ContentLabel from '../../components/ContextLabel';
import MeetingInfo from '../../components/MeetingInfo';
import ReviewInput from '../../components/ReviewInput';
import ReviewList from '../../components/ReviewList';
import UserInfo from '../../components/UserInfo';
import BackButton from '../../_features/BackButton';
import CardWrapper from '../../_features/CardWrapper';
import ContentLabel from '../../_features/ContextLabel';
import MeetingInfo from '../../_features/MeetingInfo';
import ReviewInput from '../../_features/ReviewInput';
import ReviewList from '../../_features/ReviewList';
import UserInfo from '../../_features/UserInfo';

export default function page({ params }: { params: { id: string } }) {
const meetingId = parseInt(params.id);
Expand Down
4 changes: 2 additions & 2 deletions src/app/meeting/[category]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import FloatingButtonGroup from '@/components/common/FloatingButtonGroup';
import { notFound } from 'next/navigation';

import MeetingList from '../components/MeetingList';
import RecommendMeeting from '../components/RecommendMeeting';
import MeetingList from '../_features/MeetingList';
import RecommendMeeting from '../_features/RecommendMeeting';

const ALLOWED_CATEGORIES = ['mogakco', 'study', 'side-project', 'hobby']; // 허용된 카테고리 리스트

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
'use client';

import SelectedTechList from '@/components/ui/tech-stack/tech-stack-components/SelectedTechList';
import TechButton from '@/components/ui/tech-stack/tech-stack-components/TechButton';
import { useDetailUserQueries } from '@/hooks/queries/useMeetingQueries';
import { getIconComponent } from '@/util/getIconDetail';
import Image from 'next/image';

import thumbnail from '../../../assets/thumbnail.png';
import SkeletonUserInfo from './skeletons/SkeletonUserInfo';

const UserInfo = ({ meetingId }: { meetingId: number }) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import {
SubmitButton,
TechStackField,
TitleField,
} from '@/app/meeting/components/form/form-filed';
} from '@/app/meeting/_features/form/form-filed';
import useMeetingFormMutation from '@/hooks/mutations/useMeetingFormMutation';
import { convertImageToBase64 } from '@/util/base64';
import { useRouter } from 'next/navigation';
import React from 'react';
import { FormProvider, useForm } from 'react-hook-form';
import { CreateMeetingPayload } from 'types/meetingForm';

import { MEETING_TYPES } from '../../constants/meeting-form/meetingConstants';
import { MEETING_TYPES } from '../../../../constants/meeting-form/meetingConstants';

interface MeetingFormProps {
mode: 'create' | 'edit';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { MEETING_TYPES } from '@/app/meeting/constants/meeting-form/meetingConstants';
import { cn } from '@/util/cn';
import { MEETING_TYPES } from 'constants/meeting-form/meetingConstants';
import { Check } from 'lucide-react';
import { Controller, useFormContext } from 'react-hook-form';
import { CreateMeetingPayload } from 'types/meetingForm';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { IMAGE_CONFIG } from '@/app/meeting/constants/meeting-form/meetingConstants';
import { Button } from '@/components/ui/Button';
import { validateImageSize, validateImageType } from '@/util/base64';
import { IMAGE_CONFIG } from 'constants/meeting-form/meetingConstants';
import { Image as ImageIcon } from 'lucide-react';
import Image from 'next/image';
import React, { useEffect, useState } from 'react';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PRIVACY_OPTIONS } from '@/app/meeting/constants/meeting-form/meetingConstants';
import { cn } from '@/util/cn';
import { PRIVACY_OPTIONS } from 'constants/meeting-form/meetingConstants';
import { Check } from 'lucide-react';
import { Controller, useFormContext } from 'react-hook-form';
import { CreateMeetingPayload } from 'types/meetingForm';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { JOIN_METHODS } from '@/app/meeting/constants/meeting-form/meetingConstants';
import { cn } from '@/util/cn';
import { JOIN_METHODS } from 'constants/meeting-form/meetingConstants';
import { Check } from 'lucide-react';
import { Controller, useFormContext } from 'react-hook-form';
import { CreateMeetingPayload } from 'types/meetingForm';
Expand Down
2 changes: 1 addition & 1 deletion src/app/meeting/create-meeting/page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import MeetingForm from '../components/form/MeetingForm';
import MeetingForm from '../_features/form/MeetingForm';

export default async function CreateMeetingPage() {
return <MeetingForm mode="create" />;
Expand Down
2 changes: 1 addition & 1 deletion src/app/signup/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { baseURL } from '@/lib/axios/defaultConfig';

import SignupForm from './components/SignupForm';
import SignupForm from './_features/SignupForm';

export const metadata = {
metadataBase: new URL(`${baseURL}/signup`),
Expand Down
12 changes: 6 additions & 6 deletions src/hooks/useCard.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import ModalBeforeLogin from '@/app/meeting/components/modal-content/ModalBeforeLogin';
import ModalCancel from '@/app/meeting/components/modal-content/ModalCancel';
import ModalRegisterCheck from '@/app/meeting/components/modal-content/ModalRegisterCheck';
import ModalRegisterComplete from '@/app/meeting/components/modal-content/ModalRegisterComplete';
import ModalRegisterInput from '@/app/meeting/components/modal-content/ModalRegisterInput';
import ModalRegisterWait from '@/app/meeting/components/modal-content/ModalRegisterWait';
import ModalBeforeLogin from '@/app/meeting/_features/modal-content/ModalBeforeLogin';
import ModalCancel from '@/app/meeting/_features/modal-content/ModalCancel';
import ModalRegisterCheck from '@/app/meeting/_features/modal-content/ModalRegisterCheck';
import ModalRegisterComplete from '@/app/meeting/_features/modal-content/ModalRegisterComplete';
import ModalRegisterInput from '@/app/meeting/_features/modal-content/ModalRegisterInput';
import ModalRegisterWait from '@/app/meeting/_features/modal-content/ModalRegisterWait';
import { getAccessToken } from '@/lib/serverActions';
import { useRouter } from 'next/navigation';
import { useState } from 'react';
Expand Down