Skip to content

그룹 스터디 개설 모달 UI & api 연결 #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mimiminz merged 35 commits into from
Oct 11, 2025
Merged

그룹 스터디 개설 모달 UI & api 연결 #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
3965a01
feat: input disable 상태 시 커스텀
Mimiminz Sep 27, 2025
71a4f5a
feat: 단일 선택 옵션 추가
Mimiminz Sep 27, 2025
33dc7c3
feat: 그룹 스터디 스키마 추가 (수정필요)
Mimiminz Sep 27, 2025
881e717
feat: 그룹 스터디 생성 const 값 추가
Mimiminz Sep 27, 2025
116fcf7
feat: 그룹 스터디 request 타입 추가 (수정 필요)
Mimiminz Sep 27, 2025
2093d75
fix: 경력 const 변경
Mimiminz Sep 27, 2025
5276026
feat: 스텝 1 추가
Mimiminz Sep 27, 2025
4e52907
feat: 스텝 2 추가
Mimiminz Sep 27, 2025
4315d08
fix: 경력 인풋/아웃풋 다르게 변경
Mimiminz Sep 27, 2025
6376a90
feat: 스텝 3 추가
Mimiminz Sep 27, 2025
c5b14f3
feat: 폰트 크기 타입 추가
Mimiminz Sep 27, 2025
c285185
fix: group 단일/복수 추가 및 다른 타입 확장 가능성 추가
Mimiminz Sep 27, 2025
181ad38
feat: 스텝 별 그룹 스터디 생성 모달 추가
Mimiminz Sep 27, 2025
396dfbc
style: 테스트를 위한 코드 추가
Mimiminz Sep 27, 2025
4abec73
style: 네이밍 변경
Mimiminz Oct 2, 2025
83c4686
Merge branch 'develop' of https://github.com/code-zero-to-one/study-p…
Mimiminz Oct 2, 2025
dec9942
style: 네이밍 변경
Mimiminz Oct 2, 2025
da6e68d
feat: step1 UI 수정
Mimiminz Oct 2, 2025
f17bc71
feat: 스터디 개설 api에 맞게 업데이트
Mimiminz Oct 2, 2025
80b6477
fix: next 조건 수정
Mimiminz Oct 2, 2025
06d3ac4
style: 중간 업데이트용 커밋
Mimiminz Oct 2, 2025
6890717
fix: 변경된 타입에 맞게 step1 수정
Mimiminz Oct 9, 2025
af4764d
feat: step2 스키마 수정
Mimiminz Oct 9, 2025
65a2408
feat: step3 스키마 수정
Mimiminz Oct 10, 2025
f06f47a
feat: 스터디 개설 api 추가
Mimiminz Oct 10, 2025
96f9f02
Merge branch 'develop' into feat/group-study-start-modal
Mimiminz Oct 10, 2025
3799f5a
fix: 타입 미변경으로 인한 빌드에러 수정
Mimiminz Oct 10, 2025
4edcf59
style: 주석 변경
Mimiminz Oct 10, 2025
afdc80e
feat: 썸네일 업로드 로직 추가
Mimiminz Oct 10, 2025
59fed83
fix: global.css 적용 안되던 문제 수정
Mimiminz Oct 10, 2025
442e922
fix: 이미지 업로드 로직 수정
Mimiminz Oct 10, 2025
3a24bf5
Merge branch 'feat/group-study-start-modal' of https://github.com/cod…
Mimiminz Oct 10, 2025
f493086
Merge branch 'develop' into feat/group-study-start-modal
Mimiminz Oct 10, 2025
650193c
fix: 컨플릭트로 인한 네이밍 수정
Mimiminz Oct 10, 2025
d0da49b
fix: global css 변경사항 주석
Mimiminz Oct 11, 2025
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
369 changes: 369 additions & 0 deletions app/global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,375 @@ https://velog.io/@oneook/tailwindcss-4.0-%EB%AC%B4%EC%97%87%EC%9D%B4-%EB%8B%AC%E
}
}


/* 자동완성이 안되는 문제가 있어 잠시 주석처리 합니다 */
/* @layer utilities {
/* typography */
.font-display-headings1 {
font-size: 72px;
font-weight: var(--font-weight-semibold);
line-height: 108px;
letter-spacing: 0;
}

.font-display-headings2 {
font-size: 64px;
font-weight: var(--font-weight-bold);
line-height: 96px;
letter-spacing: 0;
}

.font-display-headings3 {
font-size: 58px;
font-weight: var(--font-weight-bold);
line-height: 88px;
letter-spacing: 0;
}

.font-display-headings4 {
font-size: 52px;
font-weight: var(--font-weight-bold);
line-height: 78px;
letter-spacing: 0;
}

.font-display-headings5 {
font-size: 48px;
font-weight: var(--font-weight-bold);
line-height: 72px;
letter-spacing: 0;
}

.font-display-headings6 {
font-size: 40px;
font-weight: var(--font-weight-bold);
line-height: 60px;
letter-spacing: 0;
}

.font-bold-h1 {
font-size: 36px;
font-weight: var(--font-weight-bold);
line-height: 54px;
letter-spacing: 0;
}

.font-bold-h2 {
font-size: 32px;
font-weight: var(--font-weight-bold);
line-height: 48px;
letter-spacing: 0;
}

.font-bold-h3 {
font-size: 28px;
font-weight: var(--font-weight-bold);
line-height: 42px;
letter-spacing: 0;
}

.font-bold-h4 {
font-size: 24px;
font-weight: var(--font-weight-bold);
line-height: 36px;
letter-spacing: 0;
}

.font-bold-h5 {
font-size: 20px;
font-weight: var(--font-weight-bold);
line-height: 30px;
letter-spacing: 0;
}

.font-bold-h6 {
font-size: 18px;
font-weight: var(--font-weight-bold);
line-height: 28px;
letter-spacing: 0;
}

.font-designer-36r {
font-size: 36px;
font-weight: var(--font-weight-regular);
line-height: 54px;
letter-spacing: 0;
}

.font-designer-36m {
font-size: 36px;
font-weight: var(--font-weight-medium);
line-height: 54px;
letter-spacing: 0;
}

.font-designer-36b {
font-size: 36px;
font-weight: var(--font-weight-bold);
line-height: 54px;
letter-spacing: 0;
}

.font-designer-32r {
font-size: 32px;
font-weight: var(--font-weight-regular);
line-height: 48px;
letter-spacing: 0;
}

.font-designer-32m {
font-size: 32px;
font-weight: var(--font-weight-medium);
line-height: 48px;
letter-spacing: 0;
}

.font-designer-32b {
font-size: 32px;
font-weight: var(--font-weight-bold);
line-height: 48px;
letter-spacing: 0;
}

.font-designer-28r {
font-size: 28px;
font-weight: var(--font-weight-regular);
line-height: 42px;
letter-spacing: 0;
}

.font-designer-28m {
font-size: 28px;
font-weight: var(--font-weight-medium);
line-height: 42px;
letter-spacing: 0;
}

.font-designer-28b {
font-size: 28px;
font-weight: var(--font-weight-bold);
line-height: 42px;
letter-spacing: 0;
}

.font-designer-24r {
font-size: 24px;
font-weight: var(--font-weight-regular);
line-height: 37px;
letter-spacing: 0;
}

.font-designer-24m {
font-size: 24px;
font-weight: var(--font-weight-medium);
line-height: 37px;
letter-spacing: 0;
}

.font-designer-24b {
font-size: 24px;
font-weight: var(--font-weight-bold);
line-height: 37px;
letter-spacing: 0;
}

.font-designer-20r {
font-size: 20px;
font-weight: var(--font-weight-regular);
line-height: 30px;
letter-spacing: 0;
}

.font-designer-20m {
font-size: 20px;
font-weight: var(--font-weight-medium);
line-height: 30px;
letter-spacing: 0;
}

.font-designer-20b {
font-size: 20px;
font-weight: var(--font-weight-bold);
line-height: 30px;
letter-spacing: 0;
}

.font-designer-18r {
font-size: 18px;
font-weight: var(--font-weight-regular);
line-height: 29px;
letter-spacing: 0;
}

.font-designer-18m {
font-size: 18px;
font-weight: var(--font-weight-medium);
line-height: 29px;
letter-spacing: 0;
}

.font-designer-18b {
font-size: 18px;
font-weight: var(--font-weight-bold);
line-height: 29px;
letter-spacing: 0;
}

.font-designer-16r {
font-size: 16px;
font-weight: var(--font-weight-regular);
line-height: 25px;
letter-spacing: 0;
}

.font-designer-16m {
font-size: 16px;
font-weight: var(--font-weight-medium);
line-height: 25px;
letter-spacing: 0;
}

.font-designer-16b {
font-size: 16px;
font-weight: var(--font-weight-bold);
line-height: 25px;
letter-spacing: 0;
}

.font-designer-15r {
font-size: 15px;
font-weight: var(--font-weight-regular);
line-height: 23px;
letter-spacing: 0;
}

.font-designer-15m {
font-size: 15px;
font-weight: var(--font-weight-medium);
line-height: 23px;
letter-spacing: 0;
}

.font-designer-15b {
font-size: 15px;
font-weight: var(--font-weight-bold);
line-height: 23px;
letter-spacing: 0;
}

.font-designer-14r {
font-size: 14px;
font-weight: var(--font-weight-regular);
line-height: 22px;
letter-spacing: 0;
}

.font-designer-14m {
font-size: 14px;
font-weight: var(--font-weight-medium);
line-height: 22px;
letter-spacing: 0;
}

.font-designer-14b {
font-size: 14px;
font-weight: var(--font-weight-bold);
line-height: 22px;
letter-spacing: 0;
}

.font-designer-13r {
font-size: 13px;
font-weight: var(--font-weight-regular);
line-height: 20px;
letter-spacing: 0;
}

.font-designer-13m {
font-size: 13px;
font-weight: var(--font-weight-medium);
line-height: 20px;
letter-spacing: 0;
}

.font-designer-13b {
font-size: 13px;
font-weight: var(--font-weight-bold);
line-height: 20px;
letter-spacing: 0;
}

.font-designer-12r {
font-size: 12px;
font-weight: var(--font-weight-regular);
line-height: 19px;
letter-spacing: 0;
}

.font-designer-12m {
font-size: 12px;
font-weight: var(--font-weight-medium);
line-height: 19px;
letter-spacing: 0;
}

.font-designer-12b {
font-size: 12px;
font-weight: var(--font-weight-bold);
line-height: 19px;
letter-spacing: 0;
}

.font-designer-11r {
font-size: 11px;
font-weight: var(--font-weight-regular);
line-height: 18px;
letter-spacing: 0;
}

.font-designer-11m {
font-size: 11px;
font-weight: var(--font-weight-medium);
line-height: 18px;
letter-spacing: 0;
}

.font-designer-11b {
font-size: 11px;
font-weight: var(--font-weight-bold);
line-height: 18px;
letter-spacing: 0;
}

.font-designer-10r {
font-size: 10px;
font-weight: var(--font-weight-regular);
line-height: 17px;
letter-spacing: 0;
}

.font-designer-10m {
font-size: 10px;
font-weight: var(--font-weight-medium);
line-height: 17px;
letter-spacing: 0;
}

.font-designer-10b {
font-size: 10px;
font-weight: var(--font-weight-bold);
line-height: 17px;
letter-spacing: 0;
}

.scrollbar-hide {
&::-webkit-scrollbar {
display: none;
}
scrollbar-width: none;
}
} */

/* shadcn 색상 테마 */

:root {
Expand Down
4 changes: 2 additions & 2 deletions src/features/my-page/ui/profile-info-edit-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { MultiDropdown, SingleDropdown } from '@/shared/ui/dropdown';
import FormField from '@/shared/ui/form/form-field';
import { TextAreaInput } from '@/shared/ui/input';
import { Modal } from '@/shared/ui/modal';
import { ToggleGroup } from '@/shared/ui/toggle';
import { GroupItems } from '@/shared/ui/toggle';

import {
ProfileInfoFormSchema,
Expand Down Expand Up @@ -210,7 +210,7 @@ function ProfileInfoEditForm({
direction="vertical"
required
>
<ToggleGroup options={timeOptions} />
<GroupItems options={timeOptions} />
</FormField>

<FormField<ProfileInfoFormValues, 'techStackIds', string[]>
Expand Down
Loading