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

Axios 추가 #15

Merged
merged 3 commits into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_API_BASE_URL=https://diversity-api.tech4impact.kr
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"@ant-design/plots": "^1.2.5",
"@emotion/react": "^11.11.1",
"antd": "^5.11.1",
"axios": "^1.6.2",
"immer": "^10.0.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
64 changes: 64 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions src/components/organisms/Histogram.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { Histogram, type HistogramConfig } from "@ant-design/plots";
import { css } from "@emotion/react";

interface HistogramData {
export interface HistogramData {
value: number;
}

interface Props {
data: HistogramData[];
}

const AgeHistogram = ({ data }: Props) => {
export const AgeHistogram = ({ data }: Props) => {
const config: HistogramConfig = {
data,
binField: "value",
Expand Down Expand Up @@ -37,5 +37,3 @@ const AgeHistogram = ({ data }: Props) => {
/>
);
};

export default AgeHistogram;
4 changes: 1 addition & 3 deletions src/components/organisms/PieChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export interface Props {
colors: string[];
}

const PieChart = ({ data, colors }: Props) => {
export const PieChart = ({ data, colors }: Props) => {
const config: PieConfig = {
appendPadding: 10,
data,
Expand Down Expand Up @@ -42,5 +42,3 @@ const PieChart = ({ data, colors }: Props) => {
/>
);
};

export default PieChart;
4 changes: 2 additions & 2 deletions src/components/organisms/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// organism 단계의 컴포넌트들을 한번에 export 하기 위한 index.ts 파일
export { default as Header } from "./Header";
export { default as Footer } from "./Footer";
export { default as Histogram } from "./Histogram";
export { default as PieChart } from "./PieChart";
export * from "./Histogram";
export * from "./PieChart";
export { default as TestChart } from "./TestChart";
export { default as MetroSelector } from "./MetroSelector";
export { default as LocalSelector } from "./LocalSelector";
10 changes: 8 additions & 2 deletions src/components/pages/LocalCouncilReport.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ import { css } from "@emotion/react";
import { useParams } from "react-router-dom";

import { Layout } from "@/components/templates";
import { Histogram, PieChart } from "@/components/organisms";
import {
AgeHistogram,
PieChart,
// type HistogramData,
// type PieChartData,
} from "@/components/organisms";
import {
sampleAgeHistogramData,
samplePartyPieData,
Expand All @@ -15,6 +20,7 @@ const { Title } = Typography;

const LocalCouncilReport: React.FC = () => {
const { metroId, localId } = useParams();

return (
<Layout>
<Flex
Expand All @@ -28,7 +34,7 @@ const LocalCouncilReport: React.FC = () => {
level={1}
>{`MetroId(${metroId}) LocalId(${localId})의 지역의회 다양성 리포트`}</Title>
<Title level={2}>연령 다양성</Title>
<Histogram data={sampleAgeHistogramData} />
<AgeHistogram data={sampleAgeHistogramData} />
<Title level={2}>정당 다양성</Title>
<PieChart
data={samplePartyPieData.data}
Expand Down
11 changes: 9 additions & 2 deletions src/components/templates/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,17 @@ const NewwaysLayout = ({ children }: Props) => (
<Header />
<Row justify="center">
<Col span={22}>
<Content style={{ padding: "0" }}>
<Content
style={{ padding: "0", display: "flex", justifyContent: "center" }}
>
<div
className="site-layout-content"
style={{ background: "#00E9A1" }}
style={{
background: "#00E9A1",
maxWidth: "800px",

// alignItems: "center",
}}
>
{children}
</div>
Expand Down
10 changes: 10 additions & 0 deletions src/utils/axios.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import _axios from "axios";

const axios = _axios.create({
baseURL:
(import.meta.env.VITE_API_BASE_URL as string) ||
"https://diversity-api.tech4impact.kr",
withCredentials: true,
});

export default axios;
1 change: 1 addition & 0 deletions src/utils/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from "./sampleData";
export { default as axios } from "./axios";