generated from Park-min-hyoung/check-location
-
Notifications
You must be signed in to change notification settings - Fork 0
목표 생성 기능 #11
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
목표 생성 기능 #11
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
8990017
feat: kakao/google login
yj-leee c0db1c0
fix: 서버응답 데이터 에러처리
yj-leee 4fe587f
feat: 로그인 스타일링
yj-leee c8704b9
feat: 이미지 최적화
yj-leee 5cd0b06
refactor: 로그인 이미지 네임 변경
yj-leee eb0e02f
feat: track login image with Git LFS
yj-leee 0d75b38
feat: temp
yj-leee 155b7e0
feat: temp
yj-leee b0715e1
feat: 전체 기능 1차
yj-leee 384cdc7
feat: 임시저장 기능 서버에서 불러오기
yj-leee 24f5e3e
refactor: 코드 정리 및 타입
yj-leee 987d3b8
refactor: 목표기간
yj-leee e61dd44
fix: 타입 수정
yj-leee 473b554
style: 스타일 적용
yj-leee 0ad2427
style: 캘린더 스타일 적용
yj-leee 2647bee
Merge branch 'dev' into feat/goal-create
yj-leee ef27b95
Merge branch 'dev' into feat/goal-create
yj-leee a5b2dd2
fix: 병합 오류 수정
yj-leee 2ed9a8a
fix: 버튼 이동 url 수정
yj-leee f1905ed
fix: 리뷰 반영
yj-leee 8c4f086
Merge branch 'dev' into feat/goal-create
yj-leee a3aa33e
Merge branch 'dev' into feat/goal-create
yj-leee 7c6e7a0
fix: 불필요한 공백 제거
yj-leee a57e2ae
fix: 리뷰 반영
yj-leee 45efa97
Merge branch 'dev' into feat/goal-create
yj-leee fe62243
fix: toast 적용
yj-leee 5789770
Merge branch 'dev' into feat/goal-create
yj-leee 97e0daf
fix: conflict 해결 및 store userId 추가
yj-leee 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
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| import CreateGoal from "@/features/goal/routes/CreateGoal"; | ||
| import { useParams } from "react-router"; | ||
|
|
||
| const CreateGoalView = () => { | ||
| const { goalId } = useParams<{ goalId?: string }>(); | ||
| const parsedGoalId: number | undefined = goalId ? Number(goalId) : undefined; | ||
|
|
||
| return <CreateGoal goalId={parsedGoalId} />; | ||
| }; | ||
|
|
||
| export default CreateGoalView; |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
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
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 |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| interface BalanceInfoProps { | ||
yj-leee marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| balancePoint: number; | ||
| } | ||
|
|
||
| const BalanceInfo: React.FC<BalanceInfoProps> = ({ balancePoint }) => ( | ||
| <div className="relative mt-[20px] flex h-[51px] w-[335px] flex-col gap-[19px]"> | ||
| <div className="flex h-[18px] w-full items-center justify-between text-[16px] font-normal leading-[18px] tracking-[-2.5%] text-gray-900"> | ||
| <span>차감 포인트:</span> | ||
| <span className="flex items-center gap-1"> | ||
| <span className="h-[18px] w-[31px] text-[16px] font-bold leading-[18px] tracking-[-2.5%] text-gray-900"> | ||
| 200 | ||
| </span> | ||
| <span className="ml-[2px] h-[18px] w-[10px] text-[16px] leading-[18px] tracking-[-2.5%] text-gray-900"> | ||
| p | ||
| </span> | ||
| </span> | ||
| </div> | ||
| <div className="ml-auto mt-0 flex items-center text-gray-400"> | ||
| <span className="text-[12px] font-normal leading-[14px] tracking-[-2.5%]"> | ||
| 보유 포인트 | ||
| </span> | ||
| <div className="flex items-end gap-1"> | ||
| <span className="w-[30px] text-right text-[12px] font-semibold leading-[14px] tracking-[-2.5%]"> | ||
| {balancePoint} | ||
| </span> | ||
| <span className="w-[6px] text-right text-[10px] font-normal leading-[12px] tracking-[-2.5%]"> | ||
| p | ||
| </span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
|
|
||
| export default BalanceInfo; | ||
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,71 @@ | ||
| import { format } from "date-fns"; | ||
|
|
||
| interface DatePickerProps { | ||
| startDate: Date | null; | ||
| endDate: Date | null; | ||
| onDateClick: (mode: "start" | "end") => void; | ||
| } | ||
|
|
||
| const DatePicker: React.FC<DatePickerProps> = ({ | ||
| startDate, | ||
| endDate, | ||
| onDateClick | ||
| }) => ( | ||
| <div className="h-[86px] w-[335px]"> | ||
| <label className="block text-[14px] font-medium leading-[16px] tracking-[-2.5%] text-[#1A1A1A]"> | ||
| 목표 기간 | ||
| </label> | ||
| <div className="mt-1 flex items-center justify-between"> | ||
| <button | ||
| className={`h-[44px] w-[150px] rounded-[8px] p-[10px] text-[14px] ${ | ||
| startDate ? "text-black" : "text-gray-400" | ||
| } flex items-center gap-2 bg-gray-50`} | ||
| onClick={() => onDateClick("start")} | ||
| > | ||
| <svg | ||
| width="18" | ||
| height="18" | ||
| viewBox="0 0 18 18" | ||
| fill="none" | ||
| xmlns="http://www.w3.org/2000/svg" | ||
| className="mr-1 text-gray-400" | ||
| > | ||
| <path | ||
| d="M13 0C13.2449 3.23106e-05 13.4813 0.0899562 13.6644 0.252715C13.8474 0.415475 13.9643 0.639749 13.993 0.883L14 1V2H16C16.5046 1.99984 16.9906 2.19041 17.3605 2.5335C17.7305 2.87659 17.9572 3.34684 17.995 3.85L18 4V16C18.0002 16.5046 17.8096 16.9906 17.4665 17.3605C17.1234 17.7305 16.6532 17.9572 16.15 17.995L16 18H2C1.49542 18.0002 1.00943 17.8096 0.639452 17.4665C0.269471 17.1234 0.0428434 16.6532 0.00500021 16.15L1.00268e-07 16V4C-0.000159579 3.49542 0.190406 3.00943 0.533497 2.63945C0.876588 2.26947 1.34684 2.04284 1.85 2.005L2 2H4V1C4.00028 0.74512 4.09788 0.499968 4.27285 0.314632C4.44782 0.129296 4.68695 0.017765 4.94139 0.00282788C5.19584 -0.0121092 5.44638 0.0706746 5.64183 0.234265C5.83729 0.397855 5.9629 0.629904 5.993 0.883L6 1V2H12V1C12 0.734784 12.1054 0.48043 12.2929 0.292893C12.4804 0.105357 12.7348 0 13 0ZM16 9H2V16H16V9ZM16 4H2V7H16V4Z" | ||
| fill="#9E9E9E" | ||
| /> | ||
| </svg> | ||
|
|
||
| {startDate ? format(startDate, "yyyy-MM-dd") : "시작 날짜"} | ||
| </button> | ||
| <span className="rounded px-2 py-1 text-gray-500">~</span> | ||
| <button | ||
| className={`h-[44px] w-[150px] rounded-[8px] p-[10px] text-[14px] ${ | ||
| endDate ? "text-black" : "text-gray-400" | ||
| } flex items-center gap-2 bg-gray-50`} | ||
| onClick={() => onDateClick("end")} | ||
| > | ||
| <svg | ||
| width="18" | ||
| height="18" | ||
| viewBox="0 0 18 18" | ||
| fill="none" | ||
| xmlns="http://www.w3.org/2000/svg" | ||
| className="mr-1 text-gray-400" | ||
| > | ||
| <path | ||
| d="M13 0C13.2449 3.23106e-05 13.4813 0.0899562 13.6644 0.252715C13.8474 0.415475 13.9643 0.639749 13.993 0.883L14 1V2H16C16.5046 1.99984 16.9906 2.19041 17.3605 2.5335C17.7305 2.87659 17.9572 3.34684 17.995 3.85L18 4V16C18.0002 16.5046 17.8096 16.9906 17.4665 17.3605C17.1234 17.7305 16.6532 17.9572 16.15 17.995L16 18H2C1.49542 18.0002 1.00943 17.8096 0.639452 17.4665C0.269471 17.1234 0.0428434 16.6532 0.00500021 16.15L1.00268e-07 16V4C-0.000159579 3.49542 0.190406 3.00943 0.533497 2.63945C0.876588 2.26947 1.34684 2.04284 1.85 2.005L2 2H4V1C4.00028 0.74512 4.09788 0.499968 4.27285 0.314632C4.44782 0.129296 4.68695 0.017765 4.94139 0.00282788C5.19584 -0.0121092 5.44638 0.0706746 5.64183 0.234265C5.83729 0.397855 5.9629 0.629904 5.993 0.883L6 1V2H12V1C12 0.734784 12.1054 0.48043 12.2929 0.292893C12.4804 0.105357 12.7348 0 13 0ZM16 9H2V16H16V9ZM16 4H2V7H16V4Z" | ||
| fill="#9E9E9E" | ||
| /> | ||
| </svg> | ||
|
|
||
| {endDate ? format(endDate, "yyyy-MM-dd") : "목표 날짜"} | ||
| </button> | ||
| </div> | ||
| <p className="mt-1 text-[12px] font-medium leading-[14px] tracking-[-2.5%] text-gray-400"> | ||
| 최소 7일, 최대 3개월까지 설정할 수 있어요. | ||
| </p> | ||
| </div> | ||
| ); | ||
|
|
||
| export default DatePicker; |
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.