From b01305f8e557ebc69362e60520682815c23c22ed Mon Sep 17 00:00:00 2001 From: Chaewon Date: Tue, 6 Aug 2024 22:23:49 +0900 Subject: [PATCH 1/5] change svgs to mui icons --- packages/view/src/assets/author.svg | 3 --- packages/view/src/assets/changed-file.svg | 3 --- packages/view/src/assets/commit.svg | 3 --- packages/view/src/assets/diff-add.svg | 3 --- packages/view/src/assets/diff-delete.svg | 3 --- .../view/src/components/Detail/Detail.tsx | 20 +++++++++---------- 6 files changed, 10 insertions(+), 25 deletions(-) delete mode 100644 packages/view/src/assets/author.svg delete mode 100644 packages/view/src/assets/changed-file.svg delete mode 100644 packages/view/src/assets/commit.svg delete mode 100644 packages/view/src/assets/diff-add.svg delete mode 100644 packages/view/src/assets/diff-delete.svg diff --git a/packages/view/src/assets/author.svg b/packages/view/src/assets/author.svg deleted file mode 100644 index 6a952e9b..00000000 --- a/packages/view/src/assets/author.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/packages/view/src/assets/changed-file.svg b/packages/view/src/assets/changed-file.svg deleted file mode 100644 index a33e1db7..00000000 --- a/packages/view/src/assets/changed-file.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/packages/view/src/assets/commit.svg b/packages/view/src/assets/commit.svg deleted file mode 100644 index 2f75b438..00000000 --- a/packages/view/src/assets/commit.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/packages/view/src/assets/diff-add.svg b/packages/view/src/assets/diff-add.svg deleted file mode 100644 index f07da9ee..00000000 --- a/packages/view/src/assets/diff-add.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/packages/view/src/assets/diff-delete.svg b/packages/view/src/assets/diff-delete.svg deleted file mode 100644 index a5dbc9d0..00000000 --- a/packages/view/src/assets/diff-delete.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/packages/view/src/components/Detail/Detail.tsx b/packages/view/src/components/Detail/Detail.tsx index 2fea7b8b..f76d1a02 100644 --- a/packages/view/src/components/Detail/Detail.tsx +++ b/packages/view/src/components/Detail/Detail.tsx @@ -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: }, - { name: "commits", count: commitLength, icon: }, - { name: "changed files", count: fileLength, icon: }, - { name: "additions", count: insertions, icon: }, - { name: "deletions", count: deletions, icon: }, + { name: "authors", count: authorLength, icon: }, + { name: "commits", count: commitLength, icon: }, + { name: "changed files", count: fileLength, icon: }, + { name: "additions", count: insertions, icon: }, + { name: "deletions", count: deletions, icon: }, ]; return ( From 39c47d33fe3db426000255fd87d5fe8108b0cd0e Mon Sep 17 00:00:00 2001 From: Chaewon Date: Tue, 6 Aug 2024 23:18:35 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=98=EC=9D=84=20?= =?UTF-8?q?=EC=A0=84=EB=B6=80=20mui=EB=A1=9C=20=EC=88=98=EC=A0=95,=20react?= =?UTF-8?q?-icon=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/view/package.json | 1 - .../view/src/components/RefreshButton/RefreshButton.tsx | 7 +++---- .../VerticalClusterList/Summary/Content/Content.tsx | 6 +++--- .../components/VerticalClusterList/Summary/Summary.scss | 1 + 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/view/package.json b/packages/view/package.json index 700eb931..ae6517c0 100644 --- a/packages/view/package.json +++ b/packages/view/package.json @@ -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", diff --git a/packages/view/src/components/RefreshButton/RefreshButton.tsx b/packages/view/src/components/RefreshButton/RefreshButton.tsx index d066e4ac..cf1b4ebc 100644 --- a/packages/view/src/components/RefreshButton/RefreshButton.tsx +++ b/packages/view/src/components/RefreshButton/RefreshButton.tsx @@ -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} > - ); diff --git a/packages/view/src/components/VerticalClusterList/Summary/Content/Content.tsx b/packages/view/src/components/VerticalClusterList/Summary/Content/Content.tsx index ac5e0825..5920734c 100644 --- a/packages/view/src/components/VerticalClusterList/Summary/Content/Content.tsx +++ b/packages/view/src/components/VerticalClusterList/Summary/Content/Content.tsx @@ -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) => {
{selectedClusterId.includes(clusterId) ? ( - + ) : ( - + )}
diff --git a/packages/view/src/components/VerticalClusterList/Summary/Summary.scss b/packages/view/src/components/VerticalClusterList/Summary/Summary.scss index 8f3d9028..17d12b77 100644 --- a/packages/view/src/components/VerticalClusterList/Summary/Summary.scss +++ b/packages/view/src/components/VerticalClusterList/Summary/Summary.scss @@ -47,6 +47,7 @@ & .show { visibility: visible; + transform: rotate(180deg); } } From 231bf28354f0165eb1669455f2b95a5351f64602 Mon Sep 17 00:00:00 2001 From: Chaewon Date: Tue, 6 Aug 2024 23:22:32 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=98=EC=9D=84=20?= =?UTF-8?q?=EC=A0=84=EB=B6=80=20mui=EB=A1=9C=20=EC=88=98=EC=A0=95,=20react?= =?UTF-8?q?-icon=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 2 +- package-lock.json | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ce6fa8a..7089affe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - node-version: [20.16.0] + node-version: [20.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: diff --git a/package-lock.json b/package-lock.json index 4150d914..8414bfba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19934,14 +19934,6 @@ "react": "^18.2.0" } }, - "node_modules/react-icons": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.10.1.tgz", - "integrity": "sha512-/ngzDP/77tlCfqthiiGNZeYFACw85fUjZtLbedmJ5DTlNDIwETxhwBzdOJ21zj4iJdvc0J3y7yOsX3PpxAJzrw==", - "peerDependencies": { - "react": "*" - } - }, "node_modules/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", @@ -27160,7 +27152,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", @@ -31031,7 +31022,6 @@ "prettier": "^3.0.1", "react": "^18.1.0", "react-dom": "^18.1.0", - "react-icons": "^4.4.0", "react-spinners": "^0.13.8", "reflect-metadata": "^0.1.13", "sass": "^1.77.4", @@ -45708,12 +45698,6 @@ "scheduler": "^0.23.0" } }, - "react-icons": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.10.1.tgz", - "integrity": "sha512-/ngzDP/77tlCfqthiiGNZeYFACw85fUjZtLbedmJ5DTlNDIwETxhwBzdOJ21zj4iJdvc0J3y7yOsX3PpxAJzrw==", - "requires": {} - }, "react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", From 1dc444ff5c8830da7cae3695cfc6b2a7a74606c5 Mon Sep 17 00:00:00 2001 From: Chaewon Date: Wed, 7 Aug 2024 02:12:48 +0900 Subject: [PATCH 4/5] no commit page --- packages/view/src/App.scss | 14 +++++++++++++- packages/view/src/App.tsx | 13 +++++++++---- packages/view/src/assets/monoLogo.svg | 10 ++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 packages/view/src/assets/monoLogo.svg diff --git a/packages/view/src/App.scss b/packages/view/src/App.scss index 4b5237be..7fbab8b6 100644 --- a/packages/view/src/App.scss +++ b/packages/view/src/App.scss @@ -35,6 +35,18 @@ body { display: grid; grid-template-columns: 4fr 1fr; height: calc(100vh - 200px); - padding: 20px; } + +.no-commits-container{ + display: flex; + //background-color: white; + flex-direction: column; + justify-content: center; + align-items: center; + height: calc(100vh - 350px); + + h1 { + margin-bottom: 0rem; + } +} \ No newline at end of file diff --git a/packages/view/src/App.tsx b/packages/view/src/App.tsx index 4b552652..9d83bd67 100644 --- a/packages/view/src/App.tsx +++ b/packages/view/src/App.tsx @@ -3,6 +3,7 @@ import { container } from "tsyringe"; import { useEffect, useRef } from "react"; import BounceLoader from "react-spinners/BounceLoader"; +import MonoLogo from "assets/monoLogo.svg"; import { BranchSelector, Statistics, TemporalFilter, ThemeSelector, VerticalClusterList } from "components"; import "./App.scss"; import type IDEPort from "ide/IDEPort"; @@ -74,14 +75,18 @@ const App = () => {
-
+
{filteredData.length !== 0 ? ( - <> +
- +
) : ( -
NO COMMIT EXISTS
+
+ +

No Commits Found.

+

Make at least one commit to proceed.

+
)}
diff --git a/packages/view/src/assets/monoLogo.svg b/packages/view/src/assets/monoLogo.svg new file mode 100644 index 00000000..1f838028 --- /dev/null +++ b/packages/view/src/assets/monoLogo.svg @@ -0,0 +1,10 @@ + + + + + + + + + + From cfdd021baae60cdefb407fd3f3a69261761758f9 Mon Sep 17 00:00:00 2001 From: Chaewon Date: Wed, 7 Aug 2024 02:18:25 +0900 Subject: [PATCH 5/5] change gaps between iamge and Title --- packages/view/src/App.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/view/src/App.scss b/packages/view/src/App.scss index 7fbab8b6..133b572a 100644 --- a/packages/view/src/App.scss +++ b/packages/view/src/App.scss @@ -40,13 +40,12 @@ body { .no-commits-container{ display: flex; - //background-color: white; flex-direction: column; justify-content: center; align-items: center; height: calc(100vh - 350px); h1 { - margin-bottom: 0rem; + margin: 40px 0 0 0; } } \ No newline at end of file