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

Main #124

Merged
merged 12 commits into from
Dec 8, 2024
Binary file removed public/favicon.ico
Binary file not shown.
4 changes: 0 additions & 4 deletions public/images/location.svg

This file was deleted.

17 changes: 14 additions & 3 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,36 @@
<meta charset="utf-8" />
<link
rel="icon"
href="https://wnstn6945.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F499f229c-bff2-4c82-ae94-81c36fa59a9c%2Fd1c8f3b8-5fcb-4289-a42f-fef7a8141c3d%2FGroup_1000002057.svg?table=block&id=667a6150-184b-4818-8d06-598a9cd04429&spaceId=499f229c-bff2-4c82-ae94-81c36fa59a9c&userId=&cache=v2"
href="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"
/>
<meta name="keywords" content="맛알고리즘, 맛집, 식당" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="description" content="맛있는 알고리즘으로 찾는 당신의 인생 맛집!" />
<!--naver 사이트 소유 확인-->
<meta name="naver-site-verification" content="d023c3b49513c318bdfe8cc74d2b8b8ac605213f" />
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-071S9L1W88"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag() {
dataLayer.push(arguments);
}
gtag('js', new Date());

gtag('config', 'G-071S9L1W88');
</script>
<meta name="theme-color" content="#000000" />
<meta property="og:url" content="https://matal.store" />
<meta name="og:title" content="맛있는 알고리즘" />
<meta name="og:description" content="맛있는 알고리즘으로 찾는 당신의 인생 맛집!" />
<meta
property="og:image"
content="https://wnstn6945.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F499f229c-bff2-4c82-ae94-81c36fa59a9c%2Fd1c8f3b8-5fcb-4289-a42f-fef7a8141c3d%2FGroup_1000002057.svg?table=block&id=667a6150-184b-4818-8d06-598a9cd04429&spaceId=499f229c-bff2-4c82-ae94-81c36fa59a9c&userId=&cache=v2"
content="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"
/>
<meta property="og:type" content="website" />
<link
rel="apple-touch-icon"
href="https://wnstn6945.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F499f229c-bff2-4c82-ae94-81c36fa59a9c%2Fd1c8f3b8-5fcb-4289-a42f-fef7a8141c3d%2FGroup_1000002057.svg?table=block&id=667a6150-184b-4818-8d06-598a9cd04429&spaceId=499f229c-bff2-4c82-ae94-81c36fa59a9c&userId=&cache=v2"
href="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"
/>
<title>맛알고리즘</title>
</head>
Expand Down
6 changes: 3 additions & 3 deletions public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
5 changes: 2 additions & 3 deletions robots.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# https://www.robotstxt.org/robotstxt.html
User-agent: *
Allow: /

user-agent: *
disallow: /downloads/
3 changes: 1 addition & 2 deletions src/components/common/header/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const Header = () => {
return (
<HeaderLayout>
<img
src="https://wnstn6945.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F499f229c-bff2-4c82-ae94-81c36fa59a9c%2Fd1c8f3b8-5fcb-4289-a42f-fef7a8141c3d%2FGroup_1000002057.svg?table=block&id=667a6150-184b-4818-8d06-598a9cd04429&spaceId=499f229c-bff2-4c82-ae94-81c36fa59a9c&userId=&cache=v2"
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"
onClick={handleClick.logo}
alt="logo"
/>
Expand Down Expand Up @@ -92,7 +92,6 @@ const HeaderLayout = styled.header`
padding-right: 10px;
}
border-bottom: 1px solid ${LightGrey};
margin-bottom: 10px;
`;

const ButtonContainer = styled.div`
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/map/Map.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions src/components/login/Consent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -19,7 +19,7 @@ const Consent = ({ setIsConsent }) => {

const handleClickNextStep = (e) => {
if (isAllChecked) {
setIsConsent(true);
setIsAllConsent(true);
}
};

Expand Down
23 changes: 17 additions & 6 deletions src/components/login/SignUp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down Expand Up @@ -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',
Expand Down
1 change: 1 addition & 0 deletions src/components/main/TopRecommendations.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions src/document/Privacy.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const Privacy = () => {
<PrivacyLayout>
<Privacyheader>
<img
src="https://wnstn6945.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F499f229c-bff2-4c82-ae94-81c36fa59a9c%2Fd1c8f3b8-5fcb-4289-a42f-fef7a8141c3d%2FGroup_1000002057.svg?table=block&id=667a6150-184b-4818-8d06-598a9cd04429&spaceId=499f229c-bff2-4c82-ae94-81c36fa59a9c&userId=&cache=v2"
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"
alt="logo"
/>
</Privacyheader>
Expand Down Expand Up @@ -177,7 +177,7 @@ const Privacyheader = styled.header`
position: sticky;
left: 0;
top: 0;
& > svg {
& > img {
width: 130px;
height: 80px;
}
Expand Down
4 changes: 2 additions & 2 deletions src/document/PrivacyConsent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const PrivacyConsent = () => {
<PrivacyConsentLayout>
<PrivacyConsentheader>
<img
src="https://wnstn6945.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F499f229c-bff2-4c82-ae94-81c36fa59a9c%2Fd1c8f3b8-5fcb-4289-a42f-fef7a8141c3d%2FGroup_1000002057.svg?table=block&id=667a6150-184b-4818-8d06-598a9cd04429&spaceId=499f229c-bff2-4c82-ae94-81c36fa59a9c&userId=&cache=v2"
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"
alt="logo"
/>
</PrivacyConsentheader>
Expand Down Expand Up @@ -70,7 +70,7 @@ const PrivacyConsentheader = styled.header`
position: sticky;
left: 0;
top: 0;
& > svg {
& > img {
width: 130px;
height: 80px;
}
Expand Down
4 changes: 2 additions & 2 deletions src/document/terms.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const Terms = () => {
<TermsLayout>
<Termsheader>
<img
src="https://wnstn6945.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F499f229c-bff2-4c82-ae94-81c36fa59a9c%2Fd1c8f3b8-5fcb-4289-a42f-fef7a8141c3d%2FGroup_1000002057.svg?table=block&id=667a6150-184b-4818-8d06-598a9cd04429&spaceId=499f229c-bff2-4c82-ae94-81c36fa59a9c&userId=&cache=v2"
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"
alt="logo"
/>
</Termsheader>
Expand Down Expand Up @@ -286,7 +286,7 @@ const Termsheader = styled.header`
position: sticky;
left: 0;
top: 0;
& > svg {
& > img {
width: 130px;
height: 80px;
}
Expand Down
33 changes: 21 additions & 12 deletions src/pages/MainPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,14 @@ const MainPage = () => {
return (
<>
<MainPageLayout>
<img
src="https://wnstn6945.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F499f229c-bff2-4c82-ae94-81c36fa59a9c%2Fc5ffdb70-a5f8-45cb-95f5-84905578edc1%2FMainImage.svg?table=block&id=1528cdfc-6811-8057-976f-c3838870753e&spaceId=499f229c-bff2-4c82-ae94-81c36fa59a9c&userId=&cache=v2"
width="100%"
height="100%"
alt="banner"
/>
<BannerBox>
<img
src="https://wnstn6945.notion.site/image/https%3A%2F%2Fprod-files-secure.s3.us-west-2.amazonaws.com%2F499f229c-bff2-4c82-ae94-81c36fa59a9c%2Ffc4bf7f0-53f2-4e38-843f-008cb56d4cf3%2F%25E1%2584%2586%25E1%2585%25A6%25E1%2584%258B%25E1%2585%25B5%25E1%2586%25AB%25E1%2584%2587%25E1%2585%25A2%25E1%2584%2582%25E1%2585%25A5_(3).svg?table=block&id=9c8fac30-087f-4a3e-b56a-0f35e767980a&spaceId=499f229c-bff2-4c82-ae94-81c36fa59a9c&userId=&cache=v2"
alt="banner"
width="100%"
height="100%"
/>
</BannerBox>
<SearchBarContainer>
<SearchBar
searchInput={searchInput}
Expand All @@ -96,12 +98,6 @@ const MainPageLayout = styled.div`
align-items: center;
gap: 30px;

& > img {
width: 80%;
filter: brightness(0.8);
border-radius: 20px;
}

@media screen and (max-width: 500px) {
gap: 10px;
& > img {
Expand All @@ -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;
}
`;
8 changes: 4 additions & 4 deletions src/pages/SignUpPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 <Signup />;
if (isAllConsent) {
return <Signup isAllConsent={isAllConsent} />;
} else {
return <Consent setIsConsent={setIsConsent} />;
return <Consent setIsAllConsent={setIsAllConsent} />;
}
};

Expand Down
Loading