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

Merge branch 'Infisical:main' into I-36-use-pre-built-frontend-image

Browse Source
This commit is contained in:
Reginald
2022-11-30 22:46:52 +01:00
committed by GitHub
parent a84fc847db f8e7c3c7c6
commit a5618681df
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/components/basic/layout.js
+10 -10
View File
@@ -5,8 +5,8 @@ import { useRouter } from "next/router";
import { import {
faGear, faGear,
faHouse, faHouse,
faLink,
faMobile, faMobile,
faPlug,
faUser, faUser,
} from "@fortawesome/free-solid-svg-icons"; } from "@fortawesome/free-solid-svg-icons";
import { faPlus } from "@fortawesome/free-solid-svg-icons"; import { faPlus } from "@fortawesome/free-solid-svg-icons";
@@ -124,7 +124,7 @@ export default function Layout({ children }) {
{ {
href: "/integrations/" + workspaceMapping[workspaceSelected], href: "/integrations/" + workspaceMapping[workspaceSelected],
title: "Integrations", title: "Integrations",
emoji: <FontAwesomeIcon icon={faLink} />, emoji: <FontAwesomeIcon icon={faPlug} />,
}, },
{ {
href: "/settings/project/" + workspaceMapping[workspaceSelected], href: "/settings/project/" + workspaceMapping[workspaceSelected],
@@ -242,7 +242,7 @@ export default function Layout({ children }) {
<ul> <ul>
{workspaceList.length > 0 && {workspaceList.length > 0 &&
menuItems.map(({ href, title, emoji }) => ( menuItems.map(({ href, title, emoji }) => (
<li className="mt-1.5 mx-2" key={title}> <li className="mt-0.5 mx-2" key={title}>
{router.asPath.split("/")[1] === href.split("/")[1] && {router.asPath.split("/")[1] === href.split("/")[1] &&
(["project", "billing", "org", "personal"].includes( (["project", "billing", "org", "personal"].includes(
router.asPath.split("/")[2] router.asPath.split("/")[2]
@@ -250,23 +250,23 @@ export default function Layout({ children }) {
? router.asPath.split("/")[2] === href.split("/")[2] ? router.asPath.split("/")[2] === href.split("/")[2]
: true) ? ( : true) ? (
<div <div
className={`flex p-2 text-white text-sm rounded cursor-pointer bg-mineshaft-50/10`} className={`flex relative px-0.5 py-2.5 text-white text-sm rounded cursor-pointer bg-primary-50/10`}
> >
<div className="bg-primary w-1 rounded-xl mr-1"></div> <div className="absolute top-0 my-1 ml-1 inset-0 bg-primary w-1 rounded-xl mr-1"></div>
<p className="ml-2 mr-4">{emoji}</p> <p className="w-6 ml-3 mr-1 flex items-center justify-center">{emoji}</p>
{title} {title}
</div> </div>
) : router.asPath == "/noprojects" ? ( ) : router.asPath == "/noprojects" ? (
<div className={`flex p-2 text-white text-sm rounded`}> <div className={`flex p-2.5 text-white text-sm rounded`}>
<p className="ml-2 mr-4">{emoji}</p> <p className="w-8 flex items-center justify-center">{emoji}</p>
{title} {title}
</div> </div>
) : ( ) : (
<Link href={href}> <Link href={href}>
<div <div
className={`flex p-2 text-white text-sm rounded cursor-pointer hover:bg-mineshaft-50/5`} className={`flex p-2.5 text-white text-sm rounded cursor-pointer hover:bg-primary-50/5`}
> >
<p className="ml-2 mr-4">{emoji}</p> <p className="w-8 flex items-center justify-center">{emoji}</p>
{title} {title}
</div> </div>
</Link> </Link>