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

배포 전 중간 점검 #139

Merged
merged 56 commits into from
Dec 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
8561be9
Style: 안쓰는 코드 삭제
hhbb0081 Dec 1, 2023
73240a3
Merge remote-tracking branch 'upstream/test' into test
hhbb0081 Dec 1, 2023
c84335f
Fix: build 오류 해결
hhbb0081 Dec 1, 2023
6b2da7f
Merge pull request #123 from hhbb0081/test
hhbb0081 Dec 1, 2023
123402d
Style: public image 추가
hhhhyelim Dec 1, 2023
44fb90b
Merge branch 'test' of https://github.com/readyvery/readyFront into test
hhhhyelim Dec 1, 2023
28b7d80
Fix: 로그인 이미지 화질 변경
hhhhyelim Dec 1, 2023
d3a9774
Merge pull request #124 from hhhhyelim/test
marinesnow34 Dec 1, 2023
ee337fd
Feat: 가게 메뉴 리스트에 할인 가격 띄우기
imi21123 Dec 1, 2023
e6fd962
Merge branch 'test' of https://github.com/readyvery/readyFront into test
imi21123 Dec 1, 2023
a1abdca
Merge pull request #125 from imi21123/test
marinesnow34 Dec 1, 2023
abb34df
Style: public 이미지 추가
hhhhyelim Dec 1, 2023
d0f28eb
Merge branch 'test' of https://github.com/readyvery/readyFront into test
hhhhyelim Dec 1, 2023
10c62b8
Merge pull request #126 from hhhhyelim/test
marinesnow34 Dec 1, 2023
1bc6ba7
CSS: radio, checkbox 스타일 변경
hhbb0081 Dec 1, 2023
05a79ed
Docs: 옵션 배열 수정
hhbb0081 Dec 1, 2023
f9835b6
Merge remote-tracking branch 'upstream/test' into test
hhbb0081 Dec 1, 2023
e2d1eb8
Merge pull request #127 from hhbb0081/test
hhbb0081 Dec 1, 2023
360dfc8
Feat: storeId 다르면 장바구니 버튼 안보이게, 케이스 별 장바구니 모달
imi21123 Dec 1, 2023
0f73b16
Fix: 충돌 수정
imi21123 Dec 1, 2023
8010ece
Merge pull request #128 from imi21123/test
marinesnow34 Dec 1, 2023
95467c0
Feat: 장바구니 아이템 옵션 UI 수정
imi21123 Dec 1, 2023
2b4c21b
Merge branch 'test' of https://github.com/readyvery/readyFront into test
imi21123 Dec 1, 2023
451a8b2
Merge pull request #129 from imi21123/test
marinesnow34 Dec 1, 2023
edc1edb
Feat: 장바구니 뒤로가기 수정
imi21123 Dec 1, 2023
1b3010b
Feat: 주문상세 뒤로가기 경로 추가
hhbb0081 Dec 2, 2023
f40cd43
Fix: 빈배열 시 에러 해결
hhbb0081 Dec 2, 2023
3d66108
Chore: Recoil 디버거 툴 설치
hhbb0081 Dec 2, 2023
58b8f5b
Merge remote-tracking branch 'upstream/test' into test
hhbb0081 Dec 2, 2023
9c86437
Merge pull request #130 from imi21123/test
hhbb0081 Dec 2, 2023
7f3a016
Merge remote-tracking branch 'upstream/test' into test
hhbb0081 Dec 2, 2023
dc1101b
Merge pull request #131 from hhbb0081/test
hhbb0081 Dec 2, 2023
8ff8aa3
Fix: recoil 새로고침 시 값 변경 오류 해결
hhbb0081 Dec 2, 2023
39d19ac
Merge remote-tracking branch 'upstream/test' into test
hhbb0081 Dec 2, 2023
d5539a4
Merge pull request #132 from hhbb0081/test
hhbb0081 Dec 2, 2023
ac3792b
Design: 홈 화면 header 그림자 추가
hhhhyelim Dec 3, 2023
76bbcce
Merge branch 'test' of https://github.com/readyvery/readyFront into test
hhhhyelim Dec 3, 2023
86722d2
Fix: header 장바구니, 홈 아이콘 위치 변경
hhhhyelim Dec 3, 2023
177ec2a
Merge pull request #133 from hhhhyelim/test
marinesnow34 Dec 3, 2023
2e72926
Feat: 가격 표시 방법 수정(toLocaleString)
imi21123 Dec 3, 2023
9f6465f
Merge branch 'test' of https://github.com/readyvery/readyFront into test
imi21123 Dec 3, 2023
4236ee2
Feat: 가게 페이지 스크롤 수정, 장바구니 버튼 위치 수정
imi21123 Dec 3, 2023
c460bae
Merge pull request #134 from imi21123/test
marinesnow34 Dec 3, 2023
3b76adc
Feat: 장바구니 버튼 위치 수정
imi21123 Dec 3, 2023
b1cc5d8
Merge pull request #135 from imi21123/test
marinesnow34 Dec 3, 2023
18d5651
Feat: 로그인, 회원가입 모달창 구현
hhhhyelim Dec 3, 2023
f4c04fa
Feat: 장바구니 쿼리 파라미터, 영업 종료 시 준비중 버튼
imi21123 Dec 3, 2023
fedf0e4
Merge branch 'test' of https://github.com/readyvery/readyFront into test
imi21123 Dec 3, 2023
a4a15cf
Merge pull request #136 from hhhhyelim/test
marinesnow34 Dec 3, 2023
b384687
Feat: 오르다 이벤트 문구 추가
imi21123 Dec 3, 2023
6d334da
Merge branch 'test' of https://github.com/readyvery/readyFront into test
imi21123 Dec 3, 2023
3deb3fc
Fix: 장바구니 페이지에서 홈아이콘 위치 수정
hhhhyelim Dec 3, 2023
56b2520
Feat: 가게 페이지 하단 패딩 추가, 사진 없는 메뉴 이미지 수정
imi21123 Dec 3, 2023
2bb36a1
Merge branch 'test' of https://github.com/readyvery/readyFront into test
hhhhyelim Dec 3, 2023
dc5a79b
Merge pull request #137 from hhhhyelim/test
marinesnow34 Dec 3, 2023
b92f7bd
Merge pull request #138 from imi21123/test
marinesnow34 Dec 3, 2023
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
27 changes: 13 additions & 14 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3,462 changes: 1,690 additions & 1,772 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
"react-scripts": "5.0.1",
"react-slick": "^0.29.0",
"recoil": "^0.7.7",
"recoil-persist": "^5.1.0",
"recoilize": "^3.2.0",
"redux": "^4.2.1",
"redux-promise": "^0.6.0",
"redux-thunk": "^2.4.2",
Expand Down
9 changes: 9 additions & 0 deletions public/images/cafe_dream/bakery_bagelchip.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/cafe_dream/bundaberg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/cafe_dream/coffee_caramellmocha.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/cafe_dream/coffee_whitemocha.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions public/images/cafe_dream/noncoffee_chocolatte.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions public/images/cafe_dream/tea_greentea.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/cafe_dream/tea_peachicetea.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 20 additions & 20 deletions public/images/event/dream_event_promotion.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 14 additions & 14 deletions public/images/event/harang_event_promotion.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions public/images/event/insta_event_promotion.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
92 changes: 92 additions & 0 deletions public/images/event/member_event_promotion.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 34 additions & 34 deletions public/images/event/orda_event_promotion.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/harang/coffee_cappucino.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/harang/coffee_caramel.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/harang/coffee_white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/harang/latte_sweetpotato.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/harang/tea_peachicetea.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/orda/bakery_carrotcake.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/orda/bakery_cheesecake.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/orda/bakery_icecreamcroffle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/orda/bakery_macaron.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/orda/bakery_macaron_biscuit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/orda/bakery_macaron_blackcookie.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/orda/bakery_macaron_blueberry.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/orda/bakery_macaron_choco.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/images/orda/bakery_macaron_chocovanila.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/bakery_macaron_creambrille.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/bakery_macaron_greenchoco.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/bakery_macaron_hongchaearlgrey.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/bakery_macaron_mintchoco.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/bakery_macaron_peachyogurt.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/bakery_macaron_pigbar.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/bakery_macaron_saltcaramell.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/bakery_macaron_strawberry.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/bakery_macaron_sweetpong.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/bakery_macaron_yellowcheese.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/bakery_plaincroffle.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/bakery_tiramisu.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/coffee_cappucino.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/coffee_white.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/latte_sweetpotato.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/sanpellegrino.svg

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/images/orda/tea_peachicetea.svg

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion src/App.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { message } from "antd";
import axios from "axios";
import React, { Suspense } from "react";
import { useCookies } from "react-cookie";
Expand All @@ -7,6 +8,7 @@ import HomePage from "../src/pages/HomePage/Homepage";
import MyPage from "../src/pages/MyPage/MyPage";
import StoreDetailPage from "../src/pages/StoreDetailPage/StoreDetailPage";
import "./App.css";
import loading from "./assets/animation/loading.json";
import Auth from "./hoc/auth";
import useInterval from "./hooks/useInterval";
import CafeSearchPage from "./pages/CafeSearch/CafeSearch";
Expand Down Expand Up @@ -63,6 +65,7 @@ function App() {
// const NewPackagingStatusPage = Auth(PackagingStatusPage, true);

const minute = 1000 * 60 * 60 * 24; // 24시간
// const minute = 1000 * 60;
// 주기적으로 실행되는 함수
useInterval(() => {
// 리프레시 토큰이 존재하고, 비어 있지 않은 경우
Expand All @@ -81,11 +84,14 @@ function App() {
console.log(response);
// 현재 쿠키 삭제
if (!response.data) {
message.info("다시 로그인해주세요.");
removeCookies();
navigate("/kakaologin");
}
})
.catch((error) => {
console.log(error);
message.info("다시 로그인해주세요.");
navigate("/kakaologin");
});
}
Expand All @@ -94,7 +100,7 @@ function App() {
return (
<div className="App">
<RecoilRoot>
<Suspense fallback={<div>Loading...</div>}>
<Suspense fallback={<div><img src={loading} alt="loading"/></div>}>
<Routes>
{/* 로그인 하지 않아도 볼 수 있는 페이지 */}
{/* 메인페이지 */}
Expand Down
8 changes: 8 additions & 0 deletions src/Atom/status.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import axios from "axios";
import { atom, selector } from "recoil";
import { recoilPersist } from 'recoil-persist';

const { persistAtom } = recoilPersist();

// 현재 사용자가 인증되었는지 여부를 나타내는 상태
export const isAuthenticatedState = atom({
key: "isAuthenticatedState",
default: false, // 인증되지 않았다고 가정
effects_UNSTABLE: [persistAtom],
});

// 현재 사용자의 인증 상태를 가져오거나 토글하는 selector
Expand All @@ -19,6 +23,7 @@ export const getAuthenticatedSelector = selector({
// 현재 isAuthenticatedState의 값을 반전
set(isAuthenticatedState, (currentValue) => !currentValue);
},
effects_UNSTABLE: [persistAtom],
});

// 사용자의 로그인 상태 및 토큰 정보를 저장하는 상태
Expand All @@ -28,12 +33,14 @@ export const loginState = atom({
accessToken: null,
expiredTime: null,
},
effects_UNSTABLE: [persistAtom],
});

// 사용자 정보를 저장하는 상태
export const userState = atom({
key: "userState",
dafault: null,
effects_UNSTABLE: [persistAtom],
});

// 사용자 정보를 가져오는 selector
Expand Down Expand Up @@ -65,4 +72,5 @@ export const getUserSelector = selector({
// 가져온 사용자 정보 userState에 저장
set(userState, newValue);
},
effects_UNSTABLE: [persistAtom],
});
1 change: 1 addition & 0 deletions src/assets/animation/loading.json

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions src/assets/images/go_left.svg
17 changes: 17 additions & 0 deletions src/assets/images/go_right.svg
Binary file added src/assets/images/kakao_logo.png
12 changes: 4 additions & 8 deletions src/assets/images/kakao_logo.svg

Large diffs are not rendered by default.

44 changes: 33 additions & 11 deletions src/assets/images/no_image_menu.svg

Large diffs are not rendered by default.

Binary file added src/assets/images/payment_fail.png
23 changes: 23 additions & 0 deletions src/assets/images/payment_fail.svg

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/assets/images/store_not_open.svg
3 changes: 3 additions & 0 deletions src/assets/images/store_not_open_icon.svg
16 changes: 14 additions & 2 deletions src/components/views/Header/Header.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
z-index: 100;
align-items: center;
border-radius: 0rem 0rem 2rem 2rem;
box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
}

.top_header_page {
Expand Down Expand Up @@ -46,7 +47,18 @@
}

.homeIcon {
margin-right: 1rem; /* 간격을 주기 위한 마진 값 설정 */
margin-left: 1rem; /* 간격을 주기 위한 마진 값 설정 */
}

.home-link2 {
margin-left: auto;
margin-right: 2rem;
}

.homeIcon2 {
margin: 0 2rem;
/* margin-left: 2rem; */
/* 간격을 주기 위한 마진 값 설정 */
}

/* cart-link 및 bagIcon 스타일 조정 */
Expand All @@ -55,7 +67,7 @@
}

.bagIcon {
margin-left: 1rem; /* 간격을 주기 위한 마진 값 설정 */
margin-right: 1rem; /* 간격을 주기 위한 마진 값 설정 */
}

/* homeAndCart 간격 조정 */
Expand Down
28 changes: 18 additions & 10 deletions src/components/views/Header/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,30 @@ const Header = ({ headerProps }) => {
) : (
// isClosed가 false인 경우
<div className="homeAndCart">
{/* 현재 페이지가 홈이 아니고 장바구니 페이지가 아닌 경우에만 홈 아이콘 표시 */}
{!isCartPage && (
<Link to="/" className="home-link">
{/* 현재 페이지가 홈이 아니고 장바구니 페이지가 아닌 경우에만 장바구니 아이콘 표시 */}
{!isCartPage ? (
<div>
<Link to="/cart" className="cart-link">
<img src={icon_bag} alt="bagIcon" className="bag-icon" />
</Link>

<Link to="/" className="home-link">
<img
src={home_logo_bk}
alt="homeIcon"
className="homeIcon"
/>
</Link>
</div>
) : (
<Link to="/" className="home-link-2">
<img
src={home_logo_bk}
alt="homeIcon"
className="homeIcon"
className="homeIcon2"
/>
</Link>
)}
{/* 현재 페이지가 홈이 아니고 장바구니 페이지가 아닌 경우에만 장바구니 아이콘 표시 */}
{!isCartPage && (
<Link to="/cart" className="cart-link">
<img src={icon_bag} alt="bagIcon" className="bag-icon" />
</Link>
)}
</div>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/NavBar/NavBar.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
right: 0;
height: 6rem; /*60px*/
background-color: #00000000;
z-index: 3;
z-index: 100;

-webkit-tap-highlight-color: transparent; /*모바일 크롬 브라우저에서 클릭시 하이라이트 제거*/
}
Expand Down
Loading