diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index a11777c..0000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/public/images/location.svg b/public/images/location.svg deleted file mode 100644 index ce14d74..0000000 --- a/public/images/location.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/public/index.html b/public/index.html index 1d97bd1..f2256b2 100644 --- a/public/index.html +++ b/public/index.html @@ -5,25 +5,36 @@ + + + 맛알고리즘 diff --git a/public/manifest.json b/public/manifest.json index 651da91..bd7799f 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -3,17 +3,17 @@ "name": "맛있는 알고리즘으로 찾는 당신의 인생 맛집!", "icons": [ { - "src": "Logo.svg", + "src": "https://wnstn6945.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F499f229c-bff2-4c82-ae94-81c36fa59a9c%2F486bd819-ad54-4f34-bd54-23ef03ca65c5%2FGroup_1000002041_(5).svg?table=block&id=965a81f4-7d80-4af9-9379-4c6ca3fe7174&spaceId=499f229c-bff2-4c82-ae94-81c36fa59a9c&userId=&cache=v2", "sizes": "64x64 32x32 24x24 16x16", "type": "image/x-icon" }, { - "src": "Logo.svg", + "src": "https://wnstn6945.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F499f229c-bff2-4c82-ae94-81c36fa59a9c%2F486bd819-ad54-4f34-bd54-23ef03ca65c5%2FGroup_1000002041_(5).svg?table=block&id=965a81f4-7d80-4af9-9379-4c6ca3fe7174&spaceId=499f229c-bff2-4c82-ae94-81c36fa59a9c&userId=&cache=v2", "type": "image/png", "sizes": "192x192" }, { - "src": "Logo.svg", + "src": "https://wnstn6945.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F499f229c-bff2-4c82-ae94-81c36fa59a9c%2F486bd819-ad54-4f34-bd54-23ef03ca65c5%2FGroup_1000002041_(5).svg?table=block&id=965a81f4-7d80-4af9-9379-4c6ca3fe7174&spaceId=499f229c-bff2-4c82-ae94-81c36fa59a9c&userId=&cache=v2", "type": "image/png", "sizes": "512x512" } diff --git a/robots.txt b/robots.txt index 90b3f9e..128dc1f 100644 --- a/robots.txt +++ b/robots.txt @@ -1,4 +1,3 @@ # https://www.robotstxt.org/robotstxt.html -User-agent: * -Allow: / - +user-agent: * +disallow: /downloads/ diff --git a/src/components/common/header/Header.jsx b/src/components/common/header/Header.jsx index 3c57a98..abf8a63 100644 --- a/src/components/common/header/Header.jsx +++ b/src/components/common/header/Header.jsx @@ -41,7 +41,7 @@ const Header = () => { return ( logo @@ -92,7 +92,6 @@ const HeaderLayout = styled.header` padding-right: 10px; } border-bottom: 1px solid ${LightGrey}; - margin-bottom: 10px; `; const ButtonContainer = styled.div` diff --git a/src/components/common/map/Map.jsx b/src/components/common/map/Map.jsx index 1f098aa..e3bca91 100644 --- a/src/components/common/map/Map.jsx +++ b/src/components/common/map/Map.jsx @@ -73,7 +73,7 @@ const MyMap = () => { title: name, clickable: true, icon: { - url: '/images/location.svg', + url: 'https://wnstn6945.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F499f229c-bff2-4c82-ae94-81c36fa59a9c%2F207bae82-72cc-4a5d-86e0-0ec55d24d9bc%2Flocation_(3).svg?table=block&id=8e914cbf-ecb5-48da-8467-a201dc304f3b&spaceId=499f229c-bff2-4c82-ae94-81c36fa59a9c&userId=&cache=v2', size: new naver.maps.Size(60, 60), origin: new naver.maps.Point(0, 0), anchor: new naver.maps.Point(11, 35), diff --git a/src/components/login/Consent.jsx b/src/components/login/Consent.jsx index 5be046b..45f82f2 100644 --- a/src/components/login/Consent.jsx +++ b/src/components/login/Consent.jsx @@ -3,7 +3,7 @@ import { Grey, DarkGreen, DarkGrey, Orange } from '../../color'; import { Button } from '../common'; import { useState } from 'react'; -const Consent = ({ setIsConsent }) => { +const Consent = ({ setIsAllConsent }) => { const [checkedItems, setCheckedItems] = useState({ terms: false, privacyConsent: false, @@ -19,7 +19,7 @@ const Consent = ({ setIsConsent }) => { const handleClickNextStep = (e) => { if (isAllChecked) { - setIsConsent(true); + setIsAllConsent(true); } }; diff --git a/src/components/login/SignUp.jsx b/src/components/login/SignUp.jsx index 9ac5271..9f26e7d 100644 --- a/src/components/login/SignUp.jsx +++ b/src/components/login/SignUp.jsx @@ -8,12 +8,15 @@ import { signUp } from '../../apis/api/postSignupForm'; import { Button } from '../common'; import Swal from 'sweetalert2'; -const Signup = () => { +const Signup = ({ isAllConsent }) => { const navigate = useNavigate(); const [signupForms, setSignupForms] = useState({ email: '', password: '', nickname: '', + serviceAgreement: isAllConsent, + privacyAgreement: isAllConsent, + ageConfirmation: isAllConsent, }); const [errors, setErrors] = useState({ @@ -53,12 +56,20 @@ const Signup = () => { if (response.status !== 201) { const errorMessage = response.error.message; - Swal.fire({ - icon: 'warning', - title: '회원 가입 실패', - text: errorMessage, - }); + if (response.status === 409) { + setErrors((prev) => ({ + ...prev, + nickname: '중복된 닉네임 입니다.', + })); + } else { + Swal.fire({ + icon: 'warning', + title: '회원가입 실패', + text: errorMessage, + }); + } } + if (response.status === 201) { Swal.fire({ icon: 'success', diff --git a/src/components/main/TopRecommendations.jsx b/src/components/main/TopRecommendations.jsx index d70a0ba..51d85f9 100644 --- a/src/components/main/TopRecommendations.jsx +++ b/src/components/main/TopRecommendations.jsx @@ -77,6 +77,7 @@ const TopRecommendations = () => { image={store.imageUrls} address={store.address} storeId={store.storeId} + alt="top-store" positiveRatio={store.positiveRatio} keyword={store.positiveKeywords} name={store.name} diff --git a/src/document/Privacy.jsx b/src/document/Privacy.jsx index 50788b5..0bb2cfd 100644 --- a/src/document/Privacy.jsx +++ b/src/document/Privacy.jsx @@ -7,7 +7,7 @@ const Privacy = () => { logo @@ -177,7 +177,7 @@ const Privacyheader = styled.header` position: sticky; left: 0; top: 0; - & > svg { + & > img { width: 130px; height: 80px; } diff --git a/src/document/PrivacyConsent.jsx b/src/document/PrivacyConsent.jsx index 88e3ae0..70fe185 100644 --- a/src/document/PrivacyConsent.jsx +++ b/src/document/PrivacyConsent.jsx @@ -7,7 +7,7 @@ const PrivacyConsent = () => { logo @@ -70,7 +70,7 @@ const PrivacyConsentheader = styled.header` position: sticky; left: 0; top: 0; - & > svg { + & > img { width: 130px; height: 80px; } diff --git a/src/document/terms.jsx b/src/document/terms.jsx index caa6320..8c6dcbf 100644 --- a/src/document/terms.jsx +++ b/src/document/terms.jsx @@ -7,7 +7,7 @@ const Terms = () => { logo @@ -286,7 +286,7 @@ const Termsheader = styled.header` position: sticky; left: 0; top: 0; - & > svg { + & > img { width: 130px; height: 80px; } diff --git a/src/pages/MainPage.jsx b/src/pages/MainPage.jsx index b53cf85..9dfcd6d 100644 --- a/src/pages/MainPage.jsx +++ b/src/pages/MainPage.jsx @@ -65,12 +65,14 @@ const MainPage = () => { return ( <> - banner + + banner + img { - width: 80%; - filter: brightness(0.8); - border-radius: 20px; - } - @media screen and (max-width: 500px) { gap: 10px; & > img { @@ -122,3 +118,16 @@ const SearchBarContainer = styled.div` display: none; } `; + +const BannerBox = styled.div` + width: 80%; + height: 100%; + margin-top: 0; + display: flex; + align-items: center; + justify-content: center; + + @media screen and (max-width: 768px) { + display: none; + } +`; diff --git a/src/pages/SignUpPage.jsx b/src/pages/SignUpPage.jsx index d9cfb22..593b4c1 100644 --- a/src/pages/SignUpPage.jsx +++ b/src/pages/SignUpPage.jsx @@ -3,12 +3,12 @@ import { Signup } from '../components/login'; import { Consent } from '../components/login'; const SignUpPage = () => { - const [isConsent, setIsConsent] = useState(false); + const [isAllConsent, setIsAllConsent] = useState(false); - if (isConsent) { - return ; + if (isAllConsent) { + return ; } else { - return ; + return ; } };