From c42b53c21c0c308a53b1c794f049b4535257b0ff Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 19 Mar 2024 04:55:39 -0400 Subject: [PATCH] feat(icons): use octicons --- src/components/Sidebar.tsx | 19 ++-- .../__snapshots__/Sidebar.test.tsx.snap | 80 +++++++-------- src/icons/AddAccount.tsx | 27 ----- src/icons/Cog.tsx | 26 ----- src/icons/Logout.tsx | 27 ----- src/icons/Quit.tsx | 27 ----- src/icons/Refresh.tsx | 26 ----- src/routes/Settings.tsx | 18 ++-- .../__snapshots__/Settings.test.tsx.snap | 99 +++++++------------ src/utils/github-api.test.ts | 2 +- src/utils/github-api.ts | 3 +- 11 files changed, 95 insertions(+), 259 deletions(-) delete mode 100644 src/icons/AddAccount.tsx delete mode 100644 src/icons/Cog.tsx delete mode 100644 src/icons/Logout.tsx delete mode 100644 src/icons/Quit.tsx delete mode 100644 src/icons/Refresh.tsx diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx index c0f685efa..3985ce114 100644 --- a/src/components/Sidebar.tsx +++ b/src/components/Sidebar.tsx @@ -1,13 +1,15 @@ -import { BellIcon } from '@primer/octicons-react'; +import { + BellIcon, + GearIcon, + SyncIcon, + XCircleIcon, +} from '@primer/octicons-react'; import { ipcRenderer } from 'electron'; import React, { useCallback, useContext, useMemo } from 'react'; import { useNavigate, useLocation } from 'react-router-dom'; import { Logo } from '../components/Logo'; import { AppContext } from '../context/App'; -import { IconCog } from '../icons/Cog'; -import { IconQuit } from '../icons/Quit'; -import { IconRefresh } from '../icons/Refresh'; import { Constants } from '../utils/constants'; import { openExternalLink } from '../utils/comms'; @@ -75,10 +77,7 @@ export const Sidebar: React.FC = () => { fetchNotifications(); }} > - + )} @@ -104,7 +103,7 @@ export const Sidebar: React.FC = () => { aria-label="Quit Gitify" onClick={quitApp} > - + )} diff --git a/src/components/__snapshots__/Sidebar.test.tsx.snap b/src/components/__snapshots__/Sidebar.test.tsx.snap index 5b1f0bf97..c4a80427a 100644 --- a/src/components/__snapshots__/Sidebar.test.tsx.snap +++ b/src/components/__snapshots__/Sidebar.test.tsx.snap @@ -99,29 +99,27 @@ exports[`components/Sidebar.tsx should render itself & its children (logged in) title="Quit Gitify" > @@ -227,29 +225,27 @@ exports[`components/Sidebar.tsx should render itself & its children (logged out) title="Quit Gitify" > diff --git a/src/icons/AddAccount.tsx b/src/icons/AddAccount.tsx deleted file mode 100644 index febf87a83..000000000 --- a/src/icons/AddAccount.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import * as React from 'react'; - -export const IconAddAccount = ({ className = '' }: { className?: string }) => { - return ( - - ); -}; diff --git a/src/icons/Cog.tsx b/src/icons/Cog.tsx deleted file mode 100644 index 578091450..000000000 --- a/src/icons/Cog.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import * as React from 'react'; - -export const IconCog = ({ className = '' }: { className?: string }) => { - return ( - - ); -}; diff --git a/src/icons/Logout.tsx b/src/icons/Logout.tsx deleted file mode 100644 index d96f08f56..000000000 --- a/src/icons/Logout.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import * as React from 'react'; - -export const IconLogOut = ({ className = '' }: { className?: string }) => { - return ( - - ); -}; diff --git a/src/icons/Quit.tsx b/src/icons/Quit.tsx deleted file mode 100644 index 858641a5a..000000000 --- a/src/icons/Quit.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import * as React from 'react'; - -export const IconQuit = ({ className = '' }: { className?: string }) => { - return ( - - ); -}; diff --git a/src/icons/Refresh.tsx b/src/icons/Refresh.tsx deleted file mode 100644 index 605b459c9..000000000 --- a/src/icons/Refresh.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import * as React from 'react'; - -export const IconRefresh = ({ className = '' }: { className?: string }) => { - return ( - - ); -}; diff --git a/src/routes/Settings.tsx b/src/routes/Settings.tsx index 9ee9585c5..6c3c77b31 100644 --- a/src/routes/Settings.tsx +++ b/src/routes/Settings.tsx @@ -1,4 +1,9 @@ -import { ArrowLeftIcon } from '@primer/octicons-react'; +import { + ArrowLeftIcon, + PersonAddIcon, + SignOutIcon, + XCircleIcon, +} from '@primer/octicons-react'; import { ipcRenderer } from 'electron'; import React, { useCallback, @@ -12,9 +17,6 @@ import { useNavigate } from 'react-router-dom'; import { FieldCheckbox } from '../components/fields/Checkbox'; import { FieldRadioGroup } from '../components/fields/RadioGroup'; import { AppContext } from '../context/App'; -import { IconAddAccount } from '../icons/AddAccount'; -import { IconLogOut } from '../icons/Logout'; -import { IconQuit } from '../icons/Quit'; import { Appearance } from '../types'; import { apiRequestAuth } from '../utils/api-requests'; import { setAppearance } from '../utils/appearance'; @@ -172,8 +174,8 @@ export const SettingsRoute: React.FC = () => { title="Login with GitHub Enterprise" onClick={goToEnterprise} > - @@ -183,7 +185,7 @@ export const SettingsRoute: React.FC = () => { title="Logout" onClick={logoutUser} > - + diff --git a/src/routes/__snapshots__/Settings.test.tsx.snap b/src/routes/__snapshots__/Settings.test.tsx.snap index c0c3c21ec..fecd55268 100644 --- a/src/routes/__snapshots__/Settings.test.tsx.snap +++ b/src/routes/__snapshots__/Settings.test.tsx.snap @@ -293,29 +293,20 @@ exports[`routes/Settings.tsx should render itself & its children 1`] = ` title="Login with GitHub Enterprise" > diff --git a/src/utils/github-api.test.ts b/src/utils/github-api.test.ts index dbb5fe929..daeca7ca3 100644 --- a/src/utils/github-api.test.ts +++ b/src/utils/github-api.test.ts @@ -32,7 +32,7 @@ describe('getNotificationTypeIcon', () => { getNotificationTypeIcon( createSubjectMock({ type: 'CheckSuite', state: null }), ).displayName, - ).toBe('SyncIcon'); + ).toBe('RocketIcon'); expect( getNotificationTypeIcon( createSubjectMock({ diff --git a/src/utils/github-api.ts b/src/utils/github-api.ts index f237040fd..f153d6ed1 100644 --- a/src/utils/github-api.ts +++ b/src/utils/github-api.ts @@ -20,7 +20,6 @@ import { RocketIcon, SkipIcon, StopIcon, - SyncIcon, TagIcon, XIcon, } from '@primer/octicons-react'; @@ -104,7 +103,7 @@ export function getNotificationTypeIcon( case 'success': return CheckIcon; default: - return SyncIcon; + return RocketIcon; } case 'Commit': return GitCommitIcon;