Skip to content

Develop to Main #5

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

Jump to bottom
Merged
lgrin-byte merged 49 commits into from
Feb 16, 2025
Merged

Develop to Main #5

lgrin-byte merged 49 commits into from
Feb 16, 2025

Conversation

@lgrin-byte
Copy link
Owner

@lgrin-byte lgrin-byte commented Feb 16, 2025

πŸ’‘ λ‹€μŒ 이슈λ₯Ό ν•΄κ²°ν–ˆμ–΄μš”.

  • (κ°€λŠ₯ν•œ ν•œ μžμ„Ένžˆ μž‘μ„±ν•΄ μ£Όμ‹œλ©΄ 도움이 λ©λ‹ˆλ‹€.)



πŸ’‘ 이슈λ₯Ό μ²˜λ¦¬ν•˜λ©΄μ„œ μΆ”κ°€λœ μ½”λ“œκ°€ μžˆμ–΄μš”.

  • (μ—†λ‹€λ©΄ 이 문항을 μ§€μ›Œμ£Όμ„Έμš”.)



πŸ’‘ ν•„μš”ν•œ ν›„μ†μž‘μ—…μ΄ μžˆμ–΄μš”.

  • (μ—†λ‹€λ©΄ 이 문항을 μ§€μ›Œμ£Όμ„Έμš”.)



βœ… μ…€ν”„ 체크리슀트

  • 브랜치 μ „λž΅μ— λ§žλŠ” λΈŒλžœμΉ˜μ— PR을 올리고 μžˆμŠ΅λ‹ˆλ‹€. (master/main이 μ•„λ‹™λ‹ˆλ‹€.)
  • 컀밋 메세지λ₯Ό μ»¨λ²€μ…˜μ— λ§žμΆ”μ—ˆμŠ΅λ‹ˆλ‹€.
  • λ³€κ²½ ν›„ μ½”λ“œλŠ” 컴파일러/λΈŒλΌμš°μ € warning/error κ°€ λ°œμƒμ‹œν‚€μ§€ μ•ŠμŠ΅λ‹ˆλ‹€.
  • λ³€κ²½ ν›„ μ½”λ“œλŠ” 기쑴의 ν…ŒμŠ€νŠΈλ₯Ό ν†΅κ³Όν•©λ‹ˆλ‹€.
  • ν…ŒμŠ€νŠΈ μΆ”κ°€κ°€ ν•„μš”ν•œμ§€ κ²€ν† ν•΄λ³΄μ•˜κ³ , ν•„μš”ν•œ 경우 ν…ŒμŠ€νŠΈλ₯Ό μΆ”κ°€ν–ˆμŠ΅λ‹ˆλ‹€.
  • docs μˆ˜μ •μ΄ ν•„μš”ν•œμ§€ κ²€ν† ν•΄λ³΄μ•˜κ³ , ν•„μš”ν•œ 경우 docsλ₯Ό μˆ˜μ •ν–ˆμŠ΅λ‹ˆλ‹€.

lgrin-byte and others added 30 commits November 29, 2024 23:05
@lgrin-byte
chore: μ•ˆμ“°λŠ” 파일 μ‚­μ œ
572bc08
@lgrin-byte
feat: λ Œλ”λ§ μš”μ†Œ μˆ˜μ •
acf5ffc
@lgrin-byte
feat: ν…Œλ§ˆ λ°°κ²½ 이미지 μ»΄ν¬λ„ŒνŠΈ 생성
3554645
@lgrin-byte
feat: ν…Œλ§ˆ 이미지 λ‹€μ΄μ–Όλ‘œκ·Έ μΆ”κ°€ 및 ꡬ쑰 λ³€κ²½
0031402
@lgrin-byte
feat: 이미지 미리보기 λͺ¨λ‹¬ 생성
211ec35
@lgrin-byte
feat: μˆ˜μ •λœ 타이틀 μ„Ήμ…˜ μž‘μ—…
1fe8eb1
@lgrin-byte
fix: drawer μœ„μΉ˜ μˆ˜μ •
e8a154d
@lgrin-byte
feat: 툴팁 μΆ”κ°€
85be44e
@lgrin-byte
feat: μƒˆλ‘œμš΄ κΈ°λŠ₯ μ•ˆλ‚΄ λͺ¨λ‹¬ μΆ”κ°€
76eb72e
@anyl92
feat: Timer Image Dialog μž‘μ—…
697b377
@lgrin-byte
refactor: λΌμš°νŒ… κ°œμ„ 
4b664f0
@lgrin-byte
fix: ν΄λΌμ΄μ–ΈνŠΈ λΉŒλ“œ μ—λŸ¬ μˆ˜μ •
a36dd25
@lgrin-byte
feat: λ¦¬ν”„λ ˆμ‰¬ 토큰 κ°±μ‹  및 둜그인 정보 λ‘œμ»¬μŠ€ν† λ¦¬μ§€ -> μ„Έμ…˜μŠ€ν† λ¦¬μ§€ 이동
96768bf
@lgrin-byte
feat: 데이터 응닡값 μˆ˜μ •
88b977f
@lgrin-byte
feat: λ¦¬ν”„λ ˆμ‹œ ν† ν°λ§Œ μΏ ν‚€ λ‚˜λ¨Έμ§€ 정보 둜컬 μŠ€ν† λ¦¬μ§€μ— μ €μž₯
722eb03
@lgrin-byte
Merge pull request Next-Room#87 from Next-Room/feat/μ•ˆμ“°λŠ”-파일-μ‚­μ œ
dbf6319 
chore: μ•ˆμ“°λŠ” 파일 μ‚­μ œ
@lgrin-byte
Merge branch 'develop' into feat/add-refresh-token
67b6e2d
@lgrin-byte
Merge pull request Next-Room#90 from Next-Room/feat/add-refresh-token
addb77e 
feat: λ¦¬ν”„λ ˆμ‰¬ 토큰 κ°±μ‹  및 둜그인 정보 λ‘œμ»¬μŠ€ν† λ¦¬μ§€ -> μ„Έμ…˜μŠ€ν† λ¦¬μ§€ 이동
@lgrin-byte
Merge pull request Next-Room#89 from Next-Room/feat/theme-image-previ…
09e73cb 
…ew-rinee

Feat/theme image preview
@lgrin-byte
fix: μ‚¬μš©ν•˜μ§€ μ•Šμ€ import 제거
f091888
@lgrin-byte
Merge branch 'feat/theme-image-preview' into feat/refactor-router
7c61fc8 
# Conflicts:
#	app/admin/Admin.tsx
@lgrin-byte
Merge pull request Next-Room#91 from Next-Room/feat/refactor-router
9322c60 
feat: λΌμš°νŒ… κ°œμ„ 
@lgrin-byte
Merge branch 'develop' into feat/theme-image-preview
da303f8 
# Conflicts:
#	app/components/RequireAuth/RequireAuth.tsx
#	app/mutations/postTheme.ts
@anyl92
feat: 타이머 이미지 등둝 API
79519d9
@lgrin-byte
feat: λΌμš°νŒ… 둜직 λ‘œκ·ΈμΈλΆ€λΆ„ μΆ”κ°€ κ°œμ„ 
bfca027
@anyl92
feat: 타이머 λ°°κ²½ μ½”λ“œ 정리 & 타이머 미리보기
c8c79c0
@lgrin-byte
Merge branch 'feat/theme-image-preview' into feat/theme-image-preview…
862ea79 
…-logic

# Conflicts:
#	app/admin/(components)/ThemeInfo/ThemeImage.tsx
#	app/admin/(consts)/sidebar.ts
#	app/components/common/Dialog-new/dialog.sass
@anyl92
feat: 타이머 이미지 μ‚­μ œ API
ef00b85
@lgrin-byte
fix: 이미지 μ²¨λΆ€μ‹œ μž¬λ Œλ”λ§λ˜λŠ” 이슈 μˆ˜μ •
638d81c
@anyl92
style: 이미지 dimmed μΆ”κ°€, cover μ†μ„±μœΌλ‘œ μ„Έλ‘œκΈ°μ€€μœΌλ‘œ 맞좀 λ“± css μˆ˜μ •
8937a2a
lgrin-byte and others added 19 commits January 7, 2025 03:22
@lgrin-byte
fix: Hydration 뢈일치 μˆ˜μ •
5e32212
@lgrin-byte
feat: 툴팁 μΆ”κ°€
bfee9a9
@anyl92
fix: css μˆ˜μ •
e8a2d9e 
- scroll μƒκΈ°λŠ” decoration-line width μ‘°μ •
- timer preview entire 이미지 λ³€κ²½
@anyl92
fix: 타이머 이미지 λ³€κ²½ μ‹œ λ¦¬λ Œλ”λ§λ˜λ„λ‘ μ—…λ°μ΄νŠΈ
04fb87e
@anyl92
fix: μΉ΄ν…Œκ³ λ¦¬ 데이터 μΊμ‹±μœΌλ‘œ 타이머배경url μ—…λ°μ΄νŠΈ λ˜μ§€ μ•Šλ˜ 문제 ν•΄κ²°
11de019
@anyl92
feat: 이미지 μ••μΆ• ν•¨μˆ˜μ— μ˜΅μ…˜κ°’ 인자둜 λ°›μ•„ μž¬μ‚¬μš©ν•  수 있게 λ³€κ²½
858e1b8
@anyl92
Merge pull request Next-Room#93 from Next-Room/feat/theme-image-previ…
97ba5d4 
…ew-logic

타이머 λ°°κ²½
@anyl92
feat: λ‘œκ·Έμ•„μ›ƒ λ²„νŠΌ 및 연동, 둜고 λ””μžμΈ css 미적용 μˆ˜μ •
d880058
@anyl92
feat: λ‘œκ·Έμ•„μ›ƒ λ²„νŠΌ λ…ΈμΆœ μ•„μ΄μ½˜ ν˜Έλ²„ μ‹œ λΉˆκ³΅κ°„ μ»€μ„œ κΉœλΉ‘μž„ μˆ˜μ •, 타이머 이미지 μ—…λ‘œλ“œ μ‹œ λ‘œλ”© μ•„μ΄μ½˜ μΆ”κ°€
2bd83fe
@anyl92
Merge pull request Next-Room#88 from Next-Room/feat/theme-image-preview
b101327 
feat: ν…Œλ§ˆ λ°°κ²½ 이미지 첨뢀
@lgrin-byte
feat: μ—‘μ„ΈμŠ€ 토큰 없을 μ‹œ λ‘œκ·Έμ•„μ›ƒ μΆ”κ°€
c7d7510
@lgrin-byte
Merge pull request Next-Room#94 from Next-Room/feat/add-logout
b4f78a1 
feat: μ—‘μ„ΈμŠ€ 토큰 없을 μ‹œ λ‘œκ·Έμ•„μ›ƒ μΆ”κ°€
@anyl92
fix: λͺ¨λ‹¬λ³„ λ ˆμ΄μ•„μ›ƒ μ μš©μ„ μœ„ν•œ css, classname μˆ˜μ •, μƒˆ κΈ°λŠ₯ μžμ„Ένžˆλ³΄κΈ° μ—°κ²° 링크 μΆ”κ°€
0055a3a
@anyl92
fix: 둜고 ν˜Έλ²„ μ‹œμ—λ§Œ 보더 λ…ΈμΆœλ˜λ„λ‘ μˆ˜μ •, 타이머 이미지 κ½‰μ°¨κ²Œ μˆ˜μ •
5b581ec
@anyl92
Merge pull request Next-Room#95 from Next-Room/feat/timer-image-qa
8b9fe70 
Feat/timer image qa
@lgrin-byte
fix: 401 μ—λŸ¬μ‹œ λ°”λ‘œ λ‘œκ·Έμ•„μ›ƒ μ²˜λ¦¬λ˜μ§€ μ•ŠλŠ” 이슈 μˆ˜μ •
fe01ac5
@lgrin-byte
Merge pull request Next-Room#96 from Next-Room/fix/change-routing-logout
3c4509b 
fix: 401 μ—λŸ¬μ‹œ λ°”λ‘œ λ‘œκ·Έμ•„μ›ƒ μ²˜λ¦¬λ˜μ§€ μ•ŠλŠ” 이슈 μˆ˜μ •
@lgrin-byte
fix: νšŒμ›κ°€μž… 401μ—λŸ¬ μ˜ˆμ™Έμ²˜λ¦¬
076e90c
@lgrin-byte
Merge pull request Next-Room#97 from Next-Room/fix/change-router
a9f81dc 
fix: νšŒμ›κ°€μž… 401μ—λŸ¬ μ˜ˆμ™Έμ²˜λ¦¬
@vercel
Copy link

vercel bot commented Feb 16, 2025

The latest updates on your projects. Learn more about Vercel for Git β†—οΈŽ

Name Status Preview Comments Updated (UTC)
next-room-fe βœ… Ready (Inspect) Visit Preview πŸ’¬ Add feedback Feb 16, 2025 2:35pm
next-room-storybook ❌ Failed (Inspect) Feb 16, 2025 2:35pm

@lgrin-byte lgrin-byte self-assigned this Feb 16, 2025
@lgrin-byte lgrin-byte merged commit 3e074c0 into main Feb 16, 2025
5 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@lgrin-byte lgrin-byte

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@lgrin-byte @anyl92