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

Mui/icons로 모든 아이콘 교체 #611

Merged
merged 2 commits into from
Aug 6, 2024
Merged
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: 0 additions & 1 deletion packages/view/package.json
Original file line number Diff line number Diff line change
@@ -106,7 +106,6 @@
"nanoid": "^4.0.0",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-icons": "^4.4.0",
"react-spinners": "^0.13.8",
"reflect-metadata": "^0.1.13",
"svg-parser": "^2.0.4",
3 changes: 0 additions & 3 deletions packages/view/src/assets/author.svg

This file was deleted.

3 changes: 0 additions & 3 deletions packages/view/src/assets/changed-file.svg

This file was deleted.

3 changes: 0 additions & 3 deletions packages/view/src/assets/commit.svg

This file was deleted.

3 changes: 0 additions & 3 deletions packages/view/src/assets/diff-add.svg

This file was deleted.

3 changes: 0 additions & 3 deletions packages/view/src/assets/diff-delete.svg

This file was deleted.

20 changes: 10 additions & 10 deletions packages/view/src/components/Detail/Detail.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import dayjs from "dayjs";
import AddCircleRoundedIcon from "@mui/icons-material/AddCircleRounded";
import RemoveCircleRoundedIcon from "@mui/icons-material/RemoveCircleRounded";
import PersonRoundedIcon from "@mui/icons-material/PersonRounded";
import CommitRoundedIcon from "@mui/icons-material/CommitRounded";
import RestorePageRoundedIcon from "@mui/icons-material/RestorePageRounded";

import AuthorIcon from "assets/author.svg";
import ChangedFileIcon from "assets/changed-file.svg";
import CommitIcon from "assets/commit.svg";
import DiffAddIcon from "assets/diff-add.svg";
import DiffDeleteIcon from "assets/diff-delete.svg";
import { Author } from "components/@common/Author";

import { useCommitListHide } from "./Detail.hook";
@@ -20,11 +20,11 @@ const DetailSummary = ({ commitNodeListInCluster }: DetailSummaryProps) => {
});

const summaryItems: DetailSummaryItem[] = [
{ name: "authors", count: authorLength, icon: <AuthorIcon /> },
{ name: "commits", count: commitLength, icon: <CommitIcon /> },
{ name: "changed files", count: fileLength, icon: <ChangedFileIcon /> },
{ name: "additions", count: insertions, icon: <DiffAddIcon /> },
{ name: "deletions", count: deletions, icon: <DiffDeleteIcon /> },
{ name: "authors", count: authorLength, icon: <PersonRoundedIcon sx={{ fontSize: 18 }} /> },
{ name: "commits", count: commitLength, icon: <CommitRoundedIcon sx={{ fontSize: 18 }} /> },
{ name: "changed files", count: fileLength, icon: <RestorePageRoundedIcon sx={{ fontSize: 18 }} /> },
{ name: "additions", count: insertions, icon: <AddCircleRoundedIcon sx={{ fontSize: 18 }} /> },
{ name: "deletions", count: deletions, icon: <RemoveCircleRoundedIcon sx={{ fontSize: 18 }} /> },
];

return (
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import "reflect-metadata";
import cn from "classnames";
import { FiRefreshCcw } from "react-icons/fi";
import ReplayCircleFilledRoundedIcon from "@mui/icons-material/ReplayCircleFilledRounded";

import { throttle } from "utils";
import { useGlobalData } from "hooks";

import "./RefreshButton.scss";
import { sendRefreshDataCommand } from "services";

@@ -22,9 +21,9 @@ const RefreshButton = () => {
className={cn("refresh-button")}
onClick={refreshHandler}
>
<FiRefreshCcw
<ReplayCircleFilledRoundedIcon
className={cn("refresh-button-icon", { "refresh-button-icon--loading": loading })}
stroke="white"
style={{ color: "white" }}
/>
</button>
);
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
import { IoIosArrowDropdownCircle, IoIosArrowDropupCircle } from "react-icons/io";
import ArrowDropDownCircleRoundedIcon from "@mui/icons-material/ArrowDropDownCircleRounded";

import { useGlobalData } from "hooks";

@@ -48,9 +48,9 @@ const Content = ({ content, clusterId, selectedClusterId }: ContentProps) => {
</div>
<div className="collapsible-icon">
{selectedClusterId.includes(clusterId) ? (
<IoIosArrowDropupCircle className="show" />
<ArrowDropDownCircleRoundedIcon className="show" />
) : (
<IoIosArrowDropdownCircle />
<ArrowDropDownCircleRoundedIcon />
)}
</div>
</>
Original file line number Diff line number Diff line change
@@ -47,6 +47,7 @@

& .show {
visibility: visible;
transform: rotate(180deg);
}
}

Loading