diff --git a/apps/client/src/app/project/[id]/page.tsx b/apps/client/src/app/project/[id]/page.tsx index 9f08a60..970b222 100644 --- a/apps/client/src/app/project/[id]/page.tsx +++ b/apps/client/src/app/project/[id]/page.tsx @@ -8,7 +8,7 @@ import { IoPeople } from 'react-icons/io5'; const ProjectPage = () => { return ( - +
{ console.log(projectStatus, projectOptions); // 백엔드로 요청보낼때 사용될 코드 return ( - +
{ + return ( + + + + + + + + ); +}; + +export default User; diff --git a/apps/client/src/components/header/index.tsx b/apps/client/src/components/header/index.tsx index a71534c..5fef055 100644 --- a/apps/client/src/components/header/index.tsx +++ b/apps/client/src/components/header/index.tsx @@ -35,7 +35,9 @@ const Header = () => { height={22} alt="alarm" /> -
+ +
+
diff --git a/apps/client/src/components/landing/interviewJJoing.tsx b/apps/client/src/components/landing/interviewJJoing.tsx index e62cde4..481bf4c 100644 --- a/apps/client/src/components/landing/interviewJJoing.tsx +++ b/apps/client/src/components/landing/interviewJJoing.tsx @@ -10,7 +10,7 @@ type InterviewJJoingProps = { const InterviewJJoing = ({ mouseRef }: InterviewJJoingProps) => { return ( - + { + return ( +
+
+
+ + +
+
+ ); +}; + +export default UserContactBox; diff --git a/apps/client/src/components/user/userProfile.tsx b/apps/client/src/components/user/userProfile.tsx new file mode 100644 index 0000000..f966893 --- /dev/null +++ b/apps/client/src/components/user/userProfile.tsx @@ -0,0 +1,25 @@ +import { Button, Text } from '@jjoing/ui'; + +const UserProfile = () => { + return ( +
+
+ {/* 차후 벡엔드 연동 시 이미지 추가 필요 */} +
+
+ lheesung + 부산소프트웨어마이스터고등학교 / Frontend + 팔로워 0 팔로잉 0 + + 카더가든 사모중 저랑 사귀실분 \n fwef wfwef wef wf we + +
+
+ +
+ ); +}; + +export default UserProfile; diff --git a/apps/client/src/components/user/userProjectContainer/userProjectContainer.hooks.ts b/apps/client/src/components/user/userProjectContainer/userProjectContainer.hooks.ts new file mode 100644 index 0000000..a934c50 --- /dev/null +++ b/apps/client/src/components/user/userProjectContainer/userProjectContainer.hooks.ts @@ -0,0 +1,11 @@ +import { useState } from 'react'; + +export const useSearchProcessingProject = () => { + const [searchProcessingProject, setSearchProcessingProject] = useState(true); + + const handleSeachOptions = () => { + setSearchProcessingProject((prev) => !prev); + }; + + return { searchProcessingProject, handleSeachOptions }; +}; diff --git a/apps/client/src/components/user/userProjectContainer/userProjectContainer.tsx b/apps/client/src/components/user/userProjectContainer/userProjectContainer.tsx new file mode 100644 index 0000000..1c24b83 --- /dev/null +++ b/apps/client/src/components/user/userProjectContainer/userProjectContainer.tsx @@ -0,0 +1,55 @@ +'use client'; + +import { cn, Input, ProjectCard } from '@jjoing/ui'; +import { IoSearch } from 'react-icons/io5'; +import { useSearchProcessingProject } from './userProjectContainer.hooks'; + +const UserProjectContainer = () => { + const { searchProcessingProject, handleSeachOptions } = useSearchProcessingProject(); + + return ( +
+
+
+
+ 참여중인 프로젝트 +
+
+ 참여했던 프로젝트 +
+
+ + + +
+
+ {Array.from({ length: 20 }).map((_: any, i: any) => ( + + ))} +
+
+ ); +}; + +export default UserProjectContainer; diff --git a/packages/ui/src/Input/index.tsx b/packages/ui/src/Input/index.tsx index e5fb376..0811a53 100644 --- a/packages/ui/src/Input/index.tsx +++ b/packages/ui/src/Input/index.tsx @@ -1,5 +1,5 @@ import { cva, VariantProps } from 'class-variance-authority'; -import { forwardRef, InputHTMLAttributes } from 'react'; +import { cloneElement, forwardRef, InputHTMLAttributes, ReactElement } from 'react'; import { cn } from '../utils'; const InputVariants = cva('', { @@ -20,6 +20,7 @@ const InputVariants = cva('', { type InputProps = VariantProps & InputHTMLAttributes & { width?: number | '100%'; + children?: ReactElement; }; const Input = forwardRef( @@ -30,6 +31,7 @@ const Input = forwardRef( placeholder = '검색어를 입력해주세요.', onChange, className, + children, ...props }, ref @@ -38,16 +40,23 @@ const Input = forwardRef(
+ {children && + cloneElement(children, { + className: 'absolute top-[50%] translate-y-[-50%] left-[5%]', + })}
diff --git a/packages/ui/src/themes/colors.ts b/packages/ui/src/themes/colors.ts index 9fdba4b..8be7270 100644 --- a/packages/ui/src/themes/colors.ts +++ b/packages/ui/src/themes/colors.ts @@ -8,5 +8,7 @@ export const colors = { gray: { 10: '#F8F9FA', + 20: '#ADB5BD', + 30: '#6B7280', }, };