Skip to content

Commit 1a6b4ce

Browse files
committed
Merge branch 'develop'
2 parents 293aa1c + 1dcfb57 commit 1a6b4ce

File tree

19 files changed

+16009
-11032
lines changed

19 files changed

+16009
-11032
lines changed

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
]
6161
},
6262
"devDependencies": {
63+
"@types/kakaomaps": "^1.1.5",
64+
"@types/navermaps": "^3.7.8",
6365
"@types/react-helmet": "^6.1.11",
6466
"@types/react-redux": "^7.1.33",
6567
"eslint-config-prettier": "^9.1.0",

public/images/place/suwon_bus.png

177 KB
Loading
161 KB
Loading
5.77 MB
Loading
12.4 MB
Loading
2.52 MB
Loading
9.58 MB
Loading

public/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<meta name="description" content="Web site created using create-react-app" />
1818
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
1919
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@24,400,0,0" />
20+
<script type="text/javascript" src="//dapi.kakao.com/v2/maps/sdk.js?appkey=d3945eccce7debf0942f885e90a71f97"></script>
2021
<!--
2122
manifest.json provides metadata used when your web app is installed on a
2223
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

src/components/Footer/SponsorList.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ const SponsorList = () => {
2424
.filter((level) => level.sponsor.length !== 0)
2525
.map((level) => (
2626
<SponsorTable
27+
key={level.id}
2728
max={level.name === "키스톤" ? 1 : 3}
2829
levelName={t(level.name)}
2930
sponsors={level.sponsor}

src/components/Footer/SponsorTable.tsx

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Sponsor } from "models/sponsor";
22
import { Link } from "react-router-dom";
3-
import React, { useCallback, useEffect, useRef, useState } from "react";
3+
import React from "react";
44
import styled from "styled-components";
55

66
type Props = React.HTMLAttributes<HTMLDivElement> & {
@@ -13,43 +13,59 @@ function SponsorTable({ max, levelName, sponsors, ...rest }: Props) {
1313
return (
1414
<SponsorCard>
1515
<H3>{levelName}</H3>
16-
<div style={{ gridTemplateColumns: `repeat(${max}, 1fr)` }}>
16+
<SponsorLogoList>
1717
{sponsors.map((sponsor) => (
18-
<Link to={`/sponsoring/sponsor/${sponsor.id}`} relative="path">
19-
<LogoImage image={sponsor.logo_image} />
18+
<Link to={`/sponsoring/sponsor/${sponsor.id}`} relative="path" key={sponsor.id}>
19+
<LogoImage $image={sponsor.logo_image} />
2020
</Link>
2121
))}
22-
</div>
22+
</SponsorLogoList>
2323
</SponsorCard>
2424
);
2525
}
2626

27-
interface Image {
28-
image: string;
29-
}
30-
3127
const H3 = styled.h3`
3228
color: #141414 !important;
29+
width: 120px;
3330
`;
3431

35-
const LogoImage = styled.div<Image>`
32+
const LogoImage = styled.div<{ $image: string }>`
3633
display: inline-flex;
3734
justify-content: center;
38-
align-itmes: center;
35+
align-items: center;
3936
color: #141414;
40-
width: 320px;
4137
height: 200px;
42-
background-image: url(${(props) => props.image});
38+
background-image: url(${(props) => props.$image});
4339
background-size: contain;
4440
background-position: center;
4541
46-
& > img {
47-
height: 50%;
42+
@media only screen and (max-width: 480px) {
43+
width: 320px;
4844
}
4945
5046
@media only screen and (max-width: 810px) {
51-
width: 100%;
47+
width: 200px;
48+
}
49+
50+
@media only screen and (max-width: 1200px) {
51+
width: 240px;
5252
}
53+
54+
@media only screen and (min-width: 1200px) {
55+
width: 320px;
56+
}
57+
58+
@media only screen and (min-width: 1800px) {
59+
width: 360px;
60+
}
61+
`;
62+
63+
const SponsorLogoList = styled.div`
64+
display: flex;
65+
flex-wrap: wrap;
66+
column-gap: 3vw;
67+
justify-content: center;
68+
width: 100%;
5369
`;
5470

5571
const SponsorCard = styled.div`
@@ -59,25 +75,14 @@ const SponsorCard = styled.div`
5975
padding: 1rem 1.5rem;
6076
align-items: center;
6177
background-color: #c2c7d0;
78+
min-width: 280px;
6279
6380
& > h3 {
6481
color: #b0a8fe;
6582
margin: 0;
66-
flex: 200px;
67-
}
68-
69-
& > div {
70-
width: 100%;
71-
display: grid;
72-
grid-gap: 1.5rem;
73-
flex: auto;
74-
75-
& > a {
76-
max-height: 20rem;
77-
}
7883
}
7984
80-
@media only screen and (max-width: 810px) {
85+
@media only screen and (max-width: 480px) {
8186
flex-direction: column;
8287
margin: 1rem;
8388
@@ -86,12 +91,6 @@ const SponsorCard = styled.div`
8691
margin: 0;
8792
flex: auto;
8893
}
89-
90-
& > div {
91-
display: flex;
92-
flex-wrap: wrap;
93-
flex-direction: column;
94-
}
9594
}
9695
`;
9796

0 commit comments

Comments
 (0)