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

[view] 툴팁 교체 및 폴더 구조 그래프 명시성 확보 #720

Merged
merged 4 commits into from
Sep 10, 2024
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
12 changes: 6 additions & 6 deletions package-lock.json

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

4 changes: 0 additions & 4 deletions packages/view/src/App.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
@import "styles/app";

:root {
--primary-color: #ff8272;
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

사용하지 않는 컬러입니다

body {
background: $color-background;
color: $color-white;
Expand Down
5 changes: 4 additions & 1 deletion packages/view/src/components/@common/Author/Author.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
import { Tooltip, Avatar } from "@mui/material";
import { GITHUB_URL } from "../../../constants/constants";

import type { AuthorInfo } from "types";

import { GITHUB_URL } from "../../../constants/constants";

const Author = ({ name, src }: AuthorInfo) => {
return (
<Tooltip
title={name}
placement="top-start"
PopperProps={{ sx: { ".MuiTooltip-tooltip": { bgcolor: "#3c4048" } } }}
>
<a
href={`${GITHUB_URL}/${name}`}
Expand Down
21 changes: 1 addition & 20 deletions packages/view/src/components/Detail/Detail.scss
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
}
}

.author-date {
.commit-date {
display: block;
position: relative;
white-space: nowrap;
Expand All @@ -121,15 +121,8 @@
}
&:hover {
color: var(--color-primary);
.commit-id__tooltip {
display: inline-block;
}
}
}

a:hover {
cursor: pointer;
}
}
}
}
Expand All @@ -147,15 +140,3 @@
}
}

.commit-id__tooltip {
display: none;
position: absolute;
background: $color-white;
padding: 8px 16px;
text-align: center;
font-size: $font-size-caption;
line-height: 1.5;
border-radius: 5px;
color: $color-dark-gray;
transform: translateY(20%) translateX(-120%);
}
14 changes: 10 additions & 4 deletions packages/view/src/components/Detail/Detail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@ 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 { Tooltip } from "@mui/material";

import { Author } from "components/@common/Author";
import { useGlobalData } from "hooks";

import { useCommitListHide } from "./Detail.hook";
import { getCommitListDetail } from "./Detail.util";
import { FIRST_SHOW_NUM } from "./Detail.const";
import type { DetailProps, DetailSummaryProps, DetailSummaryItem } from "./Detail.type";

import "./Detail.scss";
import { useGlobalData } from "hooks";

const DetailSummary = ({ commitNodeListInCluster }: DetailSummaryProps) => {
const { authorLength, fileLength, commitLength, insertions, deletions } = getCommitListDetail({
Expand Down Expand Up @@ -80,7 +81,7 @@ const Detail = ({ selectedData, clusterId, authSrcMap }: DetailProps) => {
<span className="message">{message}</span>
</div>
</div>
<span className="author-date">
<span className="commit-date">
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

해당 container가 commit을 다루고 있고, 실제 날짜도 author에 관련되어 있다기 보다 커밋한 일시 자체를 다루고 있기 때문에 더 알맞다고 생각하여 수정하였습니다.

{author.names[0]}, {dayjs(commitDate).format("YY. M. DD. a h:mm")}
</span>
</div>
Expand All @@ -91,8 +92,13 @@ const Detail = ({ selectedData, clusterId, authSrcMap }: DetailProps) => {
tabIndex={0}
onKeyDown={handleCommitIdCopy(id)}
>
{id.slice(0, 6)}
<span className="commit-id__tooltip">{id}</span>
<Tooltip
placement="right"
title={id}
PopperProps={{ sx: { ".MuiTooltip-tooltip": { bgcolor: "#3c4048" } } }}
Comment on lines +97 to +98
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

모든 툴팁 배경색상 통일

>
<p>{`${id.slice(0, 6)}...`}</p>
</Tooltip>
</a>
</div>
</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
display: flex;
flex-direction: column;
align-items: flex-start;
}

p {
font-size: $font-size-title;
font-weight: $font-weight-semibold;
}
.author-bar-chart__title {
font-size: $font-size-title;
font-weight: $font-weight-semibold;
}
Comment on lines -9 to 13
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

기존에 컨테이너 박스 안의 모든 p의 폰트 사이즈와 두께를 결정하고 있는 관계로, 아래에서 다시 .name 의 두께를 정해주어도 변경되지 않았습니다. 이전에 작성한 의도에 맞게 name만 진한 굵기로, 나머지는 보통 굵기로 나오도록 수정하기 위해 따로 class 명을 주었습니다.


.author-bar-chart__header {
Expand Down Expand Up @@ -39,7 +39,6 @@

.axis {
color: $color-white;
font-weight: $font-weight-semibold;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

그래프의 label에 해당하는 부분입니다. 상단 기간 그래프의 날짜 부분이 보통 굵기로 설정되어 있었기에 통일하였습니다.


&.x-axis {
.tick {
Expand Down Expand Up @@ -82,17 +81,17 @@
.author-bar-chart__tooltip {
display: none;
position: absolute;
background: $color-white;
padding: 8px 16px;
text-align: center;
border-radius: 5px;
font-size: $font-size-caption;
text-align: center;
line-height: 1.5;
border-radius: 5px;
color: $color-dark-gray;
background-color: rgba($color-dark-gray, 0.9);
color: $color-white;

.selected {
color: var(--color-primary);
font-weight: $font-weight-semibold;
color: var(--color-primary);
}
.name {
font-weight: $font-weight-semibold;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ const AuthorBarChart = () => {

return (
<div className="author-bar-chart__container">
<p>Author Bar Chart</p>
<p className="author-bar-chart__title">Author Bar Chart</p>
<div className="author-bar-chart__header">
<FormControl
sx={{ m: 1, minWidth: 120 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
.file-icicle-summary {
width: 16rem;
text {
fill: var(--color-primary);
filter: invert(100) grayscale(100) contrast(100);
font-weight: $font-weight-semibold;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

폴더 이름이 옅어서 안 보이는 느낌이라 컬러를 삭제하고 굵기를 조정하였습니다

}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
}

span {
color: var(--primary-color);
filter: invert(100) grayscale(100) contrast(100);
font-weight: $font-weight-semibold;
}
}

Expand Down
Loading