Sfoglia il codice sorgente

handle cluster connected on onboarding flw

Justin Rhee 3 anni fa
parent
commit
d74af87c23

+ 0 - 1
cli/cmd/login/server.go

@@ -242,7 +242,6 @@ const successScreen = `
     </div>
     </div>
     <noscript>You need to enable JavaScript to run this app.</noscript>
-    <img id='logo' src='https://i.ibb.co/y64zfm5/porter.png'>
     <div id='success'>Authentication successful!</div>
     <div id='subtitle'>You can now close this window.</div>
     <script>

+ 1 - 1
dashboard/src/components/TitleSection.tsx

@@ -78,7 +78,7 @@ const MaterialIcon = styled.span<{ width: string }>`
 `;
 
 const StyledTitle = styled.div<{ capitalize: boolean }>`
-  font-size: 24px;
+  font-size: 20px;
   font-weight: 600;
   user-select: text;
   text-transform: ${(props) => (props.capitalize ? "capitalize" : "")};

+ 2 - 2
dashboard/src/main/home/Home.tsx

@@ -529,7 +529,7 @@ export default withRouter(withAuth(Home));
 const ViewWrapper = styled.div`
   height: 100%;
   width: 100vw;
-  padding-top: 10vh;
+  padding: 50px 45px;
   overflow-y: auto;
   display: flex;
   flex: 1;
@@ -539,7 +539,7 @@ const ViewWrapper = styled.div`
 `;
 
 const DashboardWrapper = styled.div`
-  width: calc(85%);
+  width: 100%;
   min-width: 300px;
   height: fit-content;
 `;

+ 6 - 6
dashboard/src/main/home/dashboard/Dashboard.tsx

@@ -255,7 +255,7 @@ const TopRow = styled.div`
 `;
 
 const Description = styled.div`
-  color: #aaaabb;
+  color: #8b949f;
   margin-top: 13px;
   margin-left: 2px;
   font-size: 13px;
@@ -299,24 +299,24 @@ const Overlay = styled.div`
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: 24px;
+  font-size: 20px;
   font-weight: 500;
   font-family: "Work Sans", sans-serif;
   color: white;
 `;
 
 const DashboardImage = styled.img`
-  height: 45px;
-  width: 45px;
+  height: 35px;
+  width: 35px;
   border-radius: 5px;
   box-shadow: 0 2px 5px 4px #00000011;
 `;
 
 const DashboardIcon = styled.div`
   position: relative;
-  height: 45px;
+  height: 23px;
   margin-right: 17px;
-  width: 45px;
+  min-width: 23px;
   border-radius: 5px;
   display: flex;
   align-items: center;

+ 1 - 1
dashboard/src/main/home/integrations/Integrations.tsx

@@ -132,6 +132,6 @@ const TitleSectionAlt = styled(TitleSection)`
 `;
 
 const StyledIntegrations = styled.div`
-  width: calc(85%);
+  width: 100%;
   min-width: 300px;
 `;

+ 1 - 1
dashboard/src/main/home/launch/Launch.tsx

@@ -426,7 +426,7 @@ const Polymer = styled.div`
 `;
 
 const TemplatesWrapper = styled.div`
-  width: calc(85%);
+  width: 100%;
   overflow: visible;
   min-width: 300px;
 `;

+ 3 - 1
dashboard/src/main/home/modals/SkipProvisioningModal.tsx

@@ -1,6 +1,7 @@
 import InputRow from "components/form-components/InputRow";
 import SaveButton from "components/SaveButton";
 import React, { useContext } from "react";
+import { contextType } from "react-modal";
 import { Context } from "shared/Context";
 import styled from "styled-components";
 
@@ -9,7 +10,7 @@ import styled from "styled-components";
  * will open this modal to let user skip onboarding and keep using porter.
  */
 const SkipOnboardingModal = () => {
-  const { currentModalData, setHasFinishedOnboarding } = useContext(Context);
+  const { currentModalData, setHasFinishedOnboarding, setCurrentModal } = useContext(Context);
 
   return (
     <>
@@ -27,6 +28,7 @@ const SkipOnboardingModal = () => {
               currentModalData.skipOnboarding();
             }
             setHasFinishedOnboarding(true);
+            setCurrentModal(null);
           }}
           status={""}
           clearPosition

+ 0 - 1
dashboard/src/main/home/onboarding/Onboarding.tsx

@@ -171,7 +171,6 @@ const StyledOnboarding = styled.div`
   z-index: 1;
   display: flex;
   align-items: center;
-  margin-top: -6%;
   padding-bottom: 5%;
   min-width: 350px;
   position: relative;

+ 1 - 0
dashboard/src/main/home/onboarding/steps/ConnectRegistry/ConnectRegistry.tsx

@@ -201,6 +201,7 @@ const IntegrationList = styled.div`
 
 const Div = styled.div`
   width: 100%;
+  margin-top: 40px;
 `;
 
 const Subtitle = styled.div`

+ 1 - 1
dashboard/src/main/home/project-settings/ProjectSettings.tsx

@@ -212,7 +212,7 @@ const Warning = styled.div`
 `;
 
 const StyledProjectSettings = styled.div`
-  width: calc(85%);
+  width: 100%;
   min-width: 300px;
   height: 100vh;
 `;

+ 1 - 1
dashboard/src/shared/common.tsx

@@ -15,7 +15,7 @@ export const infraNames: any = {
 export const integrationList: any = {
   kubernetes: {
     icon:
-      "https://uxwing.com/wp-content/themes/uxwing/download/10-brands-and-social-media/kubernetes.png",
+      "https://upload.wikimedia.org/wikipedia/labs/thumb/b/ba/Kubernetes-icon-color.svg/2110px-Kubernetes-icon-color.svg.png",
     label: "Kubernetes",
     buttonText: "Add a Cluster",
   },