-
Notifications
You must be signed in to change notification settings - Fork 0
feature/responsive web #7
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
Open
jdw09
wants to merge
31
commits into
main
Choose a base branch
from
feature/responsive-web
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
dbf4a14
responsive layout/footer
kwontaeyeonn 4bbc5d4
fix: breakpoint change
danjee2009 fe5a40c
fix: searchbar error
danjee2009 7e38ff9
fix: fixed layout
gangmin0716 a6d14f9
fix: fixed layout
gangmin0716 59565c6
feat: Responsive layout for room
gangmin0716 37d33e3
Merge pull request #1 from 8bit-beep/fix/layout
gangmin0716 0e7696a
feat: button text apply
danjee2009 454cb33
merge feature:blacklist
danjee2009 5ef505e
feat: checkpoint responsive view
jdw09 7585fe6
fix: add missing AuthProvier
jdw09 413935b
feat: root path redirection in mobile header
jdw09 ee9e84d
merge: feature/checkpoint-responsive
jdw09 9ba88c5
fix: fixed table
gangmin0716 e340322
feat: mobile attend type 반응형 추가 dangerText 추가
mingious02 e69bef5
Merge pull request #4 from 8bit-beep/feature/room-responsive
gangmin0716 092f435
fix: @bds-web Btn style 누락된 거 임시로 style로 정의.
mingious02 cab56c0
fix: color 토큰으로 수정
mingious02 83ae076
Merge pull request #5 from 8bit-beep/feature/attend-types-responsive
mingious02 3de6fd2
fix: students page responsive
35cdf81
chore: remove mock data file
688e28d
feat: add PC student section
c0e4a37
Merge pull request #6 from 8bit-beep/feature/students-reponsive
yungxhi 3897bfe
refactor: type definition format unification
jdw09 3a11951
refactor: resize tabbar icons and remove breakpoints in global.css
gangmin0716 025654d
fix: breakpoint
kwontaeyeonn fcaf574
fix: use Tailwind
kwontaeyeonn 413b51b
fix: remove duplicate code
kwontaeyeonn 99678b7
fix: convert to Tailwind, remove __next
kwontaeyeonn 7a725f4
merge: main to feature/responsive-web
jdw09 b625cb8
fix: remove email in modal component
jdw09 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
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -1,17 +1,21 @@ | ||
| import SearchBar from "@/features/search/ui/SearchBar"; | ||
| import AuthProvider from "@/shared/provider/AuthProvider"; | ||
| import Header from "@/widgets/header/ui/Header"; | ||
| import Sidebar from "@/widgets/sidebar/ui/Sidebar"; | ||
| import Tabbar from "@/widgets/tabbar/ui/Tabbar"; | ||
| import { PropsWithChildren } from "react"; | ||
|
|
||
| export default function MainLayout({ children }: PropsWithChildren) { | ||
| return ( | ||
| <div className="w-full h-screen flex items-start"> | ||
| <div className="w-full h-svh flex items-start flex-col xl:flex-row overflow-hidden"> | ||
| <AuthProvider /> | ||
| <Sidebar /> | ||
| <div className="flex-1 px-13 pt-13 flex flex-col gap-4.5"> | ||
| <Header /> | ||
| <main className="w-full flex-1 h-[calc(100%-147px)] xl:h-full xl:px-[70px] xl:pt-13 pb-1 xl:pb-5 flex flex-col gap-4.5 overflow-y-auto"> | ||
| <SearchBar /> | ||
| <main className="w-full h-[calc(100vh-114px)]">{children}</main> | ||
| </div> | ||
| {children} | ||
| </main> | ||
| <Tabbar /> | ||
| </div> | ||
| ); | ||
| } |
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 |
|---|---|---|
|
|
@@ -77,4 +77,4 @@ | |
| overscroll-behavior: none; | ||
| user-select: none; | ||
| font-family: "Pretendard", sans-serif; | ||
| } | ||
| } | ||
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
12 changes: 12 additions & 0 deletions
12
src/features/manage-attend-types/ui/MobileCreateAttendType.tsx
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 @@ | ||
| "use client"; | ||
|
|
||
| import { Button, modal } from "@bds-web/ui"; | ||
| import CreateAttendTypeModal from "./CreateAttendTypeModal"; | ||
|
|
||
| const MobileCreateAttendType = () => { | ||
| return ( | ||
| <Button buttonSize="medium" buttonType="primary" onClick={() => modal.open({ title: "출석 종류 추가하기", content: <CreateAttendTypeModal /> })}>출석 종류 추가</Button> | ||
| ) | ||
| } | ||
|
|
||
| export default MobileCreateAttendType |
28 changes: 28 additions & 0 deletions
28
src/features/manage-attend-types/ui/MobileDeleteAttendType.tsx
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,28 @@ | ||
| "use client"; | ||
|
|
||
| import { Button, modal } from "@bds-web/ui"; | ||
| import DeleteAttendTypeModal from "./DeleteAttendTypeModal"; | ||
| import { colors } from "@bds-web/colors"; | ||
|
|
||
| interface Props { | ||
| attendTypeId: number; | ||
| } | ||
|
|
||
| const MobileDeleteAttendType = ({ attendTypeId }: Props) => { | ||
| return ( | ||
| <Button | ||
| buttonSize="small" | ||
| buttonType="text" | ||
| style={{color: colors.red.dark}} // 임시방편 | ||
| onClick={() => | ||
| modal.open({ | ||
| title: "출석 종류를 삭제하시겠습니까?", | ||
| content: <DeleteAttendTypeModal attendTypeId={attendTypeId} />, | ||
| }) | ||
| }> | ||
| 삭제 | ||
| </Button> | ||
| ); | ||
| }; | ||
|
|
||
| export default MobileDeleteAttendType; |
14 changes: 14 additions & 0 deletions
14
src/features/manage-checkpoints/ui/MobileCreateCheckpoint.tsx
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,14 @@ | ||
| "use client"; | ||
|
|
||
| import { Button, modal } from "@bds-web/ui"; | ||
| import CreateCheckpointModal from "./CreateCheckpointModal"; | ||
|
|
||
| const CreateCheckpoint = () => { | ||
| return ( | ||
| <Button buttonSize="medium" buttonType="primary" onClick={() => modal.open({ title: "체크포인트 추가하기", content: <CreateCheckpointModal /> })}> | ||
| 체크포인트 추가하기 | ||
| </Button> | ||
| ) | ||
| } | ||
|
|
||
| export default CreateCheckpoint | ||
|
jdw09 marked this conversation as resolved.
|
||
30 changes: 30 additions & 0 deletions
30
src/features/manage-checkpoints/ui/MobileManageCheckpoint.tsx
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,30 @@ | ||
| "use client"; | ||
|
|
||
| import { Button, modal } from "@bds-web/ui"; | ||
| import { Checkpoint } from "@/entities/checkpoints/types"; | ||
| import MobileUpdateCheckpointModal from "./MobileUpdateCheckpointModal"; | ||
|
|
||
| interface Props { | ||
| data: Checkpoint; | ||
| } | ||
|
|
||
| const MobileManageCheckpoint = ({ data }: Props) => { | ||
| return ( | ||
| <div className="flex gap-2"> | ||
| <Button | ||
| buttonType="text" | ||
| buttonSize="small" | ||
| onClick={() => | ||
| modal.open({ | ||
| title: "체크포인트 정보 수정", | ||
| content: <MobileUpdateCheckpointModal data={data} />, | ||
| }) | ||
| } | ||
| > | ||
| 수정 | ||
| </Button> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default MobileManageCheckpoint; |
100 changes: 100 additions & 0 deletions
100
src/features/manage-checkpoints/ui/MobileUpdateCheckpointModal.tsx
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,100 @@ | ||
| "use client"; | ||
|
|
||
| import { Checkpoint } from "@/entities/checkpoints/types"; | ||
| import { Button, TextInput } from "@bds-web/ui"; | ||
| import { useUpdateCheckpoint } from "../hooks/useUpdateCheckpoint"; | ||
| import { useDeleteCheckpoint } from "../hooks/useDeleteCheckpoint"; | ||
|
|
||
| interface Props { | ||
| data: Checkpoint; | ||
| } | ||
|
|
||
| const MobileUpdateCheckpointModal = ({ data }: Props) => { | ||
| const { | ||
| name, | ||
| setName, | ||
| startAt, | ||
| setStartAt, | ||
| endAt, | ||
| setEndAt, | ||
| attendanceStartAt, | ||
| setAttendanceStartAt, | ||
| attendanceEndAt, | ||
| setAttendanceEndAt, | ||
| disabled, | ||
| onSubmit, | ||
| } = useUpdateCheckpoint(data); | ||
|
|
||
| const deleteCheckpoint = useDeleteCheckpoint(data.id); | ||
|
|
||
| return ( | ||
| <form className="w-full flex flex-col gap-4" onSubmit={onSubmit}> | ||
| <TextInput | ||
| label="실 이름 설정" | ||
| placeholder="실 이름을 설정해주세요." | ||
| width="100%" | ||
| value={name} | ||
| onChange={(e) => setName(e.target.value)} | ||
| /> | ||
| <div className="space-y-1"> | ||
| <span className="text-caption1 text-static-black"> | ||
| 체크포인트 기간 설정 | ||
| </span> | ||
| <div className="w-full flex items-center justify-between"> | ||
| <TextInput | ||
| placeholder="HH:MM" | ||
| width="144px" | ||
| value={startAt} | ||
| onChange={(e) => setStartAt(e.target.value)} | ||
| /> | ||
| <span>-</span> | ||
| <TextInput | ||
| placeholder="HH:MM" | ||
| width="144px" | ||
| value={endAt} | ||
| onChange={(e) => setEndAt(e.target.value)} | ||
| /> | ||
| </div> | ||
| </div> | ||
| <div className="space-y-1"> | ||
| <span className="text-caption1 text-static-black"> | ||
| 출석 가능 기간 설정 | ||
| </span> | ||
| <div className="w-full flex items-center justify-between"> | ||
| <TextInput | ||
| placeholder="HH:MM" | ||
| width="144px" | ||
| value={attendanceStartAt} | ||
| onChange={(e) => setAttendanceStartAt(e.target.value)} | ||
| /> | ||
| <span>-</span> | ||
| <TextInput | ||
| placeholder="HH:MM" | ||
| width="144px" | ||
| value={attendanceEndAt} | ||
| onChange={(e) => setAttendanceEndAt(e.target.value)} | ||
| /> | ||
| </div> | ||
| </div> | ||
|
|
||
| <Button | ||
| buttonSize="large" | ||
| buttonType="primary" | ||
| type="submit" | ||
| disabled={disabled} | ||
| > | ||
| 체크포인트 추가하기 | ||
| </Button> | ||
| <Button | ||
| buttonType="danger" | ||
| buttonSize="medium" | ||
| onClick={deleteCheckpoint} | ||
| style={{ flex: 1 }} | ||
| > | ||
| 삭제 | ||
| </Button> | ||
|
jdw09 marked this conversation as resolved.
|
||
| </form> | ||
| ); | ||
| }; | ||
|
|
||
| export default MobileUpdateCheckpointModal; | ||
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.
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.