Skip to content

Commit

Permalink
feat(my-recruit): 내 공고 뽀각 페이지 api 연결 (#28)
Browse files Browse the repository at this point in the history
* feat(my-recruit): 내정보뽀각 페이지 api 연결

* update

* save

* save
  • Loading branch information
qkrdmstlr3 authored and eunbeann committed Aug 25, 2024
1 parent 1d3b92a commit e176335
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 37 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
'use client';

import { Dropdown, Icon } from '@/system/components';
import { RocketIcon } from '../components/RocketIcon';
import { Spacing } from '@/system/utils/Spacing';
import { AllRecruitList } from '@/app/(sidebar)/my-recruit/containers/AllRecruitment/AllRecruitList';
import { CardSkeleton } from '@/app/(sidebar)/my-recruit/containers/components/CardSkeleton/CardSkeleton';
import { AsyncBoundaryWithQuery } from '@/lib';
import { SeasonDropdownContent } from '../components/SeasonDropdownContent';
import { Dropdown } from '@/system/components';
import { Spacing } from '@/system/utils/Spacing';
import { useState } from 'react';
import { ALL_RECRUITMENT } from '../components/SeasonDropdownContent';
import { CardSkeleton } from '@/app/(sidebar)/my-recruit/containers/components/CardSkeleton/CardSkeleton';
import { RocketIcon } from '../components/RocketIcon';
import { ALL_RECRUITMENT, SeasonDropdownContent } from '../components/SeasonDropdownContent';

export function AllRecruitment() {
const [selectedSeason, setSelectedSeason] = useState(ALL_RECRUITMENT);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { AsyncBoundaryWithQuery } from '@/lib';
import { Spacing } from '@/system/utils/Spacing';
import { CardSkeleton } from '../components/CardSkeleton/CardSkeleton';
import { ShoeIcon } from '../components/ShoeIcon';
import { AsyncBoundaryWithQuery } from '@/lib';
import { ProgressingRecruitList } from './ProgressingRecruitList';
import { CardSkeleton } from '../components/CardSkeleton/CardSkeleton';

export function ProgressingRecruitment() {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ import { Calendar } from '@/system/components/Calendar/Calendar';
import { Popover, PopoverContent, PopoverTrigger } from '@/system/components/Popover/Popover';
import { color } from '@/system/token/color';
import { Spacing } from '@/system/utils/Spacing';
import { cn } from '@/utils';
import clsx from 'clsx';
import { format } from 'date-fns/format';
import { motion } from 'framer-motion';
import { useState } from 'react';
import { recruitScheduleStageList } from '../../constant';

interface DueDateDialogProps {
title: string;
onDuedateAppend: () => void;
title?: string;
onDuedateAppend: () => void;
}
Expand All @@ -31,10 +32,12 @@ export function DueDateDialog({ title }: DueDateDialogProps) {
dueDateList.length !== 0 && dueDateList[0].deadLine != null && dueDateList[0].recruitScheduleStage != null;

return (
<div className="p-20 z-10">
<div className="p-20">
<div className="flex items-center w-314">
{title && <Icon name="folderFill" size={16} color={color.neutral95} />}
<Icon name="folderFill" size={16} color={color.neutral95} />
<Spacing size={4} direction="row" />
<span className="text-body1 font-semibold overflow-hidden text-ellipsis line-clamp-1">{title}</span>
<span className="text-body1">의 공고 일정 등록하기</span>
<span
className={cn('text-body1 font-semibold overflow-hidden text-ellipsis line-clamp-1', title ? 'flex-1' : '')}>
{title ? `${title}의 공고 일정 등록하기` : '공고 일정 등록하기'}
Expand Down
31 changes: 15 additions & 16 deletions src/app/(sidebar)/my-recruit/page.tsx
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
'use client';

import { Icon } from '@/system/components';
import { InfoCard } from '@/components/InfoCard';
import { TouchButton } from '@/components/TouchButton';
import { Spacing } from '@/system/utils/Spacing';
import { ProgressingRecruitment } from './containers/ProgressingRecruitment/ProgressingRecruitment';
import { AllRecruitment } from './containers/AllRecruitment/AllRecruitment';
import { useRef, useState } from 'react';
import { Dialog } from '@/system/components/Dialog/ShadcnDialog';
import { NewRecruitDialogContent } from './components/NewRecruitDialogContent/NewRecruitDialogContent';
import { RightSidebar } from './containers/RightSidebar/RightSidebar';
import { useScroll } from '@/hooks/useScroll';
import { DndContextWithOverlay, DragEndEvent } from '@/lib/dnd-kit/dnd-kit';
import { InfoCard } from '@/components/InfoCard';
import { AnimatePresence, motion } from 'framer-motion';
import { usePostRecruit } from './api/usePostRecruit';
import { CardData } from './components/NewRecruitDialogContent/NewRecruitDialogContent';
import { cn } from '@/utils';
import { Icon } from '@/system/components';
import { Dialog } from '@/system/components/Dialog/ShadcnDialog';
import { color } from '@/system/token/color';
import { usePostCardToRecruit } from './api/usePostCardToRecruit';
import { useScroll } from '@/hooks/useScroll';
import { If } from '@/system/utils/If';
import { fontSize } from '@/system/token/typography';
import { If } from '@/system/utils/If';
import { Spacing } from '@/system/utils/Spacing';
import { cn } from '@/utils';
import { AnimatePresence, motion } from 'framer-motion';
import { useRef, useState } from 'react';
import { usePostCardToRecruit } from './api/usePostCardToRecruit';
import { usePostRecruit } from './api/usePostRecruit';
import { CardData, NewRecruitDialogContent } from './components/NewRecruitDialogContent/NewRecruitDialogContent';
import { AllRecruitment } from './containers/AllRecruitment/AllRecruitment';
import { ProgressingRecruitment } from './containers/ProgressingRecruitment/ProgressingRecruitment';
import { RightSidebar } from './containers/RightSidebar/RightSidebar';

const STICKY_THRESHOLD = 30;

Expand Down
11 changes: 5 additions & 6 deletions src/components/InfoCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,11 @@ export function InfoCard({ id, title, updatedDate, tagList }: InfoCardProps) {
</div>
</div>
<div className="flex gap-[8px]">
{tagList &&
tagList.map(({ id, type, name }) => (
<Tag key={id} color={TAG_TYPE_COLOR[type]}>
{name}
</Tag>
))}
{tagList.map(({ id, type, name }) => (
<Tag key={id} color={TAG_TYPE_COLOR[type]}>
{name}
</Tag>
))}
</div>
</div>
<If condition={tagList != null}>
Expand Down
8 changes: 4 additions & 4 deletions src/container/Sidebar/Sidebar.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
'use client';

import { Logo } from '@/components/Logo';
import { SidebarButton } from '@/container/Sidebar/SidebarButton';
import { MY_INFO_PATH, MY_RECRUIT_PATH } from '@/route';
import { Icon } from '@/system/components';
import { cn } from '@/utils';
import { usePathname, useRouter } from 'next/navigation';
import { useState } from 'react';
import { Collapsible } from './Collapsible/Collapsible';
import { useRouter, usePathname } from 'next/navigation';
import { MY_RECRUIT_PATH, MY_INFO_PATH } from '@/route';
import { Logo } from '@/components/Logo';
import { cn } from '@/utils';

const SIDEBAR_CLASSNAME = {
expanded: 'w-[220px]',
Expand Down

0 comments on commit e176335

Please sign in to comment.