From 93afc0be7aff118c9d7f6c613800005d5c70f22b Mon Sep 17 00:00:00 2001
From: IshaVenikar <ishavenikar7@gmail.com>
Date: Wed, 30 Oct 2024 10:00:21 +0530
Subject: [PATCH 1/6] Disable deploy button when account is not selected

---
 .../components/projects/create/Configure.tsx  |  4 +-
 .../project/overview/Activity/AuctionCard.tsx | 40 +++++++++----------
 .../src/context/WalletConnectContext.tsx      | 12 +++---
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/packages/frontend/src/components/projects/create/Configure.tsx b/packages/frontend/src/components/projects/create/Configure.tsx
index 9dca4915..0d003eed 100644
--- a/packages/frontend/src/components/projects/create/Configure.tsx
+++ b/packages/frontend/src/components/projects/create/Configure.tsx
@@ -538,7 +538,9 @@ const Configure = () => {
                     <Button
                       {...buttonSize}
                       type="submit"
-                      disabled={isLoading || isPaymentLoading}
+                      disabled={
+                        isLoading || isPaymentLoading || !selectedAccount
+                      }
                       rightIcon={
                         isLoading || isPaymentLoading ? (
                           <LoadingIcon className="animate-spin" />
diff --git a/packages/frontend/src/components/projects/project/overview/Activity/AuctionCard.tsx b/packages/frontend/src/components/projects/project/overview/Activity/AuctionCard.tsx
index 5e93a1d4..b5e9ab39 100644
--- a/packages/frontend/src/components/projects/project/overview/Activity/AuctionCard.tsx
+++ b/packages/frontend/src/components/projects/project/overview/Activity/AuctionCard.tsx
@@ -42,31 +42,31 @@ export const AuctionCard = ({ project }: { project: Project }) => {
       <LoadingIcon className="animate-spin" />
     );
 
-    const checkAuctionStatus = useCallback(async () => {
-      const result = await client.getAuctionData(project.auctionId);
-      setAuctionStatus(result.status);
-      setAuctionDetails(result);
-    }, [project.auctionId, project.deployers, project.fundsReleased]);
+  const checkAuctionStatus = useCallback(async () => {
+    const result = await client.getAuctionData(project.auctionId);
+    setAuctionStatus(result.status);
+    setAuctionDetails(result);
+  }, [project.auctionId, project.deployers, project.fundsReleased]);
 
-    const fetchUpdatedProject = useCallback(async () => {
-      const updatedProject = await client.getProject(project.id);
-      setDeployers(updatedProject.project!.deployers!);
-      setFundsStatus(updatedProject.project!.fundsReleased!);
-    }, [project.id]);
+  const fetchUpdatedProject = useCallback(async () => {
+    const updatedProject = await client.getProject(project.id);
+    setDeployers(updatedProject.project!.deployers!);
+    setFundsStatus(updatedProject.project!.fundsReleased!);
+  }, [project.id]);
 
-    const fetchData = useCallback(async () => {
-      await Promise.all([checkAuctionStatus(), fetchUpdatedProject()]);
-    }, [checkAuctionStatus, fetchUpdatedProject]);
+  const fetchData = useCallback(async () => {
+    await Promise.all([checkAuctionStatus(), fetchUpdatedProject()]);
+  }, [checkAuctionStatus, fetchUpdatedProject]);
 
-    useEffect(() => {
+  useEffect(() => {
+    fetchData();
+
+    const timerId = setInterval(() => {
       fetchData();
+    }, WAIT_DURATION);
 
-      const timerId = setInterval(() => {
-        fetchData();
-      }, WAIT_DURATION);
-
-      return () => clearInterval(timerId);
-    }, [fetchData]);
+    return () => clearInterval(timerId);
+  }, [fetchData]);
 
   const renderAuctionStatus = useCallback(
     () => (
diff --git a/packages/frontend/src/context/WalletConnectContext.tsx b/packages/frontend/src/context/WalletConnectContext.tsx
index 6e8a6dd0..f7e46402 100644
--- a/packages/frontend/src/context/WalletConnectContext.tsx
+++ b/packages/frontend/src/context/WalletConnectContext.tsx
@@ -10,7 +10,6 @@ import {
 import SignClient from '@walletconnect/sign-client';
 import { getSdkError } from '@walletconnect/utils';
 import { SessionTypes } from '@walletconnect/types';
-import { StargateClient } from '@cosmjs/stargate';
 
 import { walletConnectModal } from '../utils/web3modal';
 import {
@@ -46,10 +45,6 @@ export const WalletConnectClientProvider = ({
 
   const isSignClientInitializing = useRef<boolean>(false);
 
-  const createCosmosClient = useCallback(async (endpoint: string) => {
-    return await StargateClient.connect(endpoint);
-  }, []);
-
   const onSessionConnect = useCallback(async (session: SessionTypes.Struct) => {
     setSession(session);
   }, []);
@@ -166,6 +161,11 @@ export const WalletConnectClientProvider = ({
       if (!session) {
         return;
       }
+      if (!session.namespaces['cosmos']) {
+        console.log('Accounts for cosmos namespace not found');
+        return;
+      }
+
       const cosmosAddresses = session.namespaces['cosmos'].accounts;
 
       const cosmosAccounts = cosmosAddresses.map((address) => ({
@@ -178,7 +178,7 @@ export const WalletConnectClientProvider = ({
     };
 
     populateAccounts();
-  }, [session, createCosmosClient]);
+  }, [session]);
 
   useEffect(() => {
     if (!signClient) {
-- 
2.45.2


From 01b1350689f39908a61fe29f14ab53fef9c8ae07 Mon Sep 17 00:00:00 2001
From: IshaVenikar <ishavenikar7@gmail.com>
Date: Wed, 30 Oct 2024 11:05:22 +0530
Subject: [PATCH 2/6] Disable deploy button if lrn is not selected

---
 packages/frontend/src/components/projects/create/Configure.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/projects/create/Configure.tsx b/packages/frontend/src/components/projects/create/Configure.tsx
index 0d003eed..64c9c24b 100644
--- a/packages/frontend/src/components/projects/create/Configure.tsx
+++ b/packages/frontend/src/components/projects/create/Configure.tsx
@@ -515,7 +515,7 @@ const Configure = () => {
                 <Button
                   {...buttonSize}
                   type="submit"
-                  disabled={isLoading}
+                  disabled={isLoading || !selectedDeployer || !selectedAccount}
                   rightIcon={
                     isLoading ? (
                       <LoadingIcon className="animate-spin" />
-- 
2.45.2


From 3da167f30981c0601cd8193fabc4527545287096 Mon Sep 17 00:00:00 2001
From: Adw8 <adwaitgharpure@gmail.com>
Date: Wed, 30 Oct 2024 15:25:18 +0530
Subject: [PATCH 3/6] Update org slug id

---
 packages/backend/test/fixtures/organizations.json             | 4 ++--
 .../Project/Settings/AddEnvironmentVariableRow.stories.tsx    | 2 +-
 .../frontend/src/stories/Project/Settings/Config.stories.tsx  | 2 +-
 .../stories/Project/Settings/DeleteProjectDialog.stories.tsx  | 2 +-
 .../src/stories/Project/Settings/SetupDomains.stories.tsx     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/backend/test/fixtures/organizations.json b/packages/backend/test/fixtures/organizations.json
index ace516d3..19735cca 100644
--- a/packages/backend/test/fixtures/organizations.json
+++ b/packages/backend/test/fixtures/organizations.json
@@ -1,8 +1,8 @@
 [
   {
     "id": "2379cf1f-a232-4ad2-ae14-4d881131cc26",
-    "name": "Snowball Tools",
-    "slug": "snowball-tools-1"
+    "name": "Deploy Tools",
+    "slug": "deploy-tools"
   },
   {
     "id": "7eb9b3eb-eb74-4b53-b59a-69884c82a7fb",
diff --git a/packages/frontend/src/stories/Project/Settings/AddEnvironmentVariableRow.stories.tsx b/packages/frontend/src/stories/Project/Settings/AddEnvironmentVariableRow.stories.tsx
index 458bfa70..81d48009 100644
--- a/packages/frontend/src/stories/Project/Settings/AddEnvironmentVariableRow.stories.tsx
+++ b/packages/frontend/src/stories/Project/Settings/AddEnvironmentVariableRow.stories.tsx
@@ -17,7 +17,7 @@ const meta: Meta<typeof AddEnvironmentVariableRow> = {
         pathParams: { userId: 'me' },
       },
       routing: {
-        path: '/snowball-tools-1/projects/6bb3bec2-d71b-4fc0-9e32-4767f68668f4/settings',
+        path: '/deploy-tools/projects/6bb3bec2-d71b-4fc0-9e32-4767f68668f4/settings',
       },
     }),
   },
diff --git a/packages/frontend/src/stories/Project/Settings/Config.stories.tsx b/packages/frontend/src/stories/Project/Settings/Config.stories.tsx
index de831625..a028ada2 100644
--- a/packages/frontend/src/stories/Project/Settings/Config.stories.tsx
+++ b/packages/frontend/src/stories/Project/Settings/Config.stories.tsx
@@ -17,7 +17,7 @@ const meta: Meta<typeof Config> = {
         pathParams: { userId: 'me' },
       },
       routing: {
-        path: '/snowball-tools-1/projects/6bb3bec2-d71b-4fc0-9e32-4767f68668f4/settings/domains/add/config',
+        path: '/deploy-tools/projects/6bb3bec2-d71b-4fc0-9e32-4767f68668f4/settings/domains/add/config',
       },
     }),
   },
diff --git a/packages/frontend/src/stories/Project/Settings/DeleteProjectDialog.stories.tsx b/packages/frontend/src/stories/Project/Settings/DeleteProjectDialog.stories.tsx
index e3fe7f7e..3c370411 100644
--- a/packages/frontend/src/stories/Project/Settings/DeleteProjectDialog.stories.tsx
+++ b/packages/frontend/src/stories/Project/Settings/DeleteProjectDialog.stories.tsx
@@ -18,7 +18,7 @@ const meta: Meta<typeof DeleteProjectDialog> = {
         pathParams: { userId: 'me' },
       },
       routing: {
-        path: '/snowball-tools-1/projects/6bb3bec2-d71b-4fc0-9e32-4767f68668f4/settings',
+        path: '/deploy-tools/projects/6bb3bec2-d71b-4fc0-9e32-4767f68668f4/settings',
       },
     }),
   },
diff --git a/packages/frontend/src/stories/Project/Settings/SetupDomains.stories.tsx b/packages/frontend/src/stories/Project/Settings/SetupDomains.stories.tsx
index 7c416099..d77a5c6c 100644
--- a/packages/frontend/src/stories/Project/Settings/SetupDomains.stories.tsx
+++ b/packages/frontend/src/stories/Project/Settings/SetupDomains.stories.tsx
@@ -17,7 +17,7 @@ const meta: Meta<typeof SetupDomain> = {
         pathParams: { userId: 'me' },
       },
       routing: {
-        path: '/snowball-tools-1/projects/6bb3bec2-d71b-4fc0-9e32-4767f68668f4/settings/domains',
+        path: '/deploy-tools/projects/6bb3bec2-d71b-4fc0-9e32-4767f68668f4/settings/domains',
       },
     }),
   },
-- 
2.45.2


From e75398ecb27458392981a0e87e471c73492b065d Mon Sep 17 00:00:00 2001
From: Adw8 <adwaitgharpure@gmail.com>
Date: Wed, 30 Oct 2024 17:08:45 +0530
Subject: [PATCH 4/6] Display DNS deployment URLs in overview section

---
 .../frontend/src/pages/org-slug/projects/id/Overview.tsx  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx b/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx
index 8e840bb3..ab78cc11 100644
--- a/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx
+++ b/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx
@@ -180,14 +180,18 @@ const OverviewTabPanel = () => {
 
             {/* DEPLOYMENT */}
             <OverviewInfo label="Deployment URL" icon={<CursorBoxIcon />}>
+            {project.deployments &&
+              project.deployments.length > 0 &&
+              project.deployments.map((deployment) => (
               <div className="flex gap-2 items-center">
-                <Link to="#">
+                <Link to={`https://${project.name.toLowerCase()}.${deployment.deployer.baseDomain}`}>
                   <span className="text-controls-primary group hover:border-controls-primary transition-colors border-b border-b-transparent flex gap-2 items-center text-sm tracking-tight">
-                    {liveDomain?.name}{' '}
+                    {`https://${project.name.toLowerCase()}.${deployment.deployer.baseDomain}`}
                     <LinkIcon className="group-hover:rotate-45 transition-transform" />
                   </span>
                 </Link>
               </div>
+            ))}
             </OverviewInfo>
 
             {/* DEPLOYMENT DATE */}
-- 
2.45.2


From 4d123ad33f85013d9aee04e543e9c528042d7298 Mon Sep 17 00:00:00 2001
From: Adw8 <adwaitgharpure@gmail.com>
Date: Wed, 30 Oct 2024 17:19:59 +0530
Subject: [PATCH 5/6] Add link to button

---
 packages/frontend/src/pages/org-slug/projects/Id.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/pages/org-slug/projects/Id.tsx b/packages/frontend/src/pages/org-slug/projects/Id.tsx
index 372b120a..468453b5 100644
--- a/packages/frontend/src/pages/org-slug/projects/Id.tsx
+++ b/packages/frontend/src/pages/org-slug/projects/Id.tsx
@@ -92,9 +92,13 @@ const Id = () => {
                   Open repo
                 </Button>
               </Link>
-              <Button {...buttonSize} className="h-11 transition-colors">
-                Go to app
-              </Button>
+              {(project.deployments.length > 0) &&
+                <Link to={`https://${project.name.toLowerCase()}.${project.deployments[0].deployer.baseDomain}`}>
+                  <Button {...buttonSize} className="h-11 transition-colors">
+                    Go to app
+                  </Button>
+                </Link>
+              }
             </div>
           </div>
           <WavyBorder />
-- 
2.45.2


From 7b974b7f6b6c6f1d0b1ca0886e2ebf50776fda29 Mon Sep 17 00:00:00 2001
From: Adw8 <adwaitgharpure@gmail.com>
Date: Wed, 30 Oct 2024 17:49:51 +0530
Subject: [PATCH 6/6] Only display project if current user is project owner

---
 packages/backend/src/resolvers.ts | 4 ++--
 packages/backend/src/service.ts   | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/resolvers.ts b/packages/backend/src/resolvers.ts
index 3fe9a9be..e20b7e0c 100644
--- a/packages/backend/src/resolvers.ts
+++ b/packages/backend/src/resolvers.ts
@@ -22,8 +22,8 @@ export const createResolvers = async (service: Service): Promise<any> => {
         return service.getOrganizationsByUserId(context.user);
       },
 
-      project: async (_: any, { projectId }: { projectId: string }) => {
-        return service.getProjectById(projectId);
+      project: async (_: any, { projectId }: { projectId: string }, context: any) => {
+        return service.getProjectById(context.user, projectId);
       },
 
       projectsInOrganization: async (
diff --git a/packages/backend/src/service.ts b/packages/backend/src/service.ts
index b142ad67..5da16954 100644
--- a/packages/backend/src/service.ts
+++ b/packages/backend/src/service.ts
@@ -407,8 +407,13 @@ export class Service {
     return dbOrganizations;
   }
 
-  async getProjectById(projectId: string): Promise<Project | null> {
+  async getProjectById(user: User, projectId: string): Promise<Project | null> {
     const dbProject = await this.db.getProjectById(projectId);
+
+    if (dbProject && dbProject.owner.id !== user.id) {
+      return null;
+    }
+
     return dbProject;
   }
 
-- 
2.45.2