Skip to content

Commit

Permalink
Merge pull request #1399 from innovationacademy-kr/fe/dev/change_them…
Browse files Browse the repository at this point in the history
…a_color#1397

[FE] 유저 테마 컬러 변경 기능 추가
  • Loading branch information
seong-hui authored Oct 25, 2023
2 parents cbd5615 + 4b33846 commit df882cb
Show file tree
Hide file tree
Showing 31 changed files with 10,579 additions and 6,173 deletions.
16,303 changes: 10,223 additions & 6,080 deletions frontend/package-lock.json

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@
"@nivo/core": "^0.80.0",
"@nivo/line": "^0.80.0",
"@nivo/pie": "^0.80.0",
"@types/react-color": "^3.0.7",
"axios": "^1.2.1",
"firebase": "^10.4.0",
"react": "^18.2.0",
"react-color": "^2.19.3",
"react-cookie": "^4.1.1",
"react-dom": "^18.2.0",
"react-ga": "^3.3.1",
Expand All @@ -31,6 +33,7 @@
"styled-components": "^5.3.6"
},
"devDependencies": {
"@svgr/rollup": "^8.1.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@trivago/prettier-plugin-sort-imports": "^4.1.1",
Expand All @@ -53,6 +56,7 @@
"jsdom": "^21.1.0",
"typescript": "^4.9.3",
"vite": "^4.0.0",
"vite-plugin-svgr": "^4.1.0",
"vitest": "^0.28.3"
}
}
2 changes: 1 addition & 1 deletion frontend/src/assets/images/adminLoginImg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions frontend/src/assets/images/cautionSign.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions frontend/src/assets/images/close-square.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions frontend/src/assets/images/clubIconGray.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions frontend/src/assets/images/link.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions frontend/src/assets/images/loginImg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions frontend/src/assets/images/profile-circle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions frontend/src/assets/images/search.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit df882cb

Please sign in to comment.