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.

Sign up for GitHub

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

Jump to bottom

fix : 랭킹 hotfix #87

Merged
merged 2 commits into from
Feb 2, 2023
Merged

fix : 랭킹 hotfix #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f826910
fix : 랭킹 hotfix
nowrobin Feb 1, 2023
7c6db52
fix : 레이블 수정
nowrobin Feb 1, 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
34 changes: 22 additions & 12 deletions src/components/BarChart/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export default function BarChart({
for (let n in ranklabel) {
dataSet.push({ x: ranklabel[n], y: rankdata[n] });
}
const graphType = chartnumber === 1 ? "bar" : "pie";
return (
<ApexCharts
type={"bar"}
Expand Down Expand Up @@ -63,7 +62,7 @@ export default function BarChart({
},
title: {
text: "Flower",
offsetY: 140,
offsetY: 80,
offsetX: -20,
style: {
color: "#fff",
Expand Down Expand Up @@ -99,12 +98,12 @@ export default function BarChart({
},

colors: [
"#4ecdc4",
"#c7f464",
"#f9a3a4",
"#f46036",
"#00b1f2",
"#13D8AA",
"#67E09C",
"#3E8DF3",
"#F3B344",
"#EB5564",
"#735EC9",
"#F2E416",
],

stroke: {
Expand All @@ -115,6 +114,8 @@ export default function BarChart({
labels: {
colors: ["#fff"],
},
offsetY: -5,
offsetX: 15,
},
responsive: [
{
Expand All @@ -132,20 +133,29 @@ export default function BarChart({
title: {
text: "조회수",
rotate: 0,
offsetY: -80,
offsetY: -50,
offsetX: 25,
style: {
fontSize: "12",
color: "#fff",
},
},
},
Xaxis: {
xaxis: {
title: {
text: "Flower",
offsetY: 85,
text: "Flowers",
offsetY: 140,
offsetX: -20,
style: {
fontSize: "12",
},
},
},
legend: {
labels: {
colors: ["#fff"],
},
offsetY: -45,
},
},
},
Expand Down
8 changes: 4 additions & 4 deletions src/components/NavigationBar/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@
}
}
.encyBTN {
color: #3d8a71;
color: #4833ad;
margin-left: 1rem;
font-size: 1.4rem;
&:hover {
color: #002c1d;
color: var(--button-color);
}
@include tablet {
margin-left: 2rem;
Expand All @@ -103,11 +103,11 @@
}
}
.rankBTN {
color: #3d8a71;
color: #4833ad;
margin-left: 1rem;
font-size: 1.4rem;
&:hover {
color: #002c1d;
color: var(--button-color);
}
@include tablet {
margin-left: 2rem;
Expand Down
11 changes: 9 additions & 2 deletions src/components/PieChart/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export default function PieChart({
for (let n in ranklabel) {
dataSet.push({ x: ranklabel[n], y: rankdata[n] });
}
const graphType = chartnumber === 1 ? "bar" : "pie";
return (
<ApexCharts
type="pie"
Expand All @@ -31,6 +30,14 @@ export default function PieChart({
enabled: false,
},
},
colors: [
"#67E09C",
"#3E8DF3",
"#F3B344",
"#EB5564",
"#735EC9",
"#F2E416",
],
plotOptions: {
pie: {
expandOnClick: true,
Expand All @@ -52,7 +59,7 @@ export default function PieChart({
},
title: {
text: "검색랭킹",
align: "center",
align: "left",
style: {
color: "#fff",
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/RankList/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
}

.poison {
position: fixed;
position: absolute;
nowrobin marked this conversation as resolved.
Show resolved Hide resolved
left: 7rem;
margin-top: 2.2rem;
z-index: 700;
Expand Down
4 changes: 2 additions & 2 deletions src/components/RankTop/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
.poison {
position: fixed;
margin-left: 4rem;
margin-top: 6rem;
margin-top: 7rem;
z-index: 700;
width: 3.5rem;
@include tablet {
Expand All @@ -56,7 +56,7 @@
}

.medal {
position: fixed;
position: absolute;
margin-right: 4rem;
margin-top: 7rem;
width: 2.5rem;
Expand Down