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.

Sign up for GitHub

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

Rework main navigation #115

Merged
merged 1 commit into from
Jun 16, 2024
+109 −124
Merged

Rework main navigation #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"dependencies": {
"@gitbeaker/rest": "^40.0.3",
"@primer/octicons-react": "^19.9.0",
"@primer/react": "^35.16.0",
"@primer/react": "^36.22.0",
"marked": "^11.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand Down
93 changes: 47 additions & 46 deletions pnpm-lock.yaml
View file
Open in desktop

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

126 changes: 61 additions & 65 deletions src/popup/components/Nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { TabNav, Label, Tooltip } from '@primer/react';
import { CodeOfConductIcon } from '@primer/octicons-react';
import { UnderlineNav } from '@primer/react';
import { CodeOfConductIcon, Icon } from '@primer/octicons-react';
import { MergeRequestSendMessageReply } from '../utils/mergeRequestDownloader';
import { TabId } from '../../common/types';

Expand All @@ -17,69 +17,65 @@ export const Nav = (props: Props) => {
mrData?.mrReviewed || mrData?.mrGiven ? `${mrData.mrReviewed} / ${mrData.mrGiven.length}` : 'Unknown';
const issuesCount = mrData?.issues ? mrData.issues.length : 0;

interface NavItem {
label: string;
navigation: TabId;
color: string;
counter?: string | number;
icon?: Icon;
}

const items: NavItem[] = [
{
label: 'To Review',
navigation: 'to_review',
color: '220, 53, 69',
counter: mrData ? mrData.mrToReview : 0
},
{
label: 'Under Review',
navigation: 'under_review',
color: '40, 167, 69',
counter: mrData ? mrDataReviewRatio : 0
},
{
label: 'Drafts',
navigation: 'drafts',
color: '72, 72, 72',
counter: mrData?.myDrafts?.length ?? 0
},
{ label: 'Issues', navigation: 'issues', color: '253, 126, 20', counter: issuesCount },
{
label: 'To-Do List',
navigation: 'todo_list',
color: '31, 120, 209',
counter: mrData?.todos ? mrData.todos.length : 0
},
{ label: 'Pick', navigation: 'pick', color: '200, 200, 200', icon: CodeOfConductIcon }
];

return (
<TabNav aria-label="Main" className={'navbarCategories'}>
<TabNav.Link
href="#ToReview"
onClick={() => setCurrentTab('to_review')}
className={currentTab === 'to_review' ? 'selected' : ''}
>
To Review{' '}
<Label size="small" sx={{ bg: '#dc3545', color: 'canvas.default' }}>
{mrData ? mrData.mrToReview : 0}
</Label>
</TabNav.Link>
<TabNav.Link
href="#UnderReview"
onClick={() => setCurrentTab('under_review')}
className={currentTab === 'under_review' ? 'selected' : ''}
>
Under Review{' '}
<Tooltip aria-label={`${mrDataReviewRatio} have been reviewed`} direction="s">
<Label size="small" sx={{ bg: '#28a745', color: 'canvas.default' }}>
{mrData ? mrDataReviewRatio : 0}
</Label>
</Tooltip>
</TabNav.Link>
<TabNav.Link
href="#Drafts"
onClick={() => setCurrentTab('drafts')}
className={currentTab === 'drafts' ? 'selected' : ''}
>
Drafts{' '}
<Label size="small" sx={{ bg: '#484848', color: 'canvas.default' }}>
{mrData?.myDrafts?.length ?? 0}
</Label>
</TabNav.Link>
<TabNav.Link
href="#Issues"
onClick={() => setCurrentTab('issues')}
className={currentTab === 'issues' ? 'selected' : ''}
>
Issues{' '}
<Tooltip aria-label={`${issuesCount} are assigned to you`} direction="s">
<Label size="small" sx={{ bg: '#fd7e14', color: 'canvas.default' }}>
{issuesCount}
</Label>
</Tooltip>
</TabNav.Link>
<TabNav.Link
href="#ToDoList"
onClick={() => setCurrentTab('todo_list')}
className={currentTab === 'todo_list' ? 'selected' : ''}
>
To-Do List{' '}
<Label size="small" sx={{ bg: '#1f78d1', color: 'canvas.default' }}>
{mrData?.todos ? mrData.todos.length : 0}
</Label>
</TabNav.Link>
<TabNav.Link
href="#Pick"
onClick={() => setCurrentTab('pick')}
className={currentTab === 'pick' ? 'selected' : ''}
>
<CodeOfConductIcon /> Pick
</TabNav.Link>
</TabNav>
<UnderlineNav aria-label="Main" loadingCounters={!mrData}>
{items.map((item, index) => (
<UnderlineNav.Item
key={index}
href={`#${item.navigation}`}
onClick={() => setCurrentTab(item.navigation)}
aria-current={currentTab === item.navigation ? 'page' : undefined}
counter={item.counter}
icon={item.icon}
sx={{
':hover': { backgroundColor: `rgba(${item.color}, 0.1)` },
':is([aria-current="page"])': {
'backgroundColor': `rgba(${item.color}, 0.2)`,
'span:is([data-component="text"])': { fontWeight: 400 }
},
'span:last-child': { span: { backgroundColor: `rgb(${item.color})`, color: '#fff' } }
}}
>
{item.label}
</UnderlineNav.Item>
))}
</UnderlineNav>
);
};
4 changes: 0 additions & 4 deletions src/popup/components/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
.navbarCategories div:first-child {
overflow: visible;
}

.emptyContainer {
/* border-color matches TabNav lib */
border-right: 1px solid rgba(225, 228, 232, 0.5);
Expand Down
8 changes: 0 additions & 8 deletions src/popup/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ body {

.subNav {
background: transparent;
/* border-color matches TabNav lib */
border-right: 1px solid rgba(225, 228, 232, 0.5);
border-bottom: 1px solid rgba(225, 228, 232, 0.5);
border-left: 1px solid rgba(225, 228, 232, 0.5);
display: flex;
justify-content: space-between;
padding: 8px;
Expand All @@ -31,10 +27,6 @@ body {

.mrList {
background: transparent;
/* border-color matches TabNav lib */
border-right: 1px solid rgba(225, 228, 232, 0.5);
border-bottom: 1px solid rgba(225, 228, 232, 0.5);
border-left: 1px solid rgba(225, 228, 232, 0.5);
overflow: auto;
/* This is a fix for Chrome */
overflow: overlay;
Expand Down
Loading