Skip to content

Commit afc18ec

Browse files
authored
Merge pull request #28 from pythonkr/fix/sponsor-prospedctus-view
Fix: 스타일 변경
2 parents 975eaff + 1dbd914 commit afc18ec

File tree

7 files changed

+47
-30
lines changed

7 files changed

+47
-30
lines changed

src/components/Footer/SponsorList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const SponsorList = () => {
2222
<SponsorTableList>
2323
{listOfSponsorLevel.map((level) => (
2424
<SponsorTable
25-
max={level.name.toLowerCase() === "keystone" ? 1 : 4}
25+
max={level.name === "키스톤" ? 1 : 3}
2626
levelName={t(level.name)}
2727
sponsors={level.sponsor}
2828
/>

src/components/Footer/SponsorTable.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import React, { useCallback, useEffect, useRef, useState } from "react";
44
import styled from "styled-components";
55

66
type Props = React.HTMLAttributes<HTMLDivElement> & {
7-
max: Number;
7+
max: number;
88
levelName: string;
99
sponsors: Sponsor[];
1010
};
@@ -27,6 +27,7 @@ function SponsorTable({ max, levelName, sponsors, ...rest }: Props) {
2727
const LogoImage = styled.img`
2828
background: white;
2929
color: black;
30+
min-width: 15vw;
3031
`;
3132

3233
const SponsorCard = styled.div`

src/components/common/Collapse/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useRef, useState } from "react";
22
import styled from "styled-components";
33

44
type Props = React.HTMLAttributes<HTMLDivElement> & {
5-
order: Number;
5+
order: number;
66
header: string;
77
content: string;
88
};

src/models/api/sponsor.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,41 @@ export type APISponsor = {
77
};
88

99
export type APISponsorBenefit = {
10-
id: Number;
10+
id: number;
1111
name: string;
1212
desc: string;
1313
unit: string;
1414
is_countable: boolean;
15-
offer: Number;
15+
offer: number;
1616
uncountable_offer: string;
1717
}
1818

1919
export type APISponsorLevel = {
20-
id: Number;
20+
id: number;
2121
name: string;
2222
desc: string;
2323
visible: boolean;
24-
price: Number;
25-
limit: Number;
26-
order: Number;
24+
price: number;
25+
limit: number;
26+
order: number;
2727
benefits: APISponsorBenefit[];
2828
}
2929

3030
export type APISponsorLevelOnly = {
31-
id: Number;
31+
id: number;
3232
name: string;
3333
desc: string;
3434
visible: boolean;
35-
price: Number;
36-
limit: Number;
37-
order: Number;
35+
price: number;
36+
limit: number;
37+
order: number;
3838
}
3939

4040
export type APISponsorLevelWithSponsor = {
41-
id: Number;
41+
id: number;
4242
name: string;
4343
desc: string;
4444
visible: boolean;
45-
order: Number;
45+
order: number;
4646
sponsor: APISponsor[];
4747
}

src/models/sponsor.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { APISponsorLevel, APISponsorBenefit, APISponsor, APISponsorLevelOnly, APISponsorLevelWithSponsor } from "./api/sponsor";
22

33
export class SponsorBenefit {
4-
id: Number;
4+
id: number;
55
name: string;
66
desc: string;
7-
offer: Number;
7+
offer: number;
88
unit: string;
99
is_countable: boolean;
1010
uncountable_offer: string;
@@ -36,13 +36,13 @@ export class SponsorBenefit {
3636
}
3737

3838
export class SponsorLevel {
39-
id: Number;
39+
id: number;
4040
name: string;
4141
desc: string;
4242
visible: boolean;
43-
price: Number;
44-
limit: Number;
45-
order: Number;
43+
price: number;
44+
limit: number;
45+
order: number;
4646
benefits: SponsorBenefit[]
4747

4848
private constructor(p: SponsorLevel) {
@@ -74,11 +74,11 @@ export class SponsorLevel {
7474
}
7575

7676
export class SponsorLevelWithSponsor {
77-
id: Number;
77+
id: number;
7878
name: string;
7979
desc: string;
8080
visible: boolean;
81-
order: Number;
81+
order: number;
8282
sponsor: Sponsor[];
8383

8484
private constructor(p: SponsorLevelWithSponsor) {
@@ -106,13 +106,13 @@ export class SponsorLevelWithSponsor {
106106
}
107107

108108
class SponsorLevelOnly {
109-
id: Number;
109+
id: number;
110110
name: string;
111111
desc: string;
112112
visible: boolean;
113-
price: Number;
114-
limit: Number;
115-
order: Number;
113+
price: number;
114+
limit: number;
115+
order: number;
116116

117117
private constructor(p: SponsorLevelOnly) {
118118
this.id = p.id;

src/pages/Sponsor/SponsorDetail.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ const H1 = styled.h1`
9090
const H3 = styled.h3`
9191
margin-top: 1.5rem;
9292
font-size: 24px;
93-
color: #b0a8fe;
93+
color: white;
9494
9595
@media only screen and (max-width: 810px) {
9696
padding: 0 1rem;

src/pages/Sponsor/SponsorLevelList.tsx

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ const SponsorLevelList = () => {
99
const [listOfSponsorLevel, setListOfSponsorLevel] = useState<SponsorLevel[][]>([]);
1010
const [listOfSponsorBenefit, setListOfSponsorBenefit] = useState<SponsorBenefit[]>([]);
1111

12+
const prettryPrice = (price: number) => {
13+
return new Intl.NumberFormat("ko-KR").format(price);
14+
};
15+
1216
const getBenefitDescription = (benefit: SponsorBenefit | undefined) => {
1317
if (benefit === undefined) return "-";
1418
if (benefit.is_countable) {
@@ -21,7 +25,7 @@ const SponsorLevelList = () => {
2125
SponsorAPI.listSponsorLevels().then((levels) => {
2226
const onlyVisible = levels.filter((level) => level.visible);
2327
if (onlyVisible.length > 4) {
24-
const half_length = Math.ceil(onlyVisible.length / 2);
28+
const half_length = Math.floor(onlyVisible.length / 2);
2529
const firstSide = onlyVisible.slice(0, half_length);
2630
const secondSide = onlyVisible.slice(half_length);
2731
setListOfSponsorLevel([firstSide, secondSide]);
@@ -48,6 +52,18 @@ const SponsorLevelList = () => {
4852
))}
4953
</thead>
5054
<tbody>
55+
<tr>
56+
<td>후원금</td>
57+
{sponsorLevel.map((level) => {
58+
const unit = level.name === "출판사" ? " 권" : " 원";
59+
return (
60+
<td>
61+
{prettryPrice(level.price)}
62+
{unit}
63+
</td>
64+
);
65+
})}
66+
</tr>
5167
{listOfSponsorBenefit.map((benefit) => (
5268
<tr>
5369
<td>{benefit.name}</td>
@@ -83,7 +99,7 @@ const SponsorLevelList = () => {
8399
<li>{t("추후 일부 내용이 변경될 수 있습니다.")}</li>
84100
<li>
85101
{t(
86-
"스타트업 스폰서십은 사내에서 파이썬을 사용하고, 설립 3년 이하, 사내 인원 30인 이하인 곳에 한합니다."
102+
"스타트업 스폰서십은 사내에서 파이썬을 사용하고, 설립 5년 이하, 사내 인원 30인 이하인 곳에 한합니다."
87103
)}
88104
</li>
89105
<li>{t("커뮤니티 스폰서십은 비영리 단체에 한해 후원이 가능합니다.")}</li>

0 commit comments

Comments
 (0)