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

Feature/#29/graph page #36

Merged
merged 141 commits into from
Mar 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
e8f3d35
refactor : init status (#18)
chamny20 Mar 7, 2024
7c153cb
chore : install mui-date-picker (#18)
chamny20 Mar 7, 2024
2382032
style : add align (#18)
chamny20 Mar 7, 2024
c58eaac
feat : add keyword-compare item (#18)
chamny20 Mar 7, 2024
ef03ad3
feat : add temp-router (#18)
chamny20 Mar 7, 2024
71650d5
feat : add adv (#18)
chamny20 Mar 7, 2024
d3cd495
Merge pull request #19 from kobaco-c-team/feature/#18/keyword-compare
chamny20 Mar 7, 2024
4d3b75e
feat : add select-filter component (#11)
chamny20 Mar 8, 2024
00b46e5
test : test select-filter (#11)
chamny20 Mar 8, 2024
ed69ec0
style : add size (#11)
chamny20 Mar 8, 2024
70381fe
style : modified adv-item (#11)
chamny20 Mar 8, 2024
12a8a0b
chore: install chart library
mungjin01 Mar 8, 2024
d44a7c7
feat: monthly graph outline
mungjin01 Mar 8, 2024
92fe80e
feat: sex graph outline
mungjin01 Mar 8, 2024
ef060fd
refactor : add adv-list props (#11)
chamny20 Mar 8, 2024
0feddb5
test : test dummy (#11)
chamny20 Mar 8, 2024
fb8b5ac
chore : remove unused import line (#11)
chamny20 Mar 8, 2024
166944c
feat : add sort dropdown (#11)
chamny20 Mar 8, 2024
fea397b
feat : add adv-archive routing (#11)
chamny20 Mar 8, 2024
0cc64f0
style : modified padding (#11)
chamny20 Mar 8, 2024
b9648d4
chore : install axios (#11)
chamny20 Mar 8, 2024
c96e6d0
feat : add base-url in api (#11)
chamny20 Mar 8, 2024
958a243
feat : add adv-archive api (#11)
chamny20 Mar 8, 2024
1dcb0a2
feat : add adv-type (#11)
chamny20 Mar 8, 2024
6023218
feat : connect adv-api (#11)
chamny20 Mar 8, 2024
f7d1257
feat : add advertise-api completely (#11)
chamny20 Mar 8, 2024
0838a6f
feat : add trend-api completely (#11)
chamny20 Mar 8, 2024
9daa647
style : modified align-items (#11)
chamny20 Mar 8, 2024
c5c5ab2
Merge pull request #21 from kobaco-c-team/feature/#11/adv-archive
chamny20 Mar 8, 2024
e24bda7
chore : process exception (#22)
chamny20 Mar 8, 2024
94289f2
chore: axios install
mungjin01 Mar 8, 2024
2a1e2f2
feat : add adv-search-banner (#22)
chamny20 Mar 8, 2024
c3676c5
feat : apply (#22)
chamny20 Mar 8, 2024
e42df3b
feat : add pagination (#22)
chamny20 Mar 8, 2024
c6c65ac
style : add filter-icon (#22)
chamny20 Mar 8, 2024
e58bb51
style : modified sort-box position (#22)
chamny20 Mar 8, 2024
281757f
feat: ์›”๋ณ„ ๊ทธ๋ž˜ํ”„ api (#16)
mungjin01 Mar 8, 2024
6f52818
feat: ์›”๋ณ„ ๊ทธ๋ž˜ํ”„ api (#16)
mungjin01 Mar 8, 2024
b0bc948
style : modified adv-search-banner css (#22)
chamny20 Mar 8, 2024
aeb7cd4
feat: weekchart outline (#16)
mungjin01 Mar 8, 2024
7fae799
chore : modified width size (#22)
chamny20 Mar 8, 2024
4f970c4
fix: monthchart ratio (#16)
mungjin01 Mar 8, 2024
3d4a752
feat: monthchart api (#16)
mungjin01 Mar 8, 2024
73f5a36
feat: weekchart api (#16)
mungjin01 Mar 8, 2024
8923748
feat : add similar-item component (#22)
chamny20 Mar 8, 2024
75f9e54
refactor : change prop (#22)
chamny20 Mar 8, 2024
a06c2ec
rename : move files (#22)
chamny20 Mar 8, 2024
228fbc5
feat: agechart outline (#16)
mungjin01 Mar 8, 2024
4870847
feat: keyword graph (#16)
mungjin01 Mar 8, 2024
b1557bf
feat: agechart gradient (#16)
mungjin01 Mar 8, 2024
565f4cd
feat: instachart outline (#16)
mungjin01 Mar 8, 2024
fb6c42b
feat : add adv-analysis (#22)
chamny20 Mar 8, 2024
5b26749
feat : add adv-info (#22)
chamny20 Mar 8, 2024
30ed64a
refactor : modified similar-item (#22)
chamny20 Mar 8, 2024
38f4191
test : test adv item (#22)
chamny20 Mar 8, 2024
a64db91
feat: weekchart xaxis (#16)
mungjin01 Mar 8, 2024
e166213
fix: monthchart ui (#16)
mungjin01 Mar 8, 2024
bbd5fd8
chore : modified eslint (#22)
chamny20 Mar 8, 2024
c51e3b6
chore : add img-bg (#22)
chamny20 Mar 8, 2024
5b99572
feat : add adv-archive (#22)
chamny20 Mar 8, 2024
9887aa4
feat : add adv-detail page (#22)
chamny20 Mar 8, 2024
b3cebce
feat : add routing (#22)
chamny20 Mar 8, 2024
a87661c
test : test adv (#22)
chamny20 Mar 8, 2024
636e232
chore : install nivo-chart (#22)
chamny20 Mar 8, 2024
559b754
Merge pull request #24 from kobaco-c-team/feature/#22/advertisement-aโ€ฆ
chamny20 Mar 8, 2024
e76bf9b
feat: sexchart api (#16)
mungjin01 Mar 8, 2024
d7c4217
feat: agechart api (#16)
mungjin01 Mar 8, 2024
5f105e5
chore: sexchart size (#16)
mungjin01 Mar 8, 2024
c3c3173
chore : add img (#27)
chamny20 Mar 8, 2024
05ff7fb
fix : solve error (#27)
chamny20 Mar 8, 2024
e84c27a
feat : connect expression-api (#27)
chamny20 Mar 8, 2024
7c392e0
feat : add expression-bar (#27)
chamny20 Mar 8, 2024
e7716d0
chore : remove unused codes (#27)
chamny20 Mar 8, 2024
97b387a
feat : apply scroll-container (#27)
chamny20 Mar 8, 2024
4db0183
feat : modified routing (#27)
chamny20 Mar 8, 2024
fd53e9f
feat : add bookmark event (#27)
chamny20 Mar 8, 2024
ea5df27
chore : add object-anlaysis file (#27)
chamny20 Mar 8, 2024
431861d
chore: remove legend (#16)
mungjin01 Mar 8, 2024
90fd7f9
feat: banner ui (#29)
mungjin01 Mar 9, 2024
8bdaaac
feat : add scrap-api (#30)
chamny20 Mar 9, 2024
a2f9d4d
refactor : modified prop (#30)
chamny20 Mar 9, 2024
632be15
feat : add api-type (#30)
chamny20 Mar 9, 2024
e955a03
feat : add scrap-page (#30)
chamny20 Mar 9, 2024
7efb3ee
chore : modified dummy-data (#30)
chamny20 Mar 9, 2024
ae8b7e8
feat : add router (#30)
chamny20 Mar 9, 2024
0e4738a
Merge pull request #31 from kobaco-c-team/feature/#30/scrap-page
chamny20 Mar 9, 2024
7a66b00
Merge branch 'develop' into feature/#27/adv-expression
chamny20 Mar 9, 2024
1de83b4
fix : solve conflict (#27)
chamny20 Mar 9, 2024
b4133a0
chore : fix eslint-rule (#27)
chamny20 Mar 9, 2024
83f54a4
chore : add favicon-svg (#27)
chamny20 Mar 9, 2024
a456541
feat : add img (#27)
chamny20 Mar 9, 2024
9877ccc
feat : add object-analysis (#27)
chamny20 Mar 9, 2024
0ddb754
feat : add tab-item (#27)
chamny20 Mar 9, 2024
9a08f91
chore : modified flow and style (#27)
chamny20 Mar 9, 2024
341d81a
Merge pull request #28 from kobaco-c-team/feature/#27/adv-expression
chamny20 Mar 9, 2024
e335a1b
chore : modified style-position
chamny20 Mar 9, 2024
2ea5073
feat : modified input-style (#32)
chamny20 Mar 9, 2024
a6caa7a
feat : connect keyword search api (#32)
chamny20 Mar 9, 2024
714a54a
feat : connect date-search-api (#32)
chamny20 Mar 9, 2024
524d377
fix : fix error (#32)
chamny20 Mar 9, 2024
4de0dd1
fix : fix prop error (#32)
chamny20 Mar 9, 2024
2e2ee83
feat : manage state about filter (#32)
chamny20 Mar 9, 2024
344b72b
fix : fix z-index error (#32)
chamny20 Mar 9, 2024
24bbe0e
feat : connect filter api about expression and mood (#32)
chamny20 Mar 9, 2024
5dab88f
chore : remove console-log (#32)
chamny20 Mar 9, 2024
b1e44d9
feat : connect sort-api (#32)
chamny20 Mar 9, 2024
ebbc088
chore : add dummy-coupang (#32)
chamny20 Mar 9, 2024
5c9be3f
Merge pull request #33 from kobaco-c-team/feature/#32/search-api
chamny20 Mar 9, 2024
7401a0f
feat : add insta-archive and item (#34)
chamny20 Mar 9, 2024
7f4d6e5
feat : add youtube-card ui (#34)
chamny20 Mar 9, 2024
5d49453
chore : modified width (#34)
chamny20 Mar 9, 2024
9958667
feat : add naver-item and archive (#34)
chamny20 Mar 9, 2024
981cf04
chore : temp modifying (#34)
chamny20 Mar 9, 2024
c193a68
feat : add sort-ui (#34)
chamny20 Mar 9, 2024
1707d58
feat: graph page data (#29)
mungjin01 Mar 10, 2024
4d3c03f
feat: sns banner (#29)
mungjin01 Mar 10, 2024
8a20268
fix: graph outline (#29)
mungjin01 Mar 10, 2024
1dde618
feat: graph page outline (#29)
mungjin01 Mar 10, 2024
488b14e
chore: delete scroll (#29)
mungjin01 Mar 10, 2024
8836269
Merge pull request #35 from kobaco-c-team/feature/#34/sns-card
chamny20 Mar 10, 2024
6be4ece
fix : solve eslint-error
chamny20 Mar 10, 2024
4d7a1f3
Merge branch 'main' into develop
chamny20 Mar 10, 2024
4ccb4e9
fix : temp-solving
chamny20 Mar 10, 2024
4c4f973
Merge branch 'develop' of https://github.com/kobaco-c-team/kobaco-c-fโ€ฆ
chamny20 Mar 10, 2024
ec1ed50
fix : solve error
chamny20 Mar 10, 2024
6c7a4e0
feat : add navbar (#25)
chamny20 Mar 10, 2024
76904a4
Merge pull request #40 from kobaco-c-team/featuer/#25/header-component
chamny20 Mar 10, 2024
bf7858a
feat : add breadcrumbs
chamny20 Mar 10, 2024
4c97396
chore : change img
chamny20 Mar 10, 2024
1702831
chore : add text color
chamny20 Mar 10, 2024
fbc7ba5
fix : fix bug
chamny20 Mar 10, 2024
b2ab7bc
chore : modified color
chamny20 Mar 10, 2024
815ddaf
chore : try
chamny20 Mar 10, 2024
a565e37
fix : restore
chamny20 Mar 10, 2024
e322368
feat: graph page (#29)
mungjin01 Mar 10, 2024
bc3b70e
Merge remote-tracking branch 'origin/develop' into feature/#29/graph-โ€ฆ
mungjin01 Mar 10, 2024
d4294a2
feat: navigate graph page (#29)
mungjin01 Mar 10, 2024
41c7551
fix : add keyword ui
chamny20 Mar 10, 2024
71ed5db
Merge pull request #45 from kobaco-c-team/hotfix
chamny20 Mar 10, 2024
2ffca7a
Merge remote-tracking branch 'origin/develop' into feature/#29/graph-โ€ฆ
mungjin01 Mar 10, 2024
6f6c219
feat: graph page (#29)
mungjin01 Mar 10, 2024
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
2 changes: 1 addition & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ module.exports = {
'warn',
{ allowConstantExport: true },
],
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-unused-vars': 'off',
},
};
2 changes: 2 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
},
"plugins": ["react", "react-hooks"],
"rules": {
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": "error",
"import/extensions": [
"error",
"ignorePackages",
Expand Down
3 changes: 2 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<link rel="icon" type="image/svg+xml" href="/kobaco.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<title>Kobaco</title>
</head>
<body>
Expand Down
18 changes: 15 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,40 @@
"preview": "vite preview"
},
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.0",
"@emotion/react": "11.11.4",
"@emotion/styled": "11.11.0",
"@headlessui/react": "^1.7.18",
"@mui/icons-material": "^5.15.12",
"@mui/material": "^5.15.11",
"@mui/material": "5.15.12",
"@mui/x-date-pickers": "6.19.6",
"@nivo/bar": "0.85.1",
"@nivo/bullet": "0.85.1",
"@nivo/core": "0.85.1",
"@types/axios": "^0.14.0",
"@types/babel__core": "7.20.5",
"@types/babel__traverse": "7.20.5",
"@types/react-slick": "^0.23.13",
"@types/styled-components": "5.1.34",
"axios": "^1.6.7",
"d3": "^7.8.5",
"dayjs": "1.11.10",
"eslint-config-prettier": "9.1.0",
"eslint-import-resolver-typescript": "3.6.1",
"eslint-plugin-prettier": "5.1.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-minimal-pie-chart": "^8.4.0",
"react-router-dom": "6.22.2",
"react-slick": "^0.30.2",
"recharts": "^2.12.2",
"slick-carousel": "^1.8.1",
"styled-components": "^6.1.8"
},
"devDependencies": {
"@types/d3": "^7.4.3",
"@types/react": "^18.2.56",
"@types/react-dom": "^18.2.19",
"@types/recharts": "^1.8.29",
"@typescript-eslint/eslint-plugin": "^6.4.0",
"@typescript-eslint/parser": "^7.0.2",
"@vitejs/plugin-react": "^4.2.1",
Expand Down
3 changes: 3 additions & 0 deletions public/kobaco.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion public/vite.svg

This file was deleted.

81 changes: 81 additions & 0 deletions src/api/advertisement.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
import { api } from '.';
import { AdvertisementListType, ScrappedAdvType } from '../types/api';

// ๊ด‘๊ณ  ๋ฆฌ์ŠคํŠธ ์กฐํšŒ
export const getAdvertisementList = async ({
sortType,
startDate,
endDate,
kwdVal,
expressionType,
moodType,
}: AdvertisementListType) => {
const res = await api.get('/api/advertisement/list', {
params: {
sortType,
startDate,
endDate,
kwdVal,
expressionType,
moodType,
},
});
return res;
};

// ๋น„์Šทํ•œ ์˜์ƒ ๊ด‘๊ณ  ๋ฆฌ์ŠคํŠธ ์กฐํšŒ
export const getSimilarAdvertisement = async (advertisementId: number) => {
const res = await api.get(`/api/advertisement/similar/${advertisementId}`);
return res;
};

// ๊ด‘๊ณ  ๊ธฐ๋ณธ ์ •๋ณด ์กฐํšŒ
export const getAdvertisementInfo = async (advertisementId: number) => {
const res = await api.get(`/api/advertisement/info/${advertisementId}`);
return res;
};

// ๊ด‘๊ณ  ํ‘œ์ • ๋ถ„์„ ์กฐํšŒ
export const getAdvertisementExpression = async (advertisementId: number) => {
const res = await api.get(`/api/advertisement/expression/${advertisementId}`);
return res;
};

// ๊ด‘๊ณ  ์˜์ƒ ๋ถ„์„ ๊ฒฐ๊ณผ ์กฐํšŒ(์˜์ƒ ๋ถ„์œ„๊ธฐ, ์ธ๋ฌผ, ์‚ฌ๋ฌผ)
export const getAdvertisementAnalysis = async (advertisementId: number) => {
const res = await api.get(`/api/advertisement/analysis/${advertisementId}`);
return res;
};

// ์˜์ƒ ๋ถ„์„ ๊ฒฐ๊ณผ ์กฐํšŒ(์ด๋ฏธ์ง€๋งŒ ์กฐํšŒ), category๋Š” {person, objet, place}๋งŒ ๊ฐ€๋Šฅ
export const getAdvertisementAiAnalysisCategory = async (
advertisementId: number,
category: string
) => {
const res = await api.get(
`/api/advertisement/ai-analysis/${advertisementId}/${category}`
);
return res;
};

// ๊ด‘๊ณ  ์Šคํฌ๋žฉ
export const getAdvertisementScrap = async (advertisementId: number) => {
const res = await api.patch(`/api/advertisement/archive/${advertisementId}`);
return res;
};

// ์Šคํฌ๋žฉํ•œ ๊ด‘๊ณ  ์กฐํšŒ
export const getScrappedAdvertisementList = async ({
moodType,
expressionType,
kwdVal,
}: ScrappedAdvType) => {
const res = await api.get('/api/advertisement/archive', {
params: {
moodType,
expressionType,
kwdVal,
},
});
return res;
};
5 changes: 5 additions & 0 deletions src/api/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import axios from 'axios';

export const api = axios.create({
baseURL: 'http://43.203.36.63:8080',
});
43 changes: 43 additions & 0 deletions src/api/trend.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import { api } from '.';
import { TrendSearchType } from '../types/api';

// sns ํŠธ๋ Œ๋“œ ๊ฒ€์ƒ‰, kwdVal์€ ๊ฒ€์ƒ‰์–ด, snsType(INSTAGRAM, YOUTUBE)์€ sns ์œ ํ˜•
export const getTrendSearch = async ({ kwdVal, snsType }: TrendSearchType) => {
const res = await api.get(`/api/trend`, {
params: {
kwdVal,
snsType,
},
});
return res;
};

// ํŠธ๋ Œ๋“œ ์›”๋ณ„ & ์š”์ผ๋ณ„ ๋ถ„์„ ์กฐํšŒ
export const getTrendTime = async ({ trendKwd }: { trendKwd: string }) => {
const res = await api.get(`/api/trend/time`, {
params: {
trendKwd,
},
});
return res;
};

// ํŠธ๋ Œ๋“œ ์„ฑ๋ณ„ & ๋‚˜์ด ๋ถ„์„ ์กฐํšŒ
export const getTrendPerson = async ({ trendKwd }: { trendKwd: string }) => {
const res = await api.get(`/api/trend/person`, {
params: {
trendKwd,
},
});
return res;
};

// ํŠธ๋ Œ๋“œ ์„ฑ๋ณ„ & ๋‚˜์ด ๋ถ„์„ ์กฐํšŒ
export const getTrendArchive = async ({ trendKwd }: { trendKwd: string }) => {
const res = await api.get(`/api/trend/`, {
params: {
trendKwd,
},
});
return res;
};
Binary file added src/assets/advertisement/1-object.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/advertisement/1-person.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/advertisement/1-place.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/advertisement/adv_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/advertisement/ex_basic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/advertisement/ex_smile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/advertisement/ex_surprise.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/chart/insta.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/chart/modalGraph.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/chart/naver.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/chart/youtube.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/assets/favorite.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/landing/newtrend1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/landing/newtrend2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading