feat: refine toast position, fix scroll bug, improve login stability,… #33
There are no files selected for viewing
Binary file not shown.
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,35 @@ | ||
| dev | ||
| feat/comment-anon-and-delete-modal-dev | ||
| feature-login-signup | ||
| feature/admin-team-profile | ||
| feature/frontend-ui-redesign | ||
| * feature/frontend-ui-updates | ||
| feature/ui-improvement | ||
| feature/ui-save-card-improve | ||
| feature/濡쒓렇???뚯썝媛???섏씠吏 | ||
| fix/sidebar-layout-text-fix | ||
| main | ||
| remotes/origin/CI/CD | ||
| remotes/origin/HEAD -> origin/main | ||
| remotes/origin/backend | ||
| remotes/origin/dev | ||
| remotes/origin/feat/application-form-migration | ||
| remotes/origin/feat/comment-anon-and-delete-modal-dev | ||
| remotes/origin/feat/dev-deployment | ||
| remotes/origin/feat/pagination-infinite-sync | ||
| remotes/origin/feature/admin-team-profile | ||
| remotes/origin/feature/frontend-ui-redesign | ||
| remotes/origin/feature/frontend-ui-updates | ||
| remotes/origin/feature/full-page-capture | ||
| remotes/origin/feature/ui-improvement | ||
| remotes/origin/feature/ui-save-card-improve | ||
| remotes/origin/feature/?볤? | ||
| remotes/origin/feature/濡쒓렇???뚯썝媛???섏씠吏 | ||
| remotes/origin/fix/deployment-config | ||
| remotes/origin/fix/sidebar-layout-text-fix | ||
| remotes/origin/fix/濡쒓렇??id-pw-?섏젙-#17 | ||
| remotes/origin/kakao-login-with-backend | ||
| remotes/origin/login-only-comment | ||
| remotes/origin/main | ||
| remotes/origin/sync/dev-into-feature-ui-improvement | ||
| remotes/origin/work/frontend-feature-gap | ||
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,12 @@ | ||
| On branch feature/frontend-ui-updates | ||
| Changes not staged for commit: | ||
| (use "git add <file>..." to update what will be committed) | ||
| (use "git restore <file>..." to discard changes in working directory) | ||
| (commit or discard the untracked or modified content in submodules) | ||
| modified: MSGS_13_F (modified content) | ||
|
|
||
| Untracked files: | ||
| (use "git add <file>..." to include in what will be committed) | ||
| git_status.txt | ||
|
|
||
| no changes added to commit (use "git add" and/or "git commit -a") |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -128,6 +128,10 @@ interface TeamMemberResponse { | |
| name: string; | ||
| role: string; | ||
| profile_img_url: string | null; | ||
| message: { | ||
| title: string; | ||
| content: string; | ||
| } | null; | ||
| } | ||
|
|
||
| interface TeamMemberDetailResponse extends TeamMemberResponse { | ||
|
|
@@ -380,8 +384,8 @@ export async function getTeamMembers(): Promise<TeamMessageItem[]> { | |
| id: member.id.toString(), | ||
| name: member.name, | ||
| role: member.role, | ||
| title: member.message?.title || '', | ||
| content: member.message?.content || '', | ||
| imageUrl: normalizeAssetUrl(member.profile_img_url) | ||
| })); | ||
| } | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -22,9 +22,7 @@ | |
| let isLoading = $state(false); | ||
| let studentIdInputRef: HTMLDivElement | undefined = $state(); | ||
| let dialogEl: HTMLDivElement | undefined = $state(); | ||
| let infoMessage = $state(""); | ||
|
|
||
| // 애니메이션을 위한 상태 | ||
| let isVisible = $state(false); | ||
|
|
@@ -65,7 +63,7 @@ | |
|
|
||
| async function handleLogin() { | ||
| if (!name.trim() || !studentId.trim()) { | ||
| showInfoMessage("이름 또는 학번을 확인해 주세요."); | ||
| return; | ||
| } | ||
|
|
||
|
|
@@ -74,12 +72,13 @@ | |
| try { | ||
| await authStore.login(name.trim(), studentId.trim(), saveName); | ||
| // 로그인 성공 시 콜백 호출 | ||
| showInfoMessage("로그인 되었습니다."); | ||
| handleClose(); | ||
| setTimeout(() => { | ||
| onSuccess(); | ||
| }, 300); | ||
| } catch (error) { | ||
| showInfoMessage("이름 또는 학번을 확인해 주세요."); | ||
| studentId = ""; | ||
| studentIdFocused = true; | ||
| setTimeout(() => { | ||
|
|
@@ -108,10 +107,10 @@ | |
| } | ||
| */ | ||
|
|
||
| function showInfoMessage(message: string) { | ||
| infoMessage = message; | ||
| setTimeout(() => { | ||
| infoMessage = ""; | ||
| }, 3000); | ||
| } | ||
|
|
||
|
|
@@ -164,9 +163,11 @@ | |
| tabindex="-1" | ||
| > | ||
| <div | ||
| class="w-full shrink-0 bg-gradient-to-b from-[#FCDDA5] to-[#F1A470] rounded-t-3xl pt-4 pb-8 px-6 flex flex-col items-center shadow-lg transition-all duration-300 {isVisible | ||
| ? nameFocused || studentIdFocused | ||
| ? 'h-[88vh] translate-y-0' | ||
| : 'h-[72vh] translate-y-0' | ||
| : 'h-[72vh] translate-y-full'}" | ||
| onclick={(e) => e.stopPropagation()} | ||
| > | ||
| <!-- 닫기 버튼 --> | ||
|
|
@@ -192,7 +193,13 @@ | |
| /> | ||
|
|
||
| <!-- 입력 폼 --> | ||
| <form | ||
| class="w-full flex flex-col" | ||
| onsubmit={(e) => { | ||
| e.preventDefault(); | ||
| handleLogin(); | ||
| }} | ||
| > | ||
| <!-- 입력 필드 그룹 --> | ||
| <div class="flex flex-col gap-1 mb-2"> | ||
| <!-- 이름 입력 --> | ||
|
|
@@ -233,23 +240,23 @@ | |
|
|
||
| <!-- 로그인 버튼 --> | ||
| <div class="relative w-full"> | ||
| {#if infoMessage} | ||
| <div | ||
| class="absolute bottom-full left-1/2 -translate-x-1/2 mb-4 z-[60] pointer-events-none" | ||
| > | ||
| <span | ||
| class="bg-black/60 text-white text-[15px] px-5 py-2.5 rounded-3xl shadow-md font-medium whitespace-nowrap pointer-events-auto" | ||
| > | ||
| {infoMessage} | ||
| </span> | ||
| </div> | ||
| {/if} | ||
| <Button | ||
| label="메생결산 톡 입장" | ||
| variant="primary" | ||
| buttonState={isLoading ? "disabled" : "default"} | ||
| onClick={() => {}} | ||
| type="submit" | ||
| class="bg-white !text-[#F87C56] hover:bg-white/90 font-medium py-[14px] rounded-lg w-full" | ||
| /> | ||
| </div> | ||
|
|
@@ -298,7 +305,7 @@ | |
| <span>카카오 로그인</span> | ||
| </button> | ||
| --> | ||
| </form> | ||
|
|
||
| <!-- 푸터 안내문구 --> | ||
| <div class="mt-12 mb-4 flex justify-center"> | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -49,7 +49,9 @@ | |
| aria-label={label} | ||
| > | ||
| <span class="relative z-10">{label}</span> | ||
| <div | ||
| class="absolute inset-0 bg-black/4 rounded-lg transition-opacity duration-100" | ||
| class:opacity-100={isPressed || buttonState === "focused"} | ||
| class:opacity-0={!isPressed && buttonState !== "focused"} | ||
| ></div> | ||
| </button> | ||
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 |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ | |
|
|
||
| <a | ||
| href="/msg/{item.id}" | ||
| class="flex items-center gap-4 px-6 py-4 bg-white border-b border-bg-light hover:bg-gray-50 focus:bg-gray-50 transition-none last:border-b-0 select-none" | ||
| style="-webkit-touch-callout: none;" | ||
| draggable="false" | ||
| > | ||
|
|
@@ -38,6 +38,8 @@ | |
| class="text-[17px] leading-tight text-text-primary font-semibold truncate" | ||
| >{item.title}</span | ||
| > | ||
| <span class="text-[13px] font-normal text-[#9CA3AF]" | ||
| >{formatDate(item.acquiredAt)}</span | ||
| > | ||
| </div> | ||
| </a> | ||
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 |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ | |
| import { authStore } from "$lib/stores/auth"; | ||
| import { getAdminCharacter } from "$lib/api"; | ||
| import type { AuthState } from "$lib/types"; | ||
| import { toast } from "$lib/stores/toast"; | ||
|
|
||
| interface Props { | ||
| open: boolean; | ||
|
|
@@ -46,8 +47,8 @@ | |
|
|
||
| async function handleLogout() { | ||
| await authStore.logout(); | ||
| toast.show("로그아웃 되었습니다."); | ||
| onClose(); | ||
| } | ||
| </script> | ||
|
|
||
|
|
@@ -59,31 +60,34 @@ | |
| aria-hidden={!open} | ||
| > | ||
| <div class="flex flex-col gap-3 pt-16"> | ||
| <!-- Top Info Group --> | ||
| <div class="flex flex-col gap-0"> | ||
| <!-- Title Section --> | ||
| <div class="flex flex-col gap-1 px-6 py-4"> | ||
| <span class="text-xs text-text-muted" | ||
| >단풍바람 메생결산 정보</span | ||
| > | ||
| <span class="text-xl font-medium text-primary-dark" | ||
| >단풍바람 13기 메생결산</span | ||
| > | ||
| </div> | ||
|
|
||
| <!-- User Info Section --> | ||
| {#if authState.user} | ||
| <div class="flex items-center justify-between px-6 py-3"> | ||
| <span class="text-lg font-medium text-text-primary" | ||
| >{authState.user.name}</span | ||
| > | ||
| <button | ||
| onclick={handleLogout} | ||
| class="px-3 py-1.5 text-sm text-text-secondary hover:text-text-primary hover:bg-bg-light rounded transition-colors" | ||
| aria-label="로그아웃" | ||
| > | ||
| 로그아웃 | ||
| </button> | ||
| </div> | ||
| {/if} | ||
| </div> | ||
|
|
||
| <!-- Menu --> | ||
| <div class="flex flex-col gap-2"> | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -26,11 +26,13 @@ | |
| /> | ||
| </div> | ||
|
|
||
| <div class="flex flex-col grow min-w-0 gap-1 ml-2"> | ||
| <span | ||
| class="text-[17px] leading-tight text-text-primary font-semibold truncate" | ||
| >{item.title}</span | ||
| > | ||
| <span class="text-[13px] font-normal text-[#9CA3AF]" | ||
| >{item.name} {item.role}</span | ||
| > | ||
| </div> | ||
| </a> | ||
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 |
|---|---|---|
|
|
@@ -4,13 +4,13 @@ | |
| </script> | ||
|
|
||
| <div | ||
| class="fixed bottom-40 left-0 right-0 z-[100] flex flex-col items-center pointer-events-none gap-2 px-4" | ||
| > | ||
| {#each $toast as { id, message } (id)} | ||
| <div | ||
| in:slide={{ duration: 250 }} | ||
| out:fade={{ duration: 200 }} | ||
| class="bg-black/60 text-white px-6 py-2.5 rounded-3xl shadow-md text-[15px] font-medium text-center max-w-[90%] pointer-events-auto whitespace-nowrap" | ||
| > | ||
| {message} | ||
| </div> | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이 파일과
git_status_utf8.txt파일은 Git 상태를 나타내는 임시 파일로 보입니다. 버전 관리에 포함될 필요가 없으므로, 커밋에서 제거하는 것이 좋습니다..gitignore파일에git_*.txt와 같은 패턴을 추가하여 앞으로 이런 파일들이 커밋되지 않도록 방지할 수 있습니다.