Repository navigation
[Feature/#213] 설정 페이지 탭 UI 및 알림 채널 설정 추가 #216
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.
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
Merged
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
79b7afc
feat: 설정페이지 내에 알림설정 UI 추가
jjjsun d5b09dc
feat: 사이드바 footerNav에 알림 라우터 삭제
jjjsun 1da97e7
feat: 설정페이지 탭 형식으로 변경
jjjsun 8c548e6
feat: hasChange 탭별로 분리해서 변경사항 저장하기 버튼이 탭별로 독립적으로 동작하도록 구현
jjjsun 51e3d61
feat: 알림 탭에도 변경사항 저장하기 버튼 추가
jjjsun 170e229
fix: hasChange 로직 탭구분 버그 수정
jjjsun 059f927
fix: 알림 탭 로딩상태 추가
jjjsun 05bb7c3
feat: 마이페이지 내 조직 정보 삭제
jjjsun 14dea8c
feat: 탭형식 제거후 페이지 하나로 설정 섹션 통일
jjjsun 8c95cd7
feat: hasChange(탭형식 잔재)제거, 저장버튼 알림토글과도 연결
jjjsun 6080a68
chore: 토글 뱃지 텍스트 변경
jjjsun 1550042
chore: Profilesection내 이메일/전화번호 flex로 구현
jjjsun File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| import Badge from "@/components/common/badge/Badge"; | ||
| import Button from "@/components/common/button/Button"; | ||
| import Card from "@/components/common/card/Card"; | ||
| import Toggle from "@/components/common/toggle/Toggle"; | ||
|
|
||
| import MailIcon from "@/assets/icon/common/mail.svg?react"; | ||
| import BellIcon from "@/assets/icon/sidebar/notification.svg?react"; | ||
| import SlackIcon from "@/assets/logo/social-logo/plain/slack.svg?react"; | ||
|
|
||
| export interface INotificationSettings { | ||
| browserPush: boolean; | ||
| emailNotif: boolean; | ||
| } | ||
|
|
||
| type TNotificationSectionProps = { | ||
| email: string; | ||
| browserPush: boolean; | ||
| emailNotif: boolean; | ||
| onBrowserPushChange: (value: boolean) => void; | ||
| onEmailNotifChange: (value: boolean) => void; | ||
| }; | ||
|
|
||
| export default function NotificationSection({ | ||
| email, | ||
| browserPush, | ||
| emailNotif, | ||
| onBrowserPushChange, | ||
| onEmailNotifChange, | ||
| }: TNotificationSectionProps) { | ||
| return ( | ||
| <Card className="p-8 tablet:p-10"> | ||
| <header className="mb-7 flex items-center gap-4"> | ||
| <BellIcon /> | ||
| <h2 className="font-heading4 text-text-title">알림 채널 설정</h2> | ||
| </header> | ||
|
|
||
| <div className="flex flex-col divide-y divide-surface-300"> | ||
| <div className="flex items-center justify-between py-5 first:pt-0"> | ||
| <div className="flex items-center gap-4"> | ||
| <BellIcon className="h-5 w-5 shrink-0 text-text-muted" /> | ||
| <p className="font-body1 text-text-title">브라우저 푸시 알림</p> | ||
| </div> | ||
| <div className="flex items-center gap-4"> | ||
| {browserPush && <Badge variant="infoBlue">권한 허용됨</Badge>} | ||
| <Toggle | ||
| checked={browserPush} | ||
| onToggle={() => onBrowserPushChange(!browserPush)} | ||
| ariaLabel="브라우저 푸시 알림 켜기/끄기" | ||
| /> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="flex items-center justify-between py-5"> | ||
| <div className="flex items-center gap-4"> | ||
| <MailIcon className="h-5 w-5 shrink-0 text-text-muted" /> | ||
| <div> | ||
| <p className="font-body1 text-text-title">이메일 알림 설정</p> | ||
| <p className="font-body2 text-text-muted">{email}</p> | ||
| </div> | ||
| </div> | ||
| <Toggle | ||
| checked={emailNotif} | ||
| onToggle={() => onEmailNotifChange(!emailNotif)} | ||
| ariaLabel="이메일 알림 켜기/끄기" | ||
| /> | ||
| </div> | ||
|
|
||
| <div className="flex items-center justify-between py-5 last:pb-0"> | ||
| <div className="flex items-center gap-4"> | ||
| <SlackIcon className="h-5 w-5 shrink-0" /> | ||
| <div> | ||
| <p className="font-body1 text-text-title">슬랙 연동하기</p> | ||
| <p className="font-body2 text-text-muted">#채널명</p> | ||
| </div> | ||
| </div> | ||
| <Button variant="outline" size="small" type="button"> | ||
| 연동 | ||
| </Button> | ||
|
jjjsun marked this conversation as resolved.
Resolved
|
||
| </div> | ||
| </div> | ||
| </Card> | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.