awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 21:27:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolved double border conflict

Browse Source
This commit is contained in:
Sheen Capadngan
2024-06-13 01:35:17 +08:00
parent 76c468ecc7
commit f101366bce
1 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/org/[id]/overview/index.tsx
+15 -10
View File
@@ -567,6 +567,9 @@ const OrganizationPage = withPermission(
}, []); }, []);
const isWorkspaceEmpty = !isWorkspaceLoading && orgWorkspaces?.length === 0; const isWorkspaceEmpty = !isWorkspaceLoading && orgWorkspaces?.length === 0;
const filteredWorkspaces = orgWorkspaces.filter((ws) =>
ws?.name?.toLowerCase().includes(searchFilter.toLowerCase())
);
const projectsGridView = ( const projectsGridView = (
<div className="mt-4 grid w-full grid-cols-1 gap-4 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4"> <div className="mt-4 grid w-full grid-cols-1 gap-4 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4">
@@ -587,9 +590,7 @@ const OrganizationPage = withPermission(
</div> </div>
</div> </div>
))} ))}
{orgWorkspaces {filteredWorkspaces.map((workspace) => (
.filter((ws) => ws?.name?.toLowerCase().includes(searchFilter.toLowerCase()))
.map((workspace) => (
// eslint-disable-next-line jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events // eslint-disable-next-line jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events
<div <div
onClick={() => { onClick={() => {
@@ -628,9 +629,7 @@ const OrganizationPage = withPermission(
<Skeleton className="w-full bg-mineshaft-600" /> <Skeleton className="w-full bg-mineshaft-600" />
</div> </div>
))} ))}
{orgWorkspaces {filteredWorkspaces.map((workspace, ind) => (
.filter((ws) => ws?.name?.toLowerCase().includes(searchFilter.toLowerCase()))
.map((workspace) => (
// eslint-disable-next-line jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events // eslint-disable-next-line jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events
<div <div
onClick={() => { onClick={() => {
@@ -638,7 +637,9 @@ const OrganizationPage = withPermission(
localStorage.setItem("projectData.id", workspace.id); localStorage.setItem("projectData.id", workspace.id);
}} }}
key={workspace.id} key={workspace.id}
className="min-w-72 group grid h-14 cursor-pointer grid-cols-6 border border-mineshaft-600 bg-mineshaft-800 px-6 hover:bg-mineshaft-700" className={`min-w-72 group grid h-14 cursor-pointer grid-cols-6 border-t border-l border-r border-mineshaft-600 bg-mineshaft-800 px-6 hover:bg-mineshaft-700 ${
ind === filteredWorkspaces.length - 1 && "border-b"
}`}
> >
<div className="flex items-center sm:col-span-3 lg:col-span-4"> <div className="flex items-center sm:col-span-3 lg:col-span-4">
<FontAwesomeIcon icon={faFileShield} className="text-sm text-primary/70" /> <FontAwesomeIcon icon={faFileShield} className="text-sm text-primary/70" />
@@ -697,7 +698,7 @@ const OrganizationPage = withPermission(
onChange={(e) => setSearchFilter(e.target.value)} onChange={(e) => setSearchFilter(e.target.value)}
leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />} leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
/> />
<div className="flex ml-2 p-1 bg-mineshaft-800 border border-mineshaft-600 rounded-md"> <div className="ml-2 flex rounded-md border border-mineshaft-600 bg-mineshaft-800 p-1">
<IconButton <IconButton
variant="outline_bg" variant="outline_bg"
onClick={() => { onClick={() => {
@@ -706,7 +707,9 @@ const OrganizationPage = withPermission(
}} }}
ariaLabel="grid" ariaLabel="grid"
size="xs" size="xs"
className={`${projectsViewMode === ProjectsViewMode.GRID ? "bg-mineshaft-500" : "bg-transparent"} hover:bg-mineshaft-600 min-w-[2.4rem] border-none`} className={`${
projectsViewMode === ProjectsViewMode.GRID ? "bg-mineshaft-500" : "bg-transparent"
} min-w-[2.4rem] border-none hover:bg-mineshaft-600`}
> >
<FontAwesomeIcon icon={faBorderAll} /> <FontAwesomeIcon icon={faBorderAll} />
</IconButton> </IconButton>
@@ -718,7 +721,9 @@ const OrganizationPage = withPermission(
}} }}
ariaLabel="list" ariaLabel="list"
size="xs" size="xs"
className={`${projectsViewMode === ProjectsViewMode.LIST ? "bg-mineshaft-500" : "bg-transparent"} hover:bg-mineshaft-600 min-w-[2.4rem] border-none`} className={`${
projectsViewMode === ProjectsViewMode.LIST ? "bg-mineshaft-500" : "bg-transparent"
} min-w-[2.4rem] border-none hover:bg-mineshaft-600`}
> >
<FontAwesomeIcon icon={faList} /> <FontAwesomeIcon icon={faList} />
</IconButton> </IconButton>