Skip to content
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

케이크를 생성하고 수정한다. #41

Merged
merged 54 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
23ac2eb
Chore: client type 패키지 설치
ieun32 Jul 10, 2024
299fd8b
Chore: client assets/images alias 설정
ieun32 Jul 10, 2024
78f2100
Feat: 전역 색상 추가
ieun32 Jul 10, 2024
bcf604e
Feat: 케이크 만들기 페이지 추가
ieun32 Jul 10, 2024
e6006aa
Feat: 시트, 크림 SVG 파일 추가
ieun32 Jul 10, 2024
cbc49e0
Chore: images 내보내기
ieun32 Jul 10, 2024
d9f396a
Feat: 케이크 색깔 고르는 컴포넌트 생성
ieun32 Jul 10, 2024
22fcd59
Feat: 케이크 렌더링 컴포넌트 생성
ieun32 Jul 10, 2024
d0d6513
Chore: 케이크 색깔 타입 선언
ieun32 Jul 10, 2024
d97b3b5
Chore: 케이크 색깔 타입 내보내기
ieun32 Jul 10, 2024
fe8dcbe
Chore: process.env declare 추가
ieun32 Jul 10, 2024
1e61f6a
Chore: process.env 백틱 제거
ieun32 Jul 10, 2024
a75f324
Merge branch 'develop' of https://github.com/ISTTP/K-KOO into feature…
ieun32 Jul 10, 2024
ed584d7
Chore: 케이크 만들기 주소 변경
ieun32 Jul 10, 2024
a561d3f
Feat: 케이크 시트, 크림 SVG 생성
ieun32 Jul 10, 2024
c2c0cdb
Feat: 케이크 시트, 크림 SVG 넘겨주기
ieun32 Jul 10, 2024
675cb9b
Feat: 케이크 만들기 버튼 추가
ieun32 Jul 10, 2024
42c2f07
Chore: cake type에 eol 추가
ieun32 Jul 10, 2024
c793747
Merge branch 'develop' of https://github.com/ISTTP/K-KOO into feature…
ieun32 Jul 11, 2024
b3ef58e
Feat: 케이크 크림, 시트 정보 없으면 만들기 페이지로 리다이렉트
ieun32 Jul 11, 2024
5dab6a8
Feat: 케이크 시트, 크림 정보 저장 후 케이크 페이지로 리다이렉트
ieun32 Jul 11, 2024
43bd1ed
Feat: 케이크 시트, 크림 정보 get, post API 작성
ieun32 Jul 11, 2024
5386eab
Feat: 케이크 수정 버튼 누르면 만들기 페이지로 이동
ieun32 Jul 11, 2024
9428e90
Feat: 유저 정보 수정 함수 작성
ieun32 Jul 11, 2024
a41d7c9
Refactor: 인가 함수 에러 핸들링 로직 추가
ieun32 Jul 11, 2024
da8f185
Refactor: 케이크 만들기 주소 수정
ieun32 Jul 11, 2024
15e44c7
Feat: 크림, 시트 색상 타입 체크 유틸 함수 작성
ieun32 Jul 11, 2024
203f34b
Refactor: 로그 제거
ieun32 Jul 11, 2024
d5d8147
Refactor: 크림, 시트 색상 타입 체크 유틸 함수 임포트
ieun32 Jul 11, 2024
56cc866
Feat: 케이크 크림, 시트 색상 정보 조회/수정 함수 작성
ieun32 Jul 11, 2024
9c56e3b
Feat: 케이크 크림, 시트 색상 유틸 함수 내보내기
ieun32 Jul 11, 2024
364d22c
Feat: 편지 작성 페이지 추가
ieun32 Jul 12, 2024
2a16b08
Refactor: 케이크 렌더링 컴포넌트 수정
ieun32 Jul 12, 2024
644a436
Feat: 장식초 정보 요청 API 및 유틸함수
ieun32 Jul 12, 2024
fa9e413
Feat: nanoid 적용
ieun32 Jul 12, 2024
bfbac5f
Feat: nanoid 적용
ieun32 Jul 12, 2024
9d4ec60
Feat: 장식초 정보 요청 api
ieun32 Jul 12, 2024
a59248e
Merge branch 'develop' of https://github.com/ISTTP/K-KOO into feature…
ieun32 Jul 12, 2024
d64a5ca
Refactor: merge 후 코드 정리
ieun32 Jul 12, 2024
5ed072e
Feat: 편지 작성 페이지 추가, 주소에 ownerId 포함
ieun32 Jul 12, 2024
de08728
Style: 버튼 스타일 변경
ieun32 Jul 12, 2024
a6b7749
Refactor: styled component props에 $ 접두사 붙임
ieun32 Jul 12, 2024
5b3db6e
Feat: 케이크 렌더링 방식 변경
ieun32 Jul 12, 2024
a2e8afa
Style: 폰트 굵기 수정
ieun32 Jul 12, 2024
5e4daa5
Feat: 케이크 수정 버튼 리다이렉트
ieun32 Jul 12, 2024
8f16fdf
Feat:시트, 크림색 파라미터로 전달받고 케이크 렌더링
ieun32 Jul 12, 2024
3316095
Feat: 케이크 색상 정보 받아오기
ieun32 Jul 12, 2024
23dff18
Feat: 케이크 색상 정보 받아오기, 편지 작성 및 내 케이크 이동 버튼 생성
ieun32 Jul 12, 2024
901c8ed
Feat: 편지 작성 페이지 스텝별로 생성
ieun32 Jul 12, 2024
74220ab
Feat: 파라미터 ownerId로 변경
ieun32 Jul 12, 2024
0ec764d
Feat: 케이크 만들기 페이지 권한 로직 작성
ieun32 Jul 12, 2024
9614b9c
Feat: 루트 경로 접속시 토큰 유효성 확인, 케이크 페이지로 리다이렉트
ieun32 Jul 12, 2024
cafd7d1
Refactor: api 엔드포인트 겹치지 않도록 수정
ieun32 Jul 12, 2024
6091750
Refactor: 함수 리턴값 수정
ieun32 Jul 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "0.0.0",
"private": true,
"imports": {
"#images": "./src/assets/images/index.ts",
"#icons/*.tsx": "./src/assets/icons/*.tsx",
"#components/*.tsx": "./src/components/*.tsx",
"#pages/*.tsx": "./src/pages/*.tsx",
Expand Down
5 changes: 5 additions & 0 deletions apps/client/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,9 @@
--yellow-color: #FEE500;
--light-gray-color: #E9E9E9;
--dark-gray-color: #AAAAAA;
--strawberry-color: #F3A7A7;
--banana-color: #F1F3A7;
--mint-color: #BBF0A8;
--blueberry-color: #C4A7F3;
--chocolate-color: #7B4B23;
}
6 changes: 5 additions & 1 deletion apps/client/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import SignUp from '#pages/Signup.tsx';
import GoogleLogin from '#pages/GoogleLogin.tsx';
import KakaoLogin from '#pages/KakaoLogin.tsx';
import Cake from '#pages/Cake.tsx';
import CreateCake from '#pages/CreateCake.tsx';
import CreateLetter from '#pages/CreateLetter.tsx';
import './App.css';

const App = () => {
Expand All @@ -14,7 +16,9 @@ const App = () => {
<Route path="/signup" element={<SignUp />} />
<Route path="/auth/kakao" element={<KakaoLogin />} />
<Route path="/auth/google" element={<GoogleLogin />} />
<Route path="/cake/:cakeUserId" element={<Cake />} />
<Route path="/cake/:ownerId" element={<Cake />} />
<Route path="/cake/create/:ownerId" element={<CreateCake />} />
<Route path="/letter/create/:ownerId" element={<CreateLetter />} />
</Routes>
);
};
Expand Down
866 changes: 866 additions & 0 deletions apps/client/src/assets/images/BananaCream.tsx

Large diffs are not rendered by default.

116 changes: 116 additions & 0 deletions apps/client/src/assets/images/BananaSheet.tsx

Large diffs are not rendered by default.

846 changes: 846 additions & 0 deletions apps/client/src/assets/images/BlueberryCream.tsx

Large diffs are not rendered by default.

46 changes: 46 additions & 0 deletions apps/client/src/assets/images/BlueberrySheet.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import React from 'react';
import type { SVGProps } from 'react';

const BlueberrySheet = (props: SVGProps<SVGSVGElement>) => {
return (
<svg
version="1.0"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 1440 1440"
{...props}
>
<path
d="M0 0 C475.2 0 950.4 0 1440 0 C1440 475.2 1440 950.4 1440 1440 C964.8 1440 489.6 1440 0 1440 C0 964.8 0 489.6 0 0 Z "
fill="#BEA8EC"
transform="translate(0,0)"
/>
<path
d="M0 0 C409.53 0 819.06 0 1241 0 C1241 7.92 1241 15.84 1241 24 C1249.25 24 1257.5 24 1266 24 C1266 32.58 1266 41.16 1266 50 C1273.92 50 1281.84 50 1290 50 C1290.33 57.92 1290.66 65.84 1291 74 C1298.85342779 73.96041007 1298.85342779 73.96041007 1306.70678711 73.90991211 C1307.6788208 73.90741455 1308.65085449 73.90491699 1309.65234375 73.90234375 C1311.15269165 73.89448853 1311.15269165 73.89448853 1312.68334961 73.88647461 C1315 74 1315 74 1316 75 C1316 214.26 1316 353.52 1316 497 C856.97 497 397.94 497 -75 497 C-75 357.41 -75 217.82 -75 74 C-66.75 74 -58.5 74 -50 74 C-50 66.08 -50 58.16 -50 50 C-41.75 50 -33.5 50 -25 50 C-25 41.42 -25 32.84 -25 24 C-16.75 24 -8.5 24 0 24 C0 16.08 0 8.16 0 0 Z "
fill="#BEA8EC"
transform="translate(101,869)"
/>
<path
d="M0 0 C344.19 0 688.38 0 1043 0 C1043 8.25 1043 16.5 1043 25 C1051.25 25 1059.5 25 1068 25 C1068 33.25 1068 41.5 1068 50 C1075.92 50 1083.84 50 1092 50 C1092 57.92 1092 65.84 1092 74 C1100.25 74 1108.5 74 1117 74 C1117 180.59 1117 287.18 1117 397 C723.64 397 330.28 397 -75 397 C-75 290.41 -75 183.82 -75 74 C-66.42 74 -57.84 74 -49 74 C-49 66.08 -49 58.16 -49 50 C-41.41 49.67 -33.82 49.34 -26 49 C-25.67 41.08 -25.34 33.16 -25 25 C-16.75 25 -8.5 25 0 25 C0 16.75 0 8.5 0 0 Z "
fill="#BEA8EC"
transform="translate(200,447)"
/>
<path
d="M0 0 C475.2 0 950.4 0 1440 0 C1440 303.27 1440 606.54 1440 919 C1432.41 919 1424.82 919 1417 919 C1417 910.42 1417 901.84 1417 893 C1408.75 893 1400.5 893 1392 893 C1392 885.08 1392 877.16 1392 869 C1383.75 869 1375.5 869 1367 869 C1367 860.75 1367 852.5 1367 844 C1358.75 844 1350.5 844 1342 844 C1342 729.49 1342 614.98 1342 497 C1333.75 497 1325.5 497 1317 497 C1317 488.75 1317 480.5 1317 472 C1308.75 472 1300.5 472 1292 472 C1292 463.75 1292 455.5 1292 447 C1284.08 447 1276.16 447 1268 447 C1268 438.75 1268 430.5 1268 422 C1259.75 422 1251.5 422 1243 422 C1243 331.91 1243 241.82 1243 149 C1234.75 149 1226.5 149 1218 149 C1218 140.75 1218 132.5 1218 124 C1209.75 124 1201.5 124 1193 124 C1193 115.75 1193 107.5 1193 99 C1185.08 99 1177.16 99 1169 99 C1169 90.75 1169 82.5 1169 74 C1160.42 74 1151.84 74 1143 74 C1143 66.08 1143 58.16 1143 50 C864.81 50 586.62 50 300 50 C300 57.92 300 65.84 300 74 C291.42 74 282.84 74 274 74 C274 82.25 274 90.5 274 99 C266.08 99 258.16 99 250 99 C250 107.25 250 115.5 250 124 C241.75 124 233.5 124 225 124 C225 132.25 225 140.5 225 149 C216.75 149 208.5 149 200 149 C200 239.09 200 329.18 200 422 C191.75 422 183.5 422 175 422 C175 430.25 175 438.5 175 447 C167.08 447 159.16 447 151 447 C151 455.25 151 463.5 151 472 C142.42 472 133.84 472 125 472 C125 480.25 125 488.5 125 497 C117.08 497 109.16 497 101 497 C101 611.51 101 726.02 101 844 C92.75 844 84.5 844 76 844 C76 852.25 76 860.5 76 869 C67.75 869 59.5 869 51 869 C51 876.92 51 884.84 51 893 C42.75 893 34.5 893 26 893 C26 901.58 26 910.16 26 919 C18.08 919 10.16 919 2 919 C2 1074.43 2 1229.86 2 1390 C476.54 1390 951.08 1390 1440 1390 C1440 1406.5 1440 1423 1440 1440 C964.8 1440 489.6 1440 0 1440 C0 964.8 0 489.6 0 0 Z "
fill="#FEFEFE"
transform="translate(0,0)"
/>
<path
d="M0 0 C278.19 0 556.38 0 843 0 C843 7.92 843 15.84 843 24 C851.58 24 860.16 24 869 24 C869 32.25 869 40.5 869 49 C876.92 49 884.84 49 893 49 C893 57.25 893 65.5 893 74 C901.25 74 909.5 74 918 74 C918 82.25 918 90.5 918 99 C926.25 99 934.5 99 943 99 C943 189.09 943 279.18 943 372 C951.25 372 959.5 372 968 372 C968 380.25 968 388.5 968 397 C975.92 397 983.84 397 992 397 C992 405.25 992 413.5 992 422 C1000.25 422 1008.5 422 1017 422 C1017 430.25 1017 438.5 1017 447 C1025.25 447 1033.5 447 1042 447 C1042 561.51 1042 676.02 1042 794 C1050.25 794 1058.5 794 1067 794 C1067 802.25 1067 810.5 1067 819 C1075.25 819 1083.5 819 1092 819 C1092 826.92 1092 834.84 1092 843 C1100.25 843 1108.5 843 1117 843 C1117 851.58 1117 860.16 1117 869 C1124.59 869 1132.18 869 1140 869 C1140 1024.43 1140 1179.86 1140 1340 C665.46 1340 190.92 1340 -298 1340 C-298 1184.57 -298 1029.14 -298 869 C-290.08 869 -282.16 869 -274 869 C-274 860.42 -274 851.84 -274 843 C-265.75 843 -257.5 843 -249 843 C-249 835.08 -249 827.16 -249 819 C-240.75 819 -232.5 819 -224 819 C-224 810.75 -224 802.5 -224 794 C-215.75 794 -207.5 794 -199 794 C-199 679.49 -199 564.98 -199 447 C-191.08 447 -183.16 447 -175 447 C-175 438.75 -175 430.5 -175 422 C-166.42 422 -157.84 422 -149 422 C-149 413.75 -149 405.5 -149 397 C-141.08 397 -133.16 397 -125 397 C-125 388.75 -125 380.5 -125 372 C-116.75 372 -108.5 372 -100 372 C-100 281.91 -100 191.82 -100 99 C-91.75 99 -83.5 99 -75 99 C-75 90.75 -75 82.5 -75 74 C-66.75 74 -58.5 74 -50 74 C-50 65.75 -50 57.5 -50 49 C-42.08 49 -34.16 49 -26 49 C-26 40.75 -26 32.5 -26 24 C-17.42 24 -8.84 24 0 24 C0 16.08 0 8.16 0 0 Z M24 24 C24 32.25 24 40.5 24 49 C16.08 49 8.16 49 0 49 C0 57.25 0 65.5 0 74 C-8.58 74 -17.16 74 -26 74 C-26 82.25 -26 90.5 -26 99 C-33.92 99 -41.84 99 -50 99 C-50 107.25 -50 115.5 -50 124 C-58.25 124 -66.5 124 -75 124 C-75 205.84 -75 287.68 -75 372 C252.69 372 580.38 372 918 372 C918 290.16 918 208.32 918 124 C909.75 124 901.5 124 893 124 C893 115.75 893 107.5 893 99 C884.75 99 876.5 99 868 99 C868 90.75 868 82.5 868 74 C859.75 74 851.5 74 843 74 C843.33 65.75 843.66 57.5 844 49 C835.75 49 827.5 49 819 49 C819 40.75 819 32.5 819 24 C556.65 24 294.3 24 24 24 Z M-100 397 C-100 405.25 -100 413.5 -100 422 C-108.25 422 -116.5 422 -125 422 C-125.33 429.92 -125.66 437.84 -126 446 C-133.59 446.33 -141.18 446.66 -149 447 C-149 454.92 -149 462.84 -149 471 C-157.58 471 -166.16 471 -175 471 C-175 577.59 -175 684.18 -175 794 C218.36 794 611.72 794 1017 794 C1017 687.41 1017 580.82 1017 471 C1008.75 471 1000.5 471 992 471 C992 463.08 992 455.16 992 447 C984.08 447 976.16 447 968 447 C968 438.75 968 430.5 968 422 C959.75 422 951.5 422 943 422 C943 413.75 943 405.5 943 397 C598.81 397 254.62 397 -100 397 Z M-199 819 C-199 826.92 -199 834.84 -199 843 C-207.25 843 -215.5 843 -224 843 C-224 851.58 -224 860.16 -224 869 C-232.25 869 -240.5 869 -249 869 C-249 876.92 -249 884.84 -249 893 C-257.25 893 -265.5 893 -274 893 C-274 1032.59 -274 1172.18 -274 1316 C185.03 1316 644.06 1316 1117 1316 C1117 1176.74 1117 1037.48 1117 894 C1115.96207228 892.73818905 1115.96207228 892.73818905 1113.68334961 892.88647461 C1112.18300171 892.89432983 1112.18300171 892.89432983 1110.65234375 892.90234375 C1109.68031006 892.90484131 1108.70827637 892.90733887 1107.70678711 892.90991211 C1105.84098999 892.92356812 1105.84098999 892.92356812 1103.9375 892.9375 C1099.998125 892.958125 1096.05875 892.97875 1092 893 C1091.67 885.08 1091.34 877.16 1091 869 C1083.08 869 1075.16 869 1067 869 C1067 860.42 1067 851.84 1067 843 C1058.75 843 1050.5 843 1042 843 C1042 835.08 1042 827.16 1042 819 C632.47 819 222.94 819 -199 819 Z "
fill="#AB8BEB"
transform="translate(300,50)"
/>
<path
d="M0 0 C8.25 0 16.5 0 25 0 C25 0.33 25 0.66 25 1 C17.41 1 9.82 1 2 1 C2.12568359 3.58134766 2.12568359 3.58134766 2.25390625 6.21484375 C2.35704266 8.45571667 2.4598925 10.6966028 2.5625 12.9375 C2.61857422 14.07380859 2.67464844 15.21011719 2.73242188 16.38085938 C2.78076172 17.46044922 2.82910156 18.54003906 2.87890625 19.65234375 C2.9260376 20.65257568 2.97316895 21.65280762 3.02172852 22.68334961 C3 25 3 25 2 26 C-0.14046947 26.24113773 -2.28842647 26.41676089 -4.4375 26.5625 C-5.61183594 26.64628906 -6.78617188 26.73007812 -7.99609375 26.81640625 C-12.65956361 27.0302434 -17.33163011 27 -22 27 C-22 140.85 -22 254.7 -22 372 C-22.66 372 -23.32 372 -24 372 C-24 257.49 -24 142.98 -24 25 C-16.08 25 -8.16 25 0 25 C0 16.75 0 8.5 0 0 Z "
fill="#AA93DD"
transform="translate(125,472)"
/>
</svg>
);
};

export default BlueberrySheet;
Loading
Loading