🚧 Wip

kloudlite · Jan 8, 2024 · 8315241 · 8315241
1 parent 136dff6
commit 8315241
Show file tree

Hide file tree

Showing 37 changed files with 74 additions and 77 deletions.
diff --git a/src/apps/auth/routes/test/editor-client.tsx → lib/client/components/editor-client.tsx b/src/apps/auth/routes/test/editor-client.tsx → lib/client/components/editor-client.tsx
diff --git a/src/apps/auth/routes/test/editor.tsx → lib/client/components/editor.tsx b/src/apps/auth/routes/test/editor.tsx → lib/client/components/editor.tsx
diff --git a/lib/client/helpers/socket-context.tsx b/lib/client/helpers/socket-context.tsx
@@ -184,7 +184,6 @@ export const useWatch = (...topics: string[]) => {
   useSubscribe(
     topics,
     () => {
-      console.log('hi');
       reloadPage();
     },
     topics

diff --git a/src/apps/auth/routes/_index.tsx b/src/apps/auth/routes/_index.tsx
@@ -10,8 +10,6 @@ const restActions = async (ctx: IExtRemixCtx) => {
   const cookie = getCookie(ctx);
   if (cookie.get('cliLogin')) {
     try {
-      console.log('here', 'lskdfjsldfj');
-
       const { data, errors } = await GQLServerHandler(
         ctx.request
       ).setRemoteAuthHeader({
@@ -21,7 +19,6 @@ const restActions = async (ctx: IExtRemixCtx) => {
 
       logger.log(data, 'loggedin');
       if (errors) {
-        console.log('here', errors);
         throw errors[0];
       }
 

diff --git a/src/apps/auth/routes/_providers+/signup.tsx b/src/apps/auth/routes/_providers+/signup.tsx
@@ -47,7 +47,6 @@ const SignUpWithEmail = () => {
         .required('confirm password is required'),
     }),
     onSubmit: async (v) => {
-      console.log(v);
       try {
         const { errors: _errors } = await api.signUpWithEmail({
           email: v.email,

diff --git a/src/apps/auth/routes/test/_index.tsx b/src/apps/auth/routes/test/_index.tsx
@@ -1,4 +1,4 @@
-import CodeMirrorClient from './editor-client';
+import CodeMirrorClient from '~/root/lib/client/components/editor-client';
 
 const Editor = () => {
   return (

diff --git a/src/apps/console/page-components/new-cluster.tsx b/src/apps/console/page-components/new-cluster.tsx
@@ -1,5 +1,5 @@
 import { ArrowRight } from '@jengaicons/react';
-import { useNavigate, useOutletContext, useParams } from '@remix-run/react';
+import { useNavigate, useParams } from '@remix-run/react';
 import { useMemo, useState } from 'react';
 import { Button } from '~/components/atoms/button';
 import { TextInput } from '~/components/atoms/input';
@@ -24,7 +24,7 @@ import {
   validateClusterCloudProvider,
 } from '../server/r-utils/common';
 import { ensureAccountClientSide } from '../server/utils/auth-utils';
-import { IAccountContext } from '../routes/_main+/$account+/_layout';
+// import { IAccountContext } from '../routes/_main+/$account+/_layout';
 import ProgressWrapper from '../components/progress-wrapper';
 
 type props =
@@ -41,7 +41,7 @@ export const NewCluster = ({ providerSecrets, cloudProvider }: props) => {
   const { cloudprovider: cp } = useParams();
   const isOnboarding = !!cp;
 
-  const [showUnsavedChanges, setShowUnsavedChanges] = useState(false);
+  // const [showUnsavedChanges, setShowUnsavedChanges] = useState(false);
   const api = useConsoleApi();
 
   const cloudProviders = useMemo(
@@ -63,7 +63,7 @@ export const NewCluster = ({ providerSecrets, cloudProvider }: props) => {
 
   const { a: accountName } = useParams();
 
-  const { account } = useOutletContext<IAccountContext>();
+  // const { account } = useOutletContext<IAccountContext>();
 
   const navigate = useNavigate();
 
@@ -110,12 +110,12 @@ export const NewCluster = ({ providerSecrets, cloudProvider }: props) => {
         .oneOf(['HA', 'dev']),
     }),
     onSubmit: async (val) => {
-      type Merge<T, M> = Omit<T, keyof M> & M;
+      // type Merge<T, M> = Omit<T, keyof M> & M;
 
-      type nt = { availabilityMode: 'HA' | 'dev' | string };
-      const k: Merge<typeof val, nt> = val;
+      // type nt = { availabilityMode: 'HA' | 'dev' | string };
+      // const k: Merge<typeof val, nt> = val;
 
-      console.log(k);
+      // console.log(k);
       // val.availabilityMode
       if (!accountName || !val.availabilityMode) {
         return;

diff --git a/src/apps/console/routes/_a+/teams.tsx b/src/apps/console/routes/_a+/teams.tsx
@@ -207,7 +207,7 @@ const Accounts = () => {
           >
             <List.Root plain linkComponent={Link}>
               {page.map((account, index) => {
-                console.log('here....', account);
+                // console.log('here....', account);
 
                 const name = parseName(account);
                 const { isInvite, displayName, inviteToken } = account;

diff --git a/src/apps/console/routes/_main+/$account+/$project+/$environment+/_layout.tsx b/src/apps/console/routes/_main+/$account+/$project+/$environment+/_layout.tsx
@@ -156,7 +156,7 @@ const CurrentBreadcrum = ({ environment }: { environment: IEnvironment }) => {
         if (errors) {
           throw errors[0];
         }
-        console.log(data);
+        // console.log(data);
 
         setEnvironments(parseNodes(data));
       } catch (err) {

diff --git a/...onsole/routes/_main+/$account+/$project+/$environment+/new-app/app-environment-mounts.tsx b/...onsole/routes/_main+/$account+/$project+/$environment+/new-app/app-environment-mounts.tsx
@@ -23,7 +23,6 @@ import {
   parseName,
   parseNodes,
 } from '~/console/server/r-utils/common';
-import { useAPIClient } from '~/root/lib/client/hooks/api-provider';
 import useDebounce from '~/root/lib/client/hooks/use-debounce';
 import useForm from '~/root/lib/client/hooks/use-form';
 import Yup from '~/root/lib/server/helpers/yup';

diff --git a/...ole/routes/_main+/$account+/$project+/$environment+/new-app/app-environment-variables.tsx b/...ole/routes/_main+/$account+/$project+/$environment+/new-app/app-environment-variables.tsx
@@ -187,7 +187,7 @@ export const EnvironmentVariables = () => {
     refKey: Yup.string()
       .when(['type'], ([type], schema) => {
         if (type === 'config' || type === 'secret') {
-          console.log('here', type);
+          // console.log('here', type);
           return schema.required();
         }
         return schema;
@@ -239,11 +239,11 @@ export const EnvironmentVariables = () => {
 
   const vSchema = Yup.object({
     refKey: Yup.string().when('$textInputValue', ([v], schema) => {
-      console.log(v, 'here');
+      // console.log(v, 'here');
       return schema;
     }),
     refName: Yup.string().when('$textInputValue', ([v], schema) => {
-      console.log(v);
+      // console.log(v);
       return schema;
     }),
   });

diff --git a/src/apps/console/routes/_main+/$account+/$project+/$environment+/new-app/app-review.tsx b/src/apps/console/routes/_main+/$account+/$project+/$environment+/new-app/app-review.tsx
@@ -70,7 +70,7 @@ const AppReview = () => {
 
   useEffect(() => {
     const res = validateType(app, 'AppIn');
-    console.log('res', res);
+    // console.log('res', res);
     setErrors(res);
   }, []);
 

diff --git a/...apps/console/routes/_main+/$account+/$project+/$environment+/secret.$secret/resources.tsx b/...apps/console/routes/_main+/$account+/$project+/$environment+/secret.$secret/resources.tsx
@@ -353,7 +353,7 @@ const SecretItemResources = ({
     onShow,
   };
 
-  console.log('items....', items);
+  // console.log('items....', items);
 
   return (
     <>

diff --git a/src/apps/console/routes/_main+/$account+/$project+/environments/route.tsx b/src/apps/console/routes/_main+/$account+/$project+/environments/route.tsx
@@ -57,7 +57,7 @@ const Workspaces = () => {
         }}
       >
         {({ environmentData }) => {
-          console.log('environment: ', environmentData);
+          // console.log('environment: ', environmentData);
 
           const environments = parseNodes(environmentData);
 

diff --git a/src/apps/console/routes/_main+/$account+/_layout.tsx b/src/apps/console/routes/_main+/$account+/_layout.tsx
@@ -1,4 +1,4 @@
-import { CaretDownFill, Plus } from '@jengaicons/react';
+import { CaretDownFill, ChevronUpDown, Plus } from '@jengaicons/react';
 import { redirect } from '@remix-run/node';
 import {
   Outlet,
@@ -100,7 +100,14 @@ const AccountMenu2 = ({ account }: { account: IAccount }) => {
       }}
       trigger={
         <Breadcrum.Button
-          content={<BreadcrumButtonContent content={account.displayName} />}
+          content={
+            <span className="flex flex-row items-center gap-md">
+              <BreadcrumButtonContent content={account.displayName} />
+              <span className="text-icon-disabled">
+                <ChevronUpDown color="currentColor" size={11} />
+              </span>
+            </span>
+          }
         />
       }
     />

diff --git a/src/apps/console/routes/_main+/$account+/infra+/$cluster+/_layout.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/_layout.tsx
@@ -10,9 +10,7 @@ import withContext from '~/root/lib/app-setup/with-contxt';
 import { IExtRemixCtx } from '~/root/lib/types/common';
 import { BrandLogo } from '~/components/branding/brand-logo';
 import {
-  BackingServices,
   ChevronRight,
-  CirclesThreePlus,
   Cpu,
   Crosshair,
   Database,

diff --git a/src/apps/console/routes/_main+/$account+/infra+/$cluster+/overview+/_layout.tsx b/src/apps/console/routes/_main+/$account+/infra+/$cluster+/overview+/_layout.tsx
@@ -11,7 +11,7 @@ const ClusterOverview = () => {
     <SidebarLayout
       navItems={[
         { label: 'Info', value: 'info' },
-        { label: 'Logs', value: 'logs' },
+        // { label: 'Logs', value: 'logs' },
         { label: 'Metrics', value: 'metrics' },
       ]}
       headerTitle=""

diff --git a/src/apps/console/routes/_main+/_layout/_layout.tsx b/src/apps/console/routes/_main+/_layout/_layout.tsx
@@ -117,7 +117,7 @@ const Logo = () => {
   const { account } = useParams();
   return (
     <LogoWrapper to={`/${account}/infra/clusters`}>
-      <BrandLogo detailed />
+      <BrandLogo />
     </LogoWrapper>
   );
 };

diff --git a/src/apps/console/utils/commons.tsx b/src/apps/console/utils/commons.tsx
@@ -1,7 +1,5 @@
 import { AWSlogoFill, ChevronRight } from '@jengaicons/react';
 import { Github__Com___Kloudlite___Operator___Apis___Common____Types__CloudProvider as CloudProviders } from '~/root/src/generated/gql/server';
-import { ReactNode } from 'react';
-import { Truncate } from '~/root/lib/utils/common';
 import { cn } from '~/components/utils';
 import {
   IMSvTemplate,

diff --git a/src/apps/devdoc/images/cost-illustration.svg b/src/apps/devdoc/images/cost-illustration.svg
-Original file line number
+Diff line change
@@ Expand Up / @@ -184,7 +184,6 @@ export const useWatch = (...topics: string[]) => { @@
       useSubscribe(
         topics,
         () => {
-          console.log('hi');
           reloadPage();
         },
         topics
@@ Expand Down @@