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

fix(view): 각 content title 수정 #585

Merged
merged 4 commits into from
Aug 2, 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
3 changes: 2 additions & 1 deletion packages/view/src/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ body {
display: grid;
grid-template-columns: 4fr 1fr;
height: calc(100vh - 200px);
margin-top: 20px;

Copy link
Contributor

Choose a reason for hiding this comment

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

안녕하세요! 해당 빈칸은 margin 삭제하다가 생긴것같은데 필요없다면 삭제하는게 좋을것같아요 :)

padding: 20px;
}
10 changes: 1 addition & 9 deletions packages/view/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,7 @@ import { container } from "tsyringe";
import { useEffect, useRef } from "react";
import BounceLoader from "react-spinners/BounceLoader";

import {
BranchSelector,
Statistics,
TemporalFilter,
ThemeSelector,
VerticalClusterList,
FilteredAuthors,
} from "components";
import { BranchSelector, Statistics, TemporalFilter, ThemeSelector, VerticalClusterList } from "components";
import "./App.scss";
import type IDEPort from "ide/IDEPort";
import { useGlobalData } from "hooks";
Expand Down Expand Up @@ -65,7 +58,6 @@ const App = () => {
</div>
<div className="top-container">
<TemporalFilter />
<FilteredAuthors />
</div>
<div className="middle-container">
{filteredData.length !== 0 ? (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
.selected-container {
position: relative;
top: 30px;
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 15px;
width: 100%;
padding: 4px 6px;
}

.selected-content {
display: flex;
flex-wrap: wrap;
box-sizing: border-box;
}
27 changes: 15 additions & 12 deletions packages/view/src/components/FilteredAuthors/FilteredAuthors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,21 @@ const FilteredAuthors = () => {

return (
<div className="selected-container">
{authSrcMap &&
selectedClusters.map((selectedCluster) => {
return selectedCluster.summary.authorNames.map((authorArray: string[]) => {
return authorArray.map((authorName: string) => (
<Author
key={authorName}
name={authorName}
src={authSrcMap[authorName]}
/>
));
});
})}
{selectedClusters.length > 0 && <p>Authors:</p>}
<div className="selected-content">
{authSrcMap &&
selectedClusters.map((selectedCluster) => {
return selectedCluster.summary.authorNames.map((authorArray: string[]) => {
return authorArray.map((authorName: string) => (
<Author
key={authorName}
name={authorName}
src={authSrcMap[authorName]}
/>
));
});
})}
</div>
</div>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ const FileIcicleSummary = () => {

return (
<div className="file-icicle-summary">
<p>File Icicle Summary</p>
<p>File Summary</p>
<svg ref={$summary} />
</div>
);
Expand Down
1 change: 0 additions & 1 deletion packages/view/src/components/Statistics/Statistics.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
flex-direction: column;
align-items: center;
gap: 5vh;
padding: 20px;
width: 350px;
overflow-y: scroll;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
.vertical-cluster-list {
display: flex;
flex-direction: row;
flex-direction: column;
}

.vertical-cluster-list__content {
display: flex;
height: 100%;
overflow-x: hidden;
overflow-y: scroll;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
import "./VerticalClusterList.scss";

import { FilteredAuthors } from "components/FilteredAuthors";

import { ClusterGraph } from "./ClusterGraph";
import { Summary } from "./Summary";

const VerticalClusterList = () => {
return (
<div className="vertical-cluster-list">
<ClusterGraph />
<Summary />
<FilteredAuthors />
<div className="vertical-cluster-list__content">
<ClusterGraph />
<Summary />
</div>
</div>
);
};
Expand Down
Loading