merged conflicts

dashboard/src/main/home/sidebar/ClusterSection.tsx

@@ -44,16 +44,10 @@ export const ClusterSection: React.FC<Props> = ({
           <SideLine />
           <NavButton
             path="/applications"
-<<<<<<< HEAD
-            active={
-              currentCluster.id === clusterId &&
-              window.location.pathname === "/applications"
-=======
             targetClusterName={cluster?.name}
             active={
               currentCluster.id === clusterId &&
               window.location.pathname.startsWith("/applications")
->>>>>>> 6819cce9bfbf1bc3579f6b757d748914208d371d
             }
           >
             <Img src={monoweb} />
@@ -61,16 +55,10 @@ export const ClusterSection: React.FC<Props> = ({
           </NavButton>
           <NavButton
             path="/jobs"
-<<<<<<< HEAD
-            active={
-              currentCluster.id === clusterId &&
-              window.location.pathname === "/jobs"
-=======
             targetClusterName={cluster?.name}
             active={
               currentCluster.id === clusterId &&
               window.location.pathname.startsWith("/jobs")
->>>>>>> 6819cce9bfbf1bc3579f6b757d748914208d371d
             }
           >
             <Img src={monojob} />
@@ -78,16 +66,10 @@ export const ClusterSection: React.FC<Props> = ({
           </NavButton>
           <NavButton
             path="/env-groups"
-<<<<<<< HEAD
-            active={
-              currentCluster.id === clusterId &&
-              window.location.pathname === "/env-groups"
-=======
             targetClusterName={cluster?.name}
             active={
               currentCluster.id === clusterId &&
               window.location.pathname.startsWith("/env-groups")
->>>>>>> 6819cce9bfbf1bc3579f6b757d748914208d371d
             }
           >
             <Img src={sliders} />
@@ -98,16 +80,10 @@ export const ClusterSection: React.FC<Props> = ({
             currentProject.enable_rds_databases && (
               <NavButton
                 path="/databases"
-<<<<<<< HEAD
-                active={
-                  currentCluster.id === clusterId &&
-                  window.location.pathname === "/databases"
-=======
                 targetClusterName={cluster?.name}
                 active={
                   currentCluster.id === clusterId &&
                   window.location.pathname.startsWith("/databases")
->>>>>>> 6819cce9bfbf1bc3579f6b757d748914208d371d
                 }
               >
                 <Icon className="material-icons-outlined">storage</Icon>
@@ -117,29 +93,16 @@ export const ClusterSection: React.FC<Props> = ({
           {currentProject?.stacks_enabled ? (
             <NavButton
               path="/stacks"
-<<<<<<< HEAD
-              active={
-                currentCluster.id === clusterId &&
-                window.location.pathname === "/stacks"
-=======
               targetClusterName={cluster?.name}
               active={
                 currentCluster.id === clusterId &&
                 window.location.pathname.startsWith("/stacks")
->>>>>>> 6819cce9bfbf1bc3579f6b757d748914208d371d
               }
             >
               <Icon className="material-icons-outlined">lan</Icon>
               Stacks
             </NavButton>
           ) : null}
-<<<<<<< HEAD
-          <NavButton
-            path={"/cluster-dashboard"}
-            active={
-              currentCluster.id === clusterId &&
-              window.location.pathname === "/cluster-dashboard"
-=======
           {currentProject?.preview_envs_enabled && (
             <NavButton
               path="/preview-environments"
@@ -166,7 +129,6 @@ export const ClusterSection: React.FC<Props> = ({
             active={
               currentCluster.id === clusterId &&
               window.location.pathname.startsWith("/cluster-dashboard")
->>>>>>> 6819cce9bfbf1bc3579f6b757d748914208d371d
             }
           >
             <Icon className="material-icons">device_hub</Icon>
@@ -176,89 +138,6 @@ export const ClusterSection: React.FC<Props> = ({
       );
     }
   };
-<<<<<<< HEAD
-
-  return (
-    <>
-      <ClusterSelector onClick={() => setIsExpanded(!isExpanded)}>
-        <LinkWrapper>
-          <ClusterIcon>
-            <svg
-              width="19"
-              height="19"
-              viewBox="0 0 19 19"
-              fill="none"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M15.207 12.4403C16.8094 12.4403 18.1092 11.1414 18.1092 9.53907C18.1092 7.93673 16.8094 6.63782 15.207 6.63782"
-                stroke="white"
-                stroke-width="1.5"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-              />
-              <path
-                d="M3.90217 12.4403C2.29983 12.4403 1 11.1414 1 9.53907C1 7.93673 2.29983 6.63782 3.90217 6.63782"
-                stroke="white"
-                stroke-width="1.5"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-              />
-              <path
-                fill-rule="evenodd"
-                clip-rule="evenodd"
-                d="M9.54993 13.4133C7.4086 13.4133 5.69168 11.6964 5.69168 9.55417C5.69168 7.41284 7.4086 5.69592 9.54993 5.69592C11.6913 5.69592 13.4082 7.41284 13.4082 9.55417C13.4082 11.6964 11.6913 13.4133 9.54993 13.4133Z"
-                stroke="white"
-                stroke-width="1.5"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-              />
-              <path
-                d="M6.66895 15.207C6.66895 16.8094 7.96787 18.1092 9.5702 18.1092C11.1725 18.1092 12.4715 16.8094 12.4715 15.207"
-                stroke="white"
-                stroke-width="1.5"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-              />
-              <path
-                d="M6.66895 3.90217C6.66895 2.29983 7.96787 1 9.5702 1C11.1725 1 12.4715 2.29983 12.4715 3.90217"
-                stroke="white"
-                stroke-width="1.5"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-              />
-              <path
-                fill-rule="evenodd"
-                clip-rule="evenodd"
-                d="M5.69591 9.54996C5.69591 7.40863 7.41283 5.69171 9.55508 5.69171C11.6964 5.69171 13.4133 7.40863 13.4133 9.54996C13.4133 11.6913 11.6964 13.4082 9.55508 13.4082C7.41283 13.4082 5.69591 11.6913 5.69591 9.54996Z"
-                stroke="white"
-                stroke-width="1.5"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-              />
-            </svg>
-          </ClusterIcon>
-          <Tooltip title={cluster?.name}>
-            <ClusterName>{cluster?.name}</ClusterName>
-          </Tooltip>
-          <I isExpanded={isExpanded} className="material-icons">
-            arrow_drop_down
-          </I>
-          <Spacer />
-        </LinkWrapper>
-      </ClusterSelector>
-      <div onClick={() => setCurrentCluster(cluster)}>
-        {renderClusterContent(cluster)}
-      </div>
-    </>
-  );
-};
-
-const Spacer = styled.div`
-  flex: 1;
-`;
-
-=======
 
   return (
     <>
@@ -365,7 +244,6 @@ const Spacer = styled.div`
   flex: 1;
 `;
 
->>>>>>> 6819cce9bfbf1bc3579f6b757d748914208d371d
 const Settings = styled.p`
   color: #ffffff44;
   width: 16px;

dashboard/src/main/home/sidebar/Clusters.tsx

@@ -205,20 +205,3 @@ const InitializeButton = styled.div`
     background: #ffffff22;
   }
 `;
-<<<<<<< HEAD
-
-const BgAccent = styled.img`
-  height: 30px;
-  background: #819bfd;
-  width: 30px;
-  border-top-left-radius: 100px;
-  max-width: 30px;
-  border-bottom-left-radius: 100px;
-  position: absolute;
-  top: 6px;
-  right: -8px;
-  border: none;
-  outline: none;
-`;
-=======
->>>>>>> 6819cce9bfbf1bc3579f6b757d748914208d371d

dashboard/src/main/home/sidebar/ProjectSection.tsx

@@ -200,11 +200,7 @@ const Dropdown = styled.div`
   right: 13px;
   top: calc(100% + 5px);
   background: #26282f;
-<<<<<<< HEAD
-  width: 199px;
-=======
   width: 210px;
->>>>>>> 6819cce9bfbf1bc3579f6b757d748914208d371d
   max-height: 500px;
   border-radius: 3px;
   z-index: 999;

dashboard/src/main/home/sidebar/Sidebar.tsx

@@ -156,22 +156,6 @@ class Sidebar extends Component<PropsType, StateType> {
               />
             </>
           )}
-<<<<<<< HEAD
-          {currentProject?.preview_envs_enabled && (
-            <NavButton path="/preview-environments">
-              <InlineSVGWrapper
-                id="Flat"
-                fill="#FFFFFF"
-                xmlns="http://www.w3.org/2000/svg"
-                viewBox="0 0 256 256"
-              >
-                <path d="M103.99951,68a36,36,0,1,0-44,35.0929v49.8142a36,36,0,1,0,16,0V103.0929A36.05516,36.05516,0,0,0,103.99951,68Zm-56,0a20,20,0,1,1,20,20A20.0226,20.0226,0,0,1,47.99951,68Zm40,120a20,20,0,1,1-20-20A20.0226,20.0226,0,0,1,87.99951,188ZM196.002,152.907l-.00146-33.02563a55.63508,55.63508,0,0,0-16.40137-39.59619L155.31348,56h20.686a8,8,0,0,0,0-16h-40c-.02978,0-.05859.00415-.08838.00446-.2334.00256-.46631.01245-.69824.03527-.12891.01258-.25391.03632-.38086.05494-.13135.01928-.26318.03424-.39355.06-.14014.02778-.27686.06611-.41455.10114-.11475.02924-.23047.05426-.34424.08862-.13428.04059-.26367.0907-.395.13806-.11524.04151-.231.07929-.34473.12629-.12109.05011-.23681.10876-.35449.16455-.11914.05621-.23926.10907-.356.17144-.11133.0597-.21728.12757-.32519.1922-.11621.06928-.23389.13483-.34668.21051-.11719.07831-.227.16553-.33985.24976-.09668.07227-.1958.1394-.28955.21655-.18652.1529-.36426.31531-.53564.48413-.01612.01593-.03418.02918-.05029.04529-.02051.02051-.0376.04321-.05762.06391-.16358.16711-.32178.33941-.47022.52032-.083.10059-.15527.20648-.23193.31006-.07861.10571-.16064.20862-.23438.3183-.08056.12072-.15087.24591-.2246.36993-.05958.1-.12208.19757-.17725.30036-.06787.12591-.125.25531-.18506.384-.05078.1084-.10547.21466-.15137.32568-.05127.12463-.09326.25189-.13867.37848-.04248.11987-.08887.238-.126.36047-.03857.12775-.06738.25757-.09912.38678-.03125.124-.06591.24622-.0913.37244-.02979.15088-.04786.30328-.06934.45544-.01465.10645-.03516.21094-.0459.31867q-.03955.39752-.04.79706V88a8,8,0,0,0,16,0V67.31378l24.28516,24.28485a39.73874,39.73874,0,0,1,11.71582,28.28321l.00146,33.02533a36.00007,36.00007,0,1,0,16-.00019ZM188.00244,208a20,20,0,1,1,20-20A20.0226,20.0226,0,0,1,188.00244,208Z" />
-              </InlineSVGWrapper>
-              Preview envs
-            </NavButton>
-          )}
-=======
->>>>>>> 6819cce9bfbf1bc3579f6b757d748914208d371d
         </ScrollWrapper>
       );
     }
@@ -215,25 +199,9 @@ Sidebar.contextType = Context;
 
 export default withRouter(withAuth(Sidebar));
 
-<<<<<<< HEAD
-const InlineSVGWrapper = styled.svg`
-  width: 32px;
-  height: 32px;
-  padding: 8px;
-  padding-left: 0;
-
-  > path {
-    fill: #ffffff;
-  }
-`;
-
-const ScrollWrapper = styled.div`
-  overflow-y: auto;
-=======
 const ScrollWrapper = styled.div`
   overflow-y: auto;
   padding-bottom: 25px;
->>>>>>> 6819cce9bfbf1bc3579f6b757d748914208d371d
   max-height: calc(100vh - 95px);
 `;