Fix Input component react hook

.gitignore

@@ -7,6 +7,3 @@ yarn-error.log
 packages/backend/environments/local.toml
 packages/backend/dev/
 packages/frontend/dist/
-
-# ignore all .DS_Store files
-**/.DS_Store

README.md

@@ -1,23 +1,220 @@
 # snowballtools-base
 
-This is a [yarn workspace](https://yarnpkg.com/features/workspaces) monorepo for the dashboard.
+## Setup
 
-## Getting Started
+- Clone the `snowballtools-base` repo
 
-### Install dependencies
+  ```bash
+  git clone git@github.com:snowball-tools/snowballtools-base.git
+  cd snowballtools-base
+  ```
 
-In the root of the project, run:
+- Install dependencies in root
 
-```zsh
+  ```bash
   yarn
   ```
 
-### Build backend
+- Build packages
 
-```zsh
+  ```bash
   yarn build --ignore frontend
   ```
 
-### Environment variables, running the development server, and deployment
+Let us assume the following domains for backend and frontend
+  - Backend server: `api.snowballtools.com`
+  - Frontend app: `dashboard.snowballtools.com`
 
-Follow the instructions in the README.md files of the [backend](packages/backend/README.md) and [frontend](packages/frontend/README.md) packages.
+- Configuration Files
+
+  - For Backend:
+  
+    ```bash
+    cp packages/backend/environments/local.toml.example packages/backend/environments/local.toml
+    ```
+
+    - Production
+      
+      - Update the following in backend [config file](packages/backend/environments/local.toml)
+        
+        ```toml
+        [server]
+          ...
+          [server.session]
+            # Secret should be changed to a different random string
+            secret = "p4yfpkqnddkui2iw7t6hbhwq74lbqs7sidnc382"
+            # Set URL of the frontend app
+            appOriginUrl = "https://dashboard.snowballtools.com"
+            # Set to true for session cookies to work behind proxy
+            trustProxy = true
+            # Set empty domain when using secure connection
+            domain = ""
+        ```
+      
+      - Set `gitHub.oAuth.clientId` and `gitHub.oAuth.clientSecret` in backend [config file](packages/backend/environments/local.toml)
+        - [OAuth App Creation](https://github.com/organizations/<org>/settings/applications/new)
+          - Homepage URL: `https://dashboard.snowballtools.com`
+          - Authorization callback URL: `https://dashboard.snowballtools.com/organization/projects/create`
+          - Generate a new client secret after app is created
+      
+      - Set `gitHub.webhookUrl` in backend [config file](packages/backend/environments/local.toml)
+      
+        ```toml
+        [gitHub]
+          webhookUrl = "https://api.snowballtools.com"
+        ```
+      
+      - Let us assume domain for Laconicd to be `api.laconic.com` and set the following in backend [config file](packages/backend/environments/local.toml)
+      
+        ```toml
+        [registryConfig]
+          fetchDeploymentRecordDelay = 5000
+          # Use actual port for REST endpoint
+          restEndpoint = "http://api.laconic.com:1317"
+          # Use actual port for GQL endpoint
+          gqlEndpoint = "http://api.laconic.com:9473/api"
+          # Set private key of account to be used in Laconicd
+          privateKey = "0wtu92cd4f1y791ezpjwgzzazni4dmd3q3mzqc3t6i6r9v06ji784tey6hwmnn69"
+          # Set Bond ID to be used for publishing records
+          bondId = "8xk8c2pb61kajwixpm223zvptr2x2ncajq0vd998p6aqhvqqep2reu6pik245epf"
+          chainId = "laconic_9000-1"
+          # Set authority that is existing in the chain
+          authority = "laconic"
+          [registryConfig.fee]
+            amount = "200000"
+            denom = "aphoton"
+            gas = "750000"
+        ```
+
+    - Development
+    
+      - Set `gitHub.oAuth.clientId` and `gitHub.oAuth.clientSecret` in backend [config file](packages/backend/environments/local.toml)
+        - [OAuth App Creation](https://github.com/organizations/<org>/settings/applications/new)
+          - Homepage URL: `http://localhost:3000`
+          - Authorization callback URL: `http://localhost:3000/organization/projects/create`
+          - Generate a new client secret after app is created
+      
+      - Setup Laconicd
+        - Run the laconicd stack following this [doc](https://git.vdb.to/cerc-io/stack-orchestrator/src/branch/main/docs/laconicd-with-console.md)
+        - Get the private key and set `registryConfig.privateKey` in backend [config file](packages/backend/environments/local.toml)
+      
+          ```bash
+          laconic-so deployment --dir laconic-loaded-deployment exec laconicd "laconicd keys export mykey --unarmored-hex --unsafe"
+          # WARNING: The private key will be exported as an unarmored hexadecimal string. USE AT YOUR OWN RISK. Continue? [y/N]: y
+          # 754cca7b4b729a99d156913aea95366411d072856666e95ba09ef6c664357d81
+          ```
+
+        - Set authority in `registryConfig.authority` in backend [config file](packages/backend/environments/local.toml)
+
+        - Run the script to create bond, reserve the authority and set authority bond
+      
+          ```bash
+          yarn test:registry:init
+          # snowball:initialize-registry bondId: 6af0ab81973b93d3511ae79841756fb5da3fd2f70ea1279e81fae7c9b19af6c4 +0ms
+          ```
+      
+          - Get the bond id and set `registryConfig.bondId` in backend [config file](packages/backend/environments/local.toml)
+      
+      - Setup ngrok for GitHub webhooks
+        - [ngrok getting started](https://ngrok.com/docs/getting-started/)
+        - Start ngrok and point to backend server endpoint
+      
+          ```bash
+          ngrok http http://localhost:8000
+          ```
+      
+        - Look for the forwarding URL in ngrok
+      
+          ```bash
+          Forwarding                    https://19c1-61-95-158-116.ngrok-free.app -> http://localhost:8000
+          ```
+      
+        - Set `gitHub.webhookUrl` in backend [config file](packages/backend/environments/local.toml)
+      
+          ```toml
+          [gitHub]
+            webhookUrl = "https://19c1-61-95-158-116.ngrok-free.app"
+          ```
+
+  - For Frontend:
+  
+    ```bash
+    cp packages/frontend/.env.example packages/frontend/.env
+    ```
+
+    - Copy the GitHub OAuth app client ID from previous steps and set it in frontend [.env](packages/frontend/.env) file
+
+      ```env
+      VITE_GITHUB_CLIENT_ID = <CLIENT_ID>
+      ```
+    
+    - Set `VITE_GITHUB_PWA_TEMPLATE_REPO` and `VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO` in [.env](packages/frontend/.env) file
+    
+      ```env
+      VITE_GITHUB_PWA_TEMPLATE_REPO = 'cerc-io/test-progressive-web-app'   # Set actual owner/name of the template repo that will be used for creating new repo
+      VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO = 'cerc-io/image-upload-pwa-example'  # Set actual owner/name of the template repo that will be used for creating new repo
+      ```
+
+    - Production
+    
+      - Set the following values in [.env](packages/frontend/.env) file
+      
+        ```env
+        VITE_SERVER_URL = 'https://api.snowballtools.com'   # Backend server endpoint
+        ```
+      
+      - Sign in to [wallet connect](https://cloud.walletconnect.com/sign-in) to create a project ID
+        - Create a project and add information to use wallet connect SDK
+          - Add project name and select project type as `App`
+          - Set project home page URL to `https://dashboard.snowballtools.com`
+        - On creation of project, use the `Project ID` and set it in `VITE_WALLET_CONNECT_ID` in [.env](packages/frontend/.env) file
+      
+        ```env
+        VITE_WALLET_CONNECT_ID = <PROJECT_ID>
+        ```
+      
+      - Build the React application
+      
+        ```bash
+        yarn build
+        ```
+      
+      - Use a web server for hosting static built files
+      
+        ```bash
+        python3 -m http.server -d build 3000
+        ```
+
+    - Development
+    
+      - Copy the graphQL endpoint from terminal and add the endpoint in the [.env](packages/frontend/.env) file present in `packages/frontend`
+      
+        ```env
+        VITE_SERVER_URL = 'http://localhost:8000'
+        ```
+      
+      - Sign in to [wallet connect](https://cloud.walletconnect.com/sign-in) to create a project ID.
+        - Create a project and add information to use wallet connect SDK
+          - Add project name and select project type as `App`
+          - Project home page URL is not required to be set
+        - On creation of project, use the `Project ID` and set it in `VITE_WALLET_CONNECT_ID` in [.env](packages/frontend/.env) file
+      
+        ```env
+        VITE_WALLET_CONNECT_ID = <Project_ID>
+        ```
+      
+      - The React application will be running in `http://localhost:3000/`
+
+## Development
+
+- Start the backend server
+
+  ```bash
+  yarn start:backend
+  ```
+
+- Start the frontend
+
+  ```bash
+  yarn start
+  ```

packages/backend/README.md

@@ -1,76 +1 @@
-# backend
+# Backend for Snowball Tools
-
-This backend is a [node.js](https://nodejs.org/) [express.js](https://expressjs.com/) [apollo server](https://www.apollographql.com/docs/apollo-server/) project in a [yarn workspace](https://yarnpkg.com/features/workspaces).
-
-## Getting Started
-
-### Install dependencies
-
-In the root of the project, run:
-
-```zsh
-yarn
-```
-
-### Build backend
-
-```zsh
-yarn build --ignore frontend
-```
-
-### Environment variables
-
-#### Local
-
-Copy the `envionments/local.toml.example` file to `envionments/local.toml`:
-
-```zsh
-cp envionments/local.toml.example envionments/local.toml
-```
-
-#### Staging environment variables
-
-In the deployment repository, update staging [staging/configmaps/config/prod.toml](https://git.vdb.to/cerc-io/snowballtools-base-api-deployments/src/commit/318c2bc09f334dca79c3501838512749f9431bf1/deployments/staging/configmaps/config/prod.toml)
-
-#### Production environment variables
-
-In the deployment repository, update production [production/configmaps/config/prod.toml](https://git.vdb.to/cerc-io/snowballtools-base-api-deployments/src/commit/318c2bc09f334dca79c3501838512749f9431bf1/deployments/production/configmaps/config/prod.toml)
-
-### Run development server
-
-```zsh
-yarn start
-```
-
-## Deployment
-
-Clone the deployer repository:
-
-```zsh
-git clone git@git.vdb.to:cerc-io/snowballtools-base-api-deployments.git
-```
-
-### Staging
-
-```zsh
-echo trigger >> .gitea/workflows/triggers/staging-deploy
-git commit -a -m "Deploy v0.0.8"  # replace with version number
-git push
-```
-
-### Production
-
-```zsh
-echo trigger >> .gitea/workflows/triggers/production-deploy
-git commit -a -m "Deploy v0.0.8" # replace with version number
-git push
-```
-
-### Deployment status
-
-Dumb for now
-
-- [Staging](https://snowballtools-base-api.staging.apps.snowballtools.com/staging/version)
-- [Production](https://snowballtools-base-api.apps.snowballtools.com/staging/version)
-
-Update version number manually in [routes/staging.ts](/packages/backend/src/routes/staging.ts)

packages/backend/environments/local.toml.example

@@ -3,7 +3,7 @@
   port = 8000
   gqlPath = "/graphql"
   [server.session]
-    secret = ""
+    secret = "p4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi"
     appOriginUrl = "http://localhost:3000"
     trustProxy = false
     domain = "localhost"
@@ -17,16 +17,6 @@
     clientId = ""
     clientSecret = ""
 
-[google]
-  clientId = ""
-  clientSecret = ""
-
-[turnkey]
-  apiBaseUrl = "https://api.turnkey.com"
-  apiPrivateKey = ""
-  apiPublicKey = ""
-  defaultOrganizationId = ""
-
 [registryConfig]
   fetchDeploymentRecordDelay = 5000
   restEndpoint = "http://localhost:1317"

packages/backend/package.json

@@ -19,7 +19,6 @@
     "cors": "^2.8.5",
     "debug": "^4.3.1",
     "express": "^4.18.2",
-    "express-async-errors": "^3.1.1",
     "express-session": "^1.18.0",
     "fs-extra": "^11.2.0",
     "graphql": "^16.8.1",

packages/backend/src/index.ts

@@ -1,4 +1,3 @@
-import 'express-async-errors';
 import 'reflect-metadata';
 import debug from 'debug';
 import fs from 'fs';

packages/backend/src/resolvers.ts

@@ -6,7 +6,6 @@ import { Permission } from './entity/ProjectMember';
 import { Domain } from './entity/Domain';
 import { Project } from './entity/Project';
 import { EnvironmentVariable } from './entity/EnvironmentVariable';
-import { AddProjectFromTemplateInput } from './types';
 
 const log = debug('snowball:resolver');
 
@@ -26,15 +25,8 @@ export const createResolvers = async (service: Service): Promise<any> => {
         return service.getProjectById(projectId);
       },
 
-      projectsInOrganization: async (
+      projectsInOrganization: async (_: any, { organizationSlug }: {organizationSlug: string }, context: any) => {
-        _: any,
+        return service.getProjectsInOrganization(context.user, organizationSlug);
-        { organizationSlug }: { organizationSlug: string },
-        context: any,
-      ) => {
-        return service.getProjectsInOrganization(
-          context.user,
-          organizationSlug,
-        );
       },
 
       deployments: async (_: any, { projectId }: { projectId: string }) => {
@@ -43,7 +35,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       environmentVariables: async (
         _: any,
-        { projectId }: { projectId: string },
+        { projectId }: { projectId: string }
       ) => {
         return service.getEnvironmentVariablesByProjectId(projectId);
       },
@@ -52,11 +44,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
         return service.getProjectMembersByProjectId(projectId);
       },
 
-      searchProjects: async (
+      searchProjects: async (_: any, { searchText }: { searchText: string }, context: any) => {
-        _: any,
-        { searchText }: { searchText: string },
-        context: any,
-      ) => {
         return service.searchProjects(context.user, searchText);
       },
 
@@ -64,11 +52,11 @@ export const createResolvers = async (service: Service): Promise<any> => {
         _: any,
         {
           projectId,
-          filter,
+          filter
-        }: { projectId: string; filter?: FindOptionsWhere<Domain> },
+        }: { projectId: string; filter?: FindOptionsWhere<Domain> }
       ) => {
         return service.getDomainsByProjectId(projectId, filter);
-      },
+      }
     },
 
     // TODO: Return error in GQL response
@@ -76,13 +64,10 @@ export const createResolvers = async (service: Service): Promise<any> => {
       removeProjectMember: async (
         _: any,
         { projectMemberId }: { projectMemberId: string },
-        context: any,
+        context: any
       ) => {
         try {
-          return await service.removeProjectMember(
+          return await service.removeProjectMember(context.user, projectMemberId);
-            context.user,
-            projectMemberId,
-          );
         } catch (err) {
           log(err);
           return false;
@@ -93,13 +78,13 @@ export const createResolvers = async (service: Service): Promise<any> => {
         _: any,
         {
           projectMemberId,
-          data,
+          data
         }: {
           projectMemberId: string;
           data: {
             permissions: Permission[];
           };
-        },
+        }
       ) => {
         try {
           return await service.updateProjectMember(projectMemberId, data);
@@ -113,14 +98,14 @@ export const createResolvers = async (service: Service): Promise<any> => {
         _: any,
         {
           projectId,
-          data,
+          data
         }: {
           projectId: string;
           data: {
             email: string;
             permissions: Permission[];
           };
-        },
+        }
       ) => {
         try {
           return Boolean(await service.addProjectMember(projectId, data));
@@ -134,15 +119,15 @@ export const createResolvers = async (service: Service): Promise<any> => {
         _: any,
         {
           projectId,
-          data,
+          data
         }: {
           projectId: string;
           data: { environments: string[]; key: string; value: string }[];
-        },
+        }
       ) => {
         try {
           return Boolean(
-            await service.addEnvironmentVariables(projectId, data),
+            await service.addEnvironmentVariables(projectId, data)
           );
         } catch (err) {
           log(err);
@@ -154,16 +139,16 @@ export const createResolvers = async (service: Service): Promise<any> => {
         _: any,
         {
           environmentVariableId,
-          data,
+          data
         }: {
           environmentVariableId: string;
           data: DeepPartial<EnvironmentVariable>;
-        },
+        }
       ) => {
         try {
           return await service.updateEnvironmentVariable(
             environmentVariableId,
-            data,
+            data
           );
         } catch (err) {
           log(err);
@@ -173,7 +158,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       removeEnvironmentVariable: async (
         _: any,
-        { environmentVariableId }: { environmentVariableId: string },
+        { environmentVariableId }: { environmentVariableId: string }
       ) => {
         try {
           return await service.removeEnvironmentVariable(environmentVariableId);
@@ -186,45 +171,23 @@ export const createResolvers = async (service: Service): Promise<any> => {
       updateDeploymentToProd: async (
         _: any,
         { deploymentId }: { deploymentId: string },
-        context: any,
+        context: any
       ) => {
         try {
-          return Boolean(
+          return Boolean(await service.updateDeploymentToProd(context.user, deploymentId));
-            await service.updateDeploymentToProd(context.user, deploymentId),
-          );
         } catch (err) {
           log(err);
           return false;
         }
       },
 
-      addProjectFromTemplate: async (
-        _: any,
-        {
-          organizationSlug,
-          data,
-        }: { organizationSlug: string; data: AddProjectFromTemplateInput },
-        context: any,
-      ) => {
-        try {
-          return await service.addProjectFromTemplate(
-            context.user,
-            organizationSlug,
-            data,
-          );
-        } catch (err) {
-          log(err);
-          throw err;
-        }
-      },
-
       addProject: async (
         _: any,
         {
           organizationSlug,
-          data,
+          data
         }: { organizationSlug: string; data: DeepPartial<Project> },
-        context: any,
+        context: any
       ) => {
         try {
           return await service.addProject(context.user, organizationSlug, data);
@@ -236,7 +199,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       updateProject: async (
         _: any,
-        { projectId, data }: { projectId: string; data: DeepPartial<Project> },
+        { projectId, data }: { projectId: string; data: DeepPartial<Project> }
       ) => {
         try {
           return await service.updateProject(projectId, data);
@@ -249,12 +212,10 @@ export const createResolvers = async (service: Service): Promise<any> => {
       redeployToProd: async (
         _: any,
         { deploymentId }: { deploymentId: string },
-        context: any,
+        context: any
       ) => {
         try {
-          return Boolean(
+          return Boolean(await service.redeployToProd(context.user, deploymentId));
-            await service.redeployToProd(context.user, deploymentId),
-          );
         } catch (err) {
           log(err);
           return false;
@@ -283,8 +244,8 @@ export const createResolvers = async (service: Service): Promise<any> => {
         _: any,
         {
           projectId,
-          deploymentId,
+          deploymentId
-        }: { deploymentId: string; projectId: string },
+        }: { deploymentId: string; projectId: string }
       ) => {
         try {
           return await service.rollbackDeployment(projectId, deploymentId);
@@ -296,7 +257,9 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       deleteDeployment: async (
         _: any,
-        { deploymentId }: { deploymentId: string },
+        {
+          deploymentId
+        }: { deploymentId: string; }
       ) => {
         try {
           return await service.deleteDeployment(deploymentId);
@@ -308,7 +271,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       addDomain: async (
         _: any,
-        { projectId, data }: { projectId: string; data: { name: string } },
+        { projectId, data }: { projectId: string; data: { name: string } }
       ) => {
         try {
           return Boolean(await service.addDomain(projectId, data));
@@ -320,7 +283,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       updateDomain: async (
         _: any,
-        { domainId, data }: { domainId: string; data: DeepPartial<Domain> },
+        { domainId, data }: { domainId: string; data: DeepPartial<Domain> }
       ) => {
         try {
           return await service.updateDomain(domainId, data);
@@ -333,7 +296,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
       authenticateGitHub: async (
         _: any,
         { code }: { code: string },
-        context: any,
+        context: any
       ) => {
         try {
           return await service.authenticateGitHub(code, context.user);
@@ -345,14 +308,12 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       unauthenticateGitHub: async (_: any, __: object, context: any) => {
         try {
-          return service.unauthenticateGitHub(context.user, {
+          return service.unauthenticateGitHub(context.user, { gitHubToken: null });
-            gitHubToken: null,
-          });
         } catch (err) {
           log(err);
           return false;
         }
-      },
+      }
-    },
+    }
   };
 };

packages/backend/src/routes/auth.ts

@@ -5,19 +5,6 @@ import { authenticateUser, createUser } from '../turnkey-backend';
 
 const router = Router();
 
-//
-// Access Code
-//
-router.post('/accesscode', async (req, res) => {
-  console.log('Access Code', req.body);
-  const { accesscode } = req.body;
-  if (accesscode === '44444') {
-    return res.send({ isValid: true });
-  } else {
-    return res.sendStatus(204);
-  }
-});
-
 //
 // Turnkey
 //
@@ -32,7 +19,6 @@ router.get('/registration/:email', async (req, res) => {
 });
 
 router.post('/register', async (req, res) => {
-  console.log('Register', req.body);
   const { email, challenge, attestation } = req.body;
   const user = await createUser(req.app.get('service'), {
     challenge,
@@ -45,7 +31,6 @@ router.post('/register', async (req, res) => {
 });
 
 router.post('/authenticate', async (req, res) => {
-  console.log('Authenticate', req.body);
   const { signedWhoamiRequest } = req.body;
   const user = await authenticateUser(
     req.app.get('service'),

packages/backend/src/routes/staging.ts

@@ -1,9 +0,0 @@
-import { Router } from 'express';
-
-const router = Router();
-
-router.get('/version', async (req, res) => {
-  return res.send({ version: '0.0.9' });
-});
-
-export default router;

packages/backend/src/schema.gql

@@ -130,14 +130,6 @@ input AddEnvironmentVariableInput {
   value: String!
 }
 
-input AddProjectFromTemplateInput {
-  templateOwner: String!
-  templateRepo: String!
-  owner: String!
-  name: String!
-  isPrivate: Boolean!
-}
-
 input AddProjectInput {
   name: String!
   repository: String!
@@ -212,10 +204,6 @@ type Mutation {
   ): Boolean!
   removeEnvironmentVariable(environmentVariableId: String!): Boolean!
   updateDeploymentToProd(deploymentId: String!): Boolean!
-  addProjectFromTemplate(
-    organizationSlug: String!
-    data: AddProjectFromTemplateInput
-  ): Project!
   addProject(organizationSlug: String!, data: AddProjectInput): Project!
   updateProject(projectId: String!, data: UpdateProjectInput): Boolean!
   redeployToProd(deploymentId: String!): Boolean!

packages/backend/src/server.ts

@@ -17,7 +17,6 @@ import { ServerConfig } from './config';
 import { DEFAULT_GQL_PATH } from './constants';
 import githubRouter from './routes/github';
 import authRouter from './routes/auth';
-import stagingRouter from './routes/staging';
 import { Service } from './service';
 
 const log = debug('snowball:server');
@@ -110,12 +109,6 @@ export const createAndStartServer = async (
   app.set('service', service);
   app.use('/auth', authRouter);
   app.use('/api/github', githubRouter);
-  app.use('/staging', stagingRouter);
-
-  app.use((err: any, req: any, res: any, next: any) => {
-    console.error(err);
-    res.status(500).json({ error: err.message });
-  });
 
   httpServer.listen(port, host, () => {
     log(`Server is listening on ${host}:${port}${server.graphqlPath}`);

packages/backend/src/service.ts

@@ -15,13 +15,7 @@ import { Permission, ProjectMember } from './entity/ProjectMember';
 import { User } from './entity/User';
 import { Registry } from './registry';
 import { GitHubConfig, RegistryConfig } from './config';
-import {
+import { AppDeploymentRecord, AppDeploymentRemovalRecord, GitPushEventPayload, PackageJSON } from './types';
-  AddProjectFromTemplateInput,
-  AppDeploymentRecord,
-  AppDeploymentRemovalRecord,
-  GitPushEventPayload,
-  PackageJSON,
-} from './types';
 import { Role } from './entity/UserOrganization';
 
 const log = debug('snowball:service');
@@ -77,32 +71,33 @@ export class Service {
     // Fetch deployments in building state
     const deployments = await this.db.getDeployments({
       where: {
-        status: DeploymentStatus.Building,
+        status: DeploymentStatus.Building
-      },
+      }
     });
 
     if (deployments.length) {
       log(
-        `Found ${deployments.length} deployments in ${DeploymentStatus.Building} state`,
+        `Found ${deployments.length} deployments in ${DeploymentStatus.Building} state`
       );
 
       // Calculate a timestamp for one hour ago
       const anHourAgo = Date.now() - HOUR;
 
       // Filter out deployments started more than an hour ago and mark them as Error
-      const oldDeploymentsToUpdate = deployments
+      const oldDeploymentsToUpdate = deployments.filter(
-        .filter((deployment) => Number(deployment.updatedAt) < anHourAgo)
+        deployment => (Number(deployment.updatedAt) < anHourAgo)
+      )
         .map((deployment) => {
           return this.db.updateDeploymentById(deployment.id, {
             status: DeploymentStatus.Error,
-            isCurrent: false,
+            isCurrent: false
           });
         });
 
       // If there are old deployments to update, log and perform the updates
       if (oldDeploymentsToUpdate.length > 0) {
         log(
-          `Cleaning up ${oldDeploymentsToUpdate.length} deployments stuck in ${DeploymentStatus.Building} state for over an hour`,
+          `Cleaning up ${oldDeploymentsToUpdate.length} deployments stuck in ${DeploymentStatus.Building} state for over an hour`
         );
         await Promise.all(oldDeploymentsToUpdate);
       }
@@ -130,18 +125,17 @@ export class Service {
     // Fetch deployments in deleting state
     const deployments = await this.db.getDeployments({
       where: {
-        status: DeploymentStatus.Deleting,
+        status: DeploymentStatus.Deleting
-      },
+      }
     });
 
     if (deployments.length) {
       log(
-        `Found ${deployments.length} deployments in ${DeploymentStatus.Deleting} state`,
+        `Found ${deployments.length} deployments in ${DeploymentStatus.Deleting} state`
       );
 
       // Fetch ApplicationDeploymentRemovalRecords for deployments
-      const records =
+      const records = await this.registry.getDeploymentRemovalRecords(deployments);
-        await this.registry.getDeploymentRemovalRecords(deployments);
       log(`Found ${records.length} ApplicationDeploymentRemovalRecords`);
 
       // Update deployments for which ApplicationDeploymentRemovalRecords were returned
@@ -159,16 +153,16 @@ export class Service {
    * Update deployments with ApplicationDeploymentRecord data
    */
   async updateDeploymentsWithRecordData (
-    records: AppDeploymentRecord[],
+    records: AppDeploymentRecord[]
   ): Promise<void> {
     // Get deployments for ApplicationDeploymentRecords
     const deployments = await this.db.getDeployments({
       where: records.map((record) => ({
-        applicationRecordId: record.attributes.application,
+        applicationRecordId: record.attributes.application
       })),
       order: {
-        createdAt: 'DESC',
+        createdAt: 'DESC'
-      },
+      }
     });
 
     // Get project IDs of deployments that are in production environment
@@ -180,13 +174,13 @@ export class Service {
 
         return acc;
       },
-      new Set<string>(),
+      new Set<string>()
     );
 
     // Set old deployments isCurrent to false
     await this.db.updateDeploymentsByProjectIds(
       Array.from(productionDeploymentProjectIds),
-      { isCurrent: false },
+      { isCurrent: false }
     );
 
     const recordToDeploymentsMap = deployments.reduce(
@@ -194,7 +188,7 @@ export class Service {
         acc[deployment.applicationRecordId] = deployment;
         return acc;
       },
-      {},
+      {}
     );
 
     // Update deployment data for ApplicationDeploymentRecords
@@ -206,11 +200,11 @@ export class Service {
         applicationDeploymentRecordData: record.attributes,
         url: record.attributes.url,
         status: DeploymentStatus.Ready,
-        isCurrent: deployment.environment === Environment.Production,
+        isCurrent: deployment.environment === Environment.Production
       });
 
       log(
-        `Updated deployment ${deployment.id} with URL ${record.attributes.url}`,
+        `Updated deployment ${deployment.id} with URL ${record.attributes.url}`
       );
     });
 
@@ -224,23 +218,17 @@ export class Service {
     records: AppDeploymentRemovalRecord[],
     deployments: Deployment[],
   ): Promise<void> {
-    const removedApplicationDeploymentRecordIds = records.map(
+    const removedApplicationDeploymentRecordIds = records.map(record => record.attributes.deployment);
-      (record) => record.attributes.deployment,
-    );
     
     // Get removed deployments for ApplicationDeploymentRecords
-    const removedDeployments = deployments.filter((deployment) =>
+    const removedDeployments = deployments.filter(deployment => removedApplicationDeploymentRecordIds.includes(deployment.applicationDeploymentRecordId!))
-      removedApplicationDeploymentRecordIds.includes(
-        deployment.applicationDeploymentRecordId!,
-      ),
-    );
 
     const recordToDeploymentsMap = removedDeployments.reduce(
       (acc: { [key: string]: Deployment }, deployment) => {
         acc[deployment.applicationDeploymentRecordId!] = deployment;
         return acc;
       },
-      {},
+      {}
     );
 
     // Update deployment data for ApplicationDeploymentRecords and delete
@@ -253,10 +241,10 @@ export class Service {
       });
 
       log(
-        `Updated deployment ${deployment.id} with ApplicationDeploymentRemovalRecord ${record.id}`,
+        `Updated deployment ${deployment.id} with ApplicationDeploymentRemovalRecord ${record.id}`
       );
 
-      await this.db.deleteDeploymentById(deployment.id);
+      await this.db.deleteDeploymentById(deployment.id)
     });
 
     await Promise.all(deploymentUpdatePromises);
@@ -265,41 +253,41 @@ export class Service {
   async getUser (userId: string): Promise<User | null> {
     return this.db.getUser({
       where: {
-        id: userId,
+        id: userId
-      },
+      }
     });
   }
 
   async getUserByEmail(email: string): Promise<User | null> {
     return await this.db.getUser({
       where: {
-        email,
+        email
-      },
+      }
     });
   }
 
   async getUserBySubOrgId(subOrgId: string): Promise<User | null> {
     return await this.db.getUser({
       where: {
-        subOrgId,
+        subOrgId
-      },
+      }
     });
   }
 
   async getUserByEthAddress (ethAddress: string): Promise<User | null> {
     return await this.db.getUser({
       where: {
-        ethAddress,
+        ethAddress
-      },
+      }
     });
   }
 
   async createUser (params: {
-    name: string;
+    name: string
-    email: string;
+    email: string
-    subOrgId: string;
+    subOrgId: string
-    ethAddress: string;
+    ethAddress: string
-    turnkeyWalletId: string;
+    turnkeyWalletId: string
   }): Promise<User> {
     const [org] = await this.db.getOrganizations({});
     assert(org, 'No organizations exists in database');
@@ -317,7 +305,7 @@ export class Service {
     await this.db.addUserOrganization({
       member: user,
       organization: org,
-      role: Role.Owner,
+      role: Role.Owner
     });
 
     return user;
@@ -327,7 +315,7 @@ export class Service {
     const user = await this.db.getUser({ where: { id: userId } });
     assert(
       user && user.gitHubToken,
-      'User needs to be authenticated with GitHub token',
+      'User needs to be authenticated with GitHub token'
     );
 
     return new Octokit({ auth: user.gitHubToken });
@@ -343,14 +331,8 @@ export class Service {
     return dbProject;
   }
 
-  async getProjectsInOrganization(
+  async getProjectsInOrganization (user: User, organizationSlug: string): Promise<Project[]> {
-    user: User,
+    const dbProjects = await this.db.getProjectsInOrganization(user.id, organizationSlug);
-    organizationSlug: string,
-  ): Promise<Project[]> {
-    const dbProjects = await this.db.getProjectsInOrganization(
-      user.id,
-      organizationSlug,
-    );
     return dbProjects;
   }
 
@@ -360,7 +342,7 @@ export class Service {
   }
 
   async getEnvironmentVariablesByProjectId (
-    projectId: string,
+    projectId: string
   ): Promise<EnvironmentVariable[]> {
     const dbEnvironmentVariables =
       await this.db.getEnvironmentVariablesByProjectId(projectId);
@@ -368,7 +350,7 @@ export class Service {
   }
 
   async getProjectMembersByProjectId (
-    projectId: string,
+    projectId: string
   ): Promise<ProjectMember[]> {
     const dbProjectMembers =
       await this.db.getProjectMembersByProjectId(projectId);
@@ -376,16 +358,13 @@ export class Service {
   }
 
   async searchProjects (user: User, searchText: string): Promise<Project[]> {
-    const dbProjects = await this.db.getProjectsBySearchText(
+    const dbProjects = await this.db.getProjectsBySearchText(user.id, searchText);
-      user.id,
-      searchText,
-    );
     return dbProjects;
   }
 
   async getDomainsByProjectId (
     projectId: string,
-    filter?: FindOptionsWhere<Domain>,
+    filter?: FindOptionsWhere<Domain>
   ): Promise<Domain[]> {
     const dbDomains = await this.db.getDomainsByProjectId(projectId, filter);
     return dbDomains;
@@ -393,7 +372,7 @@ export class Service {
 
   async updateProjectMember (
     projectMemberId: string,
-    data: { permissions: Permission[] },
+    data: { permissions: Permission[] }
   ): Promise<boolean> {
     return this.db.updateProjectMemberById(projectMemberId, data);
   }
@@ -403,39 +382,36 @@ export class Service {
     data: {
       email: string;
       permissions: Permission[];
-    },
+    }
   ): Promise<ProjectMember> {
     // TODO: Send invitation
     let user = await this.db.getUser({
       where: {
-        email: data.email,
+        email: data.email
-      },
+      }
     });
 
     if (!user) {
       user = await this.db.addUser({
-        email: data.email,
+        email: data.email
       });
     }
 
     const newProjectMember = await this.db.addProjectMember({
       project: {
-        id: projectId,
+        id: projectId
       },
       permissions: data.permissions,
       isPending: true,
       member: {
-        id: user.id,
+        id: user.id
-      },
+      }
     });
 
     return newProjectMember;
   }
 
-  async removeProjectMember(
+  async removeProjectMember (user: User, projectMemberId: string): Promise<boolean> {
-    user: User,
-    projectMemberId: string,
-  ): Promise<boolean> {
     const member = await this.db.getProjectMemberById(projectMemberId);
 
     if (String(member.member.id) === user.id) {
@@ -454,7 +430,7 @@ export class Service {
 
   async addEnvironmentVariables (
     projectId: string,
-    data: { environments: string[]; key: string; value: string }[],
+    data: { environments: string[]; key: string; value: string }[]
   ): Promise<EnvironmentVariable[]> {
     const formattedEnvironmentVariables = data
       .map((environmentVariable) => {
@@ -464,41 +440,38 @@ export class Service {
             value: environmentVariable.value,
             environment: environment as Environment,
             project: Object.assign(new Project(), {
-              id: projectId,
+              id: projectId
-            }),
+            })
           };
         });
       })
       .flat();
 
     const savedEnvironmentVariables = await this.db.addEnvironmentVariables(
-      formattedEnvironmentVariables,
+      formattedEnvironmentVariables
     );
     return savedEnvironmentVariables;
   }
 
   async updateEnvironmentVariable (
     environmentVariableId: string,
-    data: DeepPartial<EnvironmentVariable>,
+    data: DeepPartial<EnvironmentVariable>
   ): Promise<boolean> {
     return this.db.updateEnvironmentVariable(environmentVariableId, data);
   }
 
   async removeEnvironmentVariable (
-    environmentVariableId: string,
+    environmentVariableId: string
   ): Promise<boolean> {
     return this.db.deleteEnvironmentVariable(environmentVariableId);
   }
 
-  async updateDeploymentToProd(
+  async updateDeploymentToProd (user: User, deploymentId: string): Promise<Deployment> {
-    user: User,
-    deploymentId: string,
-  ): Promise<Deployment> {
     const oldDeployment = await this.db.getDeployment({
       where: { id: deploymentId },
       relations: {
-        project: true,
+        project: true
-      },
+      }
     });
 
     if (!oldDeployment) {
@@ -507,18 +480,20 @@ export class Service {
 
     const prodBranchDomains = await this.db.getDomainsByProjectId(
       oldDeployment.project.id,
-      { branch: oldDeployment.project.prodBranch },
+      { branch: oldDeployment.project.prodBranch }
     );
 
     const octokit = await this.getOctokit(user.id);
 
-    const newDeployment = await this.createDeployment(user.id, octokit, {
+    const newDeployment = await this.createDeployment(user.id,
+      octokit,
+      {
         project: oldDeployment.project,
         branch: oldDeployment.branch,
         environment: Environment.Production,
         domain: prodBranchDomains[0],
         commitHash: oldDeployment.commitHash,
-      commitMessage: oldDeployment.commitMessage,
+        commitMessage: oldDeployment.commitMessage
       });
 
     return newDeployment;
@@ -527,11 +502,11 @@ export class Service {
   async createDeployment (
     userId: string,
     octokit: Octokit,
-    data: DeepPartial<Deployment>,
+    data: DeepPartial<Deployment>
   ): Promise<Deployment> {
     assert(data.project?.repository, 'Project repository not found');
     log(
-      `Creating deployment in project ${data.project.name} from branch ${data.branch}`,
+      `Creating deployment in project ${data.project.name} from branch ${data.branch}`
     );
     const [owner, repo] = data.project.repository.split('/');
 
@@ -539,7 +514,7 @@ export class Service {
       owner,
       repo,
       path: 'package.json',
-      ref: data.commitHash,
+      ref: data.commitHash
     });
 
     if (!packageJSONData) {
@@ -551,12 +526,10 @@ export class Service {
 
     assert(packageJSON.name, "name field doesn't exist in package.json");
 
-    const repoUrl = (
+    const repoUrl = (await octokit.rest.repos.get({
-      await octokit.rest.repos.get({
       owner,
-        repo,
+      repo
-      })
+    })).data.html_url;
-    ).data.html_url;
 
     // TODO: Set environment variables for each deployment (environment variables can`t be set in application record)
     const { applicationRecordId, applicationRecordData } =
@@ -565,20 +538,17 @@ export class Service {
         packageJSON,
         appType: data.project!.template!,
         commitHash: data.commitHash!,
-        repoUrl,
+        repoUrl
       });
 
     // Update previous deployment with prod branch domain
     // TODO: Fix unique constraint error for domain
     if (data.domain) {
-      await this.db.updateDeployment(
+      await this.db.updateDeployment({
-        {
+        domainId: data.domain.id
-          domainId: data.domain.id,
+      }, {
-        },
+        domain: null
-        {
+      });
-          domain: null,
-        },
-      );
     }
 
     const newDeployment = await this.db.addDeployment({
@@ -592,114 +562,53 @@ export class Service {
       applicationRecordData,
       domain: data.domain,
       createdBy: Object.assign(new User(), {
-        id: userId,
+        id: userId
-      }),
+      })
     });
 
-    log(
+    log(`Created deployment ${newDeployment.id} and published application record ${applicationRecordId}`);
-      `Created deployment ${newDeployment.id} and published application record ${applicationRecordId}`,
-    );
 
-    const environmentVariables =
+    const environmentVariables = await this.db.getEnvironmentVariablesByProjectId(data.project.id!, { environment: Environment.Production });
-      await this.db.getEnvironmentVariablesByProjectId(data.project.id!, {
-        environment: Environment.Production,
-      });
 
-    const environmentVariablesObj = environmentVariables.reduce(
+    const environmentVariablesObj = environmentVariables.reduce((acc, env) => {
-      (acc, env) => {
       acc[env.key] = env.value;
 
       return acc;
-      },
+    }, {} as { [key: string]: string });
-      {} as { [key: string]: string },
-    );
 
     // To set project DNS
     if (data.environment === Environment.Production) {
       // On deleting deployment later, project DNS deployment is also deleted
       // So publish project DNS deployment first so that ApplicationDeploymentRecord for the same is available when deleting deployment later
-      await this.registry.createApplicationDeploymentRequest({
+      await this.registry.createApplicationDeploymentRequest(
+        {
           deployment: newDeployment,
           appName: repo,
           repository: repoUrl,
           environmentVariables: environmentVariablesObj,
-        dns: `${newDeployment.project.name}`,
+          dns: `${newDeployment.project.name}`
         });
     }
 
-    const { applicationDeploymentRequestId, applicationDeploymentRequestData } =
+    const { applicationDeploymentRequestId, applicationDeploymentRequestData } = await this.registry.createApplicationDeploymentRequest(
-      await this.registry.createApplicationDeploymentRequest({
+      {
         deployment: newDeployment,
         appName: repo,
         repository: repoUrl,
         environmentVariables: environmentVariablesObj,
-        dns: `${newDeployment.project.name}-${newDeployment.id}`,
+        dns: `${newDeployment.project.name}-${newDeployment.id}`
       });
 
-    await this.db.updateDeploymentById(newDeployment.id, {
+    await this.db.updateDeploymentById(newDeployment.id, { applicationDeploymentRequestId, applicationDeploymentRequestData });
-      applicationDeploymentRequestId,
-      applicationDeploymentRequestData,
-    });
 
     return newDeployment;
   }
 
-  async addProjectFromTemplate(
+  async addProject (user: User, organizationSlug: string, data: DeepPartial<Project>): Promise<Project | undefined> {
-    user: User,
-    organizationSlug: string,
-    data: AddProjectFromTemplateInput,
-  ): Promise<Project | undefined> {
-    try {
-      const octokit = await this.getOctokit(user.id);
-
-      const gitRepo = await octokit?.rest.repos.createUsingTemplate({
-        template_owner: data.templateOwner,
-        template_repo: data.templateRepo,
-        owner: data.owner,
-        name: data.name,
-        include_all_branches: false,
-        private: data.isPrivate,
-      });
-
-      if (!gitRepo) {
-        throw new Error('Failed to create repository from template');
-      }
-
-      const createdTemplateRepo = await octokit.rest.repos.get({
-        owner: data.owner,
-        repo: data.name,
-      });
-
-      const prodBranch = createdTemplateRepo.data.default_branch ?? 'main';
-
-      const project = await this.addProject(user, organizationSlug, {
-        name: `${gitRepo.data.owner!.login}-${gitRepo.data.name}`,
-        prodBranch,
-        repository: gitRepo.data.full_name,
-        // TODO: Set selected template
-        template: 'webapp',
-      });
-
-      if (!project || !project.id) {
-        throw new Error('Failed to create project from template');
-      }
-
-      return project;
-    } catch (error) {
-      console.error('Error creating project from template:', error);
-      throw error;
-    }
-  }
-
-  async addProject(
-    user: User,
-    organizationSlug: string,
-    data: DeepPartial<Project>,
-  ): Promise<Project | undefined> {
     const organization = await this.db.getOrganization({
       where: {
-        slug: organizationSlug,
+        slug: organizationSlug
-      },
+      }
     });
     if (!organization) {
       throw new Error('Organization does not exist');
@@ -711,28 +620,29 @@ export class Service {
     const [owner, repo] = project.repository.split('/');
 
     const {
-      data: [latestCommit],
+      data: [latestCommit]
     } = await octokit.rest.repos.listCommits({
       owner,
       repo,
       sha: project.prodBranch,
-      per_page: 1,
+      per_page: 1
     });
 
     // Create deployment with prod branch and latest commit
-    const deployment = await this.createDeployment(user.id, octokit, {
+    await this.createDeployment(user.id,
+      octokit,
+      {
         project,
         branch: project.prodBranch,
         environment: Environment.Production,
         domain: null,
         commitHash: latestCommit.sha,
-      commitMessage: latestCommit.commit.message,
+        commitMessage: latestCommit.commit.message
-    });
+      }
+    );
 
     await this.createRepoHook(octokit, project);
 
-    console.log('projectid is', project.id);
-
     return project;
   }
 
@@ -745,11 +655,11 @@ export class Service {
         config: {
           url: new URL(
             'api/github/webhook',
-            this.config.gitHubConfig.webhookUrl,
+            this.config.gitHubConfig.webhookUrl
           ).href,
-          content_type: 'json',
+          content_type: 'json'
         },
-        events: ['push'],
+        events: ['push']
       });
     } catch (err) {
       // https://docs.github.com/en/rest/repos/webhooks?apiVersion=2022-11-28#create-a-repository-webhook--status-codes
@@ -758,7 +668,7 @@ export class Service {
           err instanceof RequestError &&
           err.status === 422 &&
           (err.response?.data as any).errors.some(
-            (err: any) => err.message === GITHUB_UNIQUE_WEBHOOK_ERROR,
+            (err: any) => err.message === GITHUB_UNIQUE_WEBHOOK_ERROR
           )
         )
       ) {
@@ -777,11 +687,9 @@ export class Service {
       return;
     }
 
-    log(
+    log(`Handling GitHub push event from repository: ${repository.full_name}, branch: ${ref}`);
-      `Handling GitHub push event from repository: ${repository.full_name}, branch: ${ref}`,
-    );
     const projects = await this.db.getProjects({
-      where: { repository: repository.full_name },
+      where: { repository: repository.full_name }
     });
 
     if (!projects.length) {
@@ -795,7 +703,7 @@ export class Service {
     for await (const project of projects) {
       const octokit = await this.getOctokit(project.ownerId);
       const [domain] = await this.db.getDomainsByProjectId(project.id, {
-        branch,
+        branch
       });
 
       // Create deployment with branch and latest commit in GitHub data
@@ -808,14 +716,14 @@ export class Service {
             : Environment.Preview,
         domain,
         commitHash: headCommit.id,
-        commitMessage: headCommit.message,
+        commitMessage: headCommit.message
       });
     }
   }
 
   async updateProject (
     projectId: string,
-    data: DeepPartial<Project>,
+    data: DeepPartial<Project>
   ): Promise<boolean> {
     return this.db.updateProjectById(projectId, data);
   }
@@ -828,13 +736,13 @@ export class Service {
   async deleteDomain (domainId: string): Promise<boolean> {
     const domainsRedirectedFrom = await this.db.getDomains({
       where: {
-        redirectToId: domainId,
+        redirectToId: domainId
-      },
+      }
     });
 
     if (domainsRedirectedFrom.length > 0) {
       throw new Error(
-        'Cannot delete domain since it has redirects from other domains',
+        'Cannot delete domain since it has redirects from other domains'
       );
     }
 
@@ -846,11 +754,11 @@ export class Service {
       relations: {
         project: true,
         domain: true,
-        createdBy: true,
+        createdBy: true
       },
       where: {
-        id: deploymentId,
+        id: deploymentId
-      },
+      }
     });
 
     if (oldDeployment === null) {
@@ -859,14 +767,16 @@ export class Service {
 
     const octokit = await this.getOctokit(user.id);
 
-    const newDeployment = await this.createDeployment(user.id, octokit, {
+    const newDeployment = await this.createDeployment(user.id,
+      octokit,
+      {
         project: oldDeployment.project,
         // TODO: Put isCurrent field in project
         branch: oldDeployment.branch,
         environment: Environment.Production,
         domain: oldDeployment.domain,
         commitHash: oldDeployment.commitHash,
-      commitMessage: oldDeployment.commitMessage,
+        commitMessage: oldDeployment.commitMessage
       });
 
     return newDeployment;
@@ -874,19 +784,19 @@ export class Service {
 
   async rollbackDeployment (
     projectId: string,
-    deploymentId: string,
+    deploymentId: string
   ): Promise<boolean> {
     // TODO: Implement transactions
     const oldCurrentDeployment = await this.db.getDeployment({
       relations: {
-        domain: true,
+        domain: true
       },
       where: {
         project: {
-          id: projectId,
+          id: projectId
-        },
-        isCurrent: true,
         },
+        isCurrent: true
+      }
     });
 
     if (!oldCurrentDeployment) {
@@ -895,12 +805,12 @@ export class Service {
 
     const oldCurrentDeploymentUpdate = await this.db.updateDeploymentById(
       oldCurrentDeployment.id,
-      { isCurrent: false, domain: null },
+      { isCurrent: false, domain: null }
     );
 
     const newCurrentDeploymentUpdate = await this.db.updateDeploymentById(
       deploymentId,
-      { isCurrent: true, domain: oldCurrentDeployment?.domain },
+      { isCurrent: true, domain: oldCurrentDeployment?.domain }
     );
 
     return newCurrentDeploymentUpdate && oldCurrentDeploymentUpdate;
@@ -909,11 +819,11 @@ export class Service {
   async deleteDeployment (deploymentId: string): Promise<boolean> {
     const deployment = await this.db.getDeployment({
       where: {
-        id: deploymentId,
+        id: deploymentId
       },
       relations: {
-        project: true,
+        project: true
-      },
+      }
     });
 
     if (deployment && deployment.applicationDeploymentRecordId) {
@@ -921,39 +831,31 @@ export class Service {
       if (deployment.isCurrent) {
         const currentDeploymentURL = `https://${deployment.project.subDomain}`;
         
-        const deploymentRecords =
+        const deploymentRecords = await this.registry.getDeploymentRecordsByFilter({
-          await this.registry.getDeploymentRecordsByFilter({
           application: deployment.applicationRecordId,
-            url: currentDeploymentURL,
+          url: currentDeploymentURL
-          });
+        })
 
         if (!deploymentRecords.length) {
-          log(
+          log(`No ApplicationDeploymentRecord found for URL ${currentDeploymentURL} and ApplicationDeploymentRecord id ${deployment.applicationDeploymentRecordId}`);
-            `No ApplicationDeploymentRecord found for URL ${currentDeploymentURL} and ApplicationDeploymentRecord id ${deployment.applicationDeploymentRecordId}`,
-          );
-
           return false;
         }
 
-        await this.registry.createApplicationDeploymentRemovalRequest({
+        await this.registry.createApplicationDeploymentRemovalRequest({ deploymentId: deploymentRecords[0].id });
-          deploymentId: deploymentRecords[0].id,
-        });
       }
 
-      const result =
+      const result = await this.registry.createApplicationDeploymentRemovalRequest({ deploymentId: deployment.applicationDeploymentRecordId });
-        await this.registry.createApplicationDeploymentRemovalRequest({
-          deploymentId: deployment.applicationDeploymentRecordId,
-        });
 
-      await this.db.updateDeploymentById(deployment.id, {
+      await this.db.updateDeploymentById(
+        deployment.id,
+        {
           status: DeploymentStatus.Deleting,
-        applicationDeploymentRemovalRequestId:
+          applicationDeploymentRemovalRequestId: result.applicationDeploymentRemovalRequestId,
-          result.applicationDeploymentRemovalRequestId,
+          applicationDeploymentRemovalRequestData: result.applicationDeploymentRemovalRequestData
-        applicationDeploymentRemovalRequestData:
+        }
-          result.applicationDeploymentRemovalRequestData,
+      );
-      });
 
-      return result !== undefined || result !== null;
+      return (result !== undefined || result !== null);
     }
 
     return false;
@@ -961,7 +863,7 @@ export class Service {
 
   async addDomain (
     projectId: string,
-    data: { name: string },
+    data: { name: string }
   ): Promise<{
     primaryDomain: Domain;
     redirectedDomain: Domain;
@@ -975,7 +877,7 @@ export class Service {
     const primaryDomainDetails = {
       ...data,
       branch: currentProject.prodBranch,
-      project: currentProject,
+      project: currentProject
     };
 
     const savedPrimaryDomain = await this.db.addDomain(primaryDomainDetails);
@@ -986,27 +888,27 @@ export class Service {
       name: domainArr.length > 1 ? domainArr[1] : `www.${domainArr[0]}`,
       branch: currentProject.prodBranch,
       project: currentProject,
-      redirectTo: savedPrimaryDomain,
+      redirectTo: savedPrimaryDomain
     };
 
     const savedRedirectedDomain = await this.db.addDomain(
-      redirectedDomainDetails,
+      redirectedDomainDetails
     );
 
     return {
       primaryDomain: savedPrimaryDomain,
-      redirectedDomain: savedRedirectedDomain,
+      redirectedDomain: savedRedirectedDomain
     };
   }
 
   async updateDomain (
     domainId: string,
-    data: DeepPartial<Domain>,
+    data: DeepPartial<Domain>
   ): Promise<boolean> {
     const domain = await this.db.getDomain({
       where: {
-        id: domainId,
+        id: domainId
-      },
+      }
     });
 
     if (domain === null) {
@@ -1014,16 +916,16 @@ export class Service {
     }
 
     const newDomain = {
-      ...data,
+      ...data
     };
 
     const domainsRedirectedFrom = await this.db.getDomains({
       where: {
         project: {
-          id: domain.projectId,
+          id: domain.projectId
-        },
-        redirectToId: domain.id,
         },
+        redirectToId: domain.id
+      }
     });
 
     // If there are domains redirecting to current domain, only branch of current domain can be updated
@@ -1034,8 +936,8 @@ export class Service {
     if (data.redirectToId) {
       const redirectedDomain = await this.db.getDomain({
         where: {
-          id: data.redirectToId,
+          id: data.redirectToId
-        },
+        }
       });
 
       if (redirectedDomain === null) {
@@ -1044,7 +946,7 @@ export class Service {
 
       if (redirectedDomain.redirectToId) {
         throw new Error(
-          'Unable to redirect to the domain because it is already redirecting elsewhere. Redirects cannot be chained.',
+          'Unable to redirect to the domain because it is already redirecting elsewhere. Redirects cannot be chained.'
         );
       }
 
@@ -1056,14 +958,9 @@ export class Service {
     return updateResult;
   }
 
-  async authenticateGitHub(
+  async authenticateGitHub (code:string, user: User): Promise<{token: string}> {
-    code: string,
+    const { authentication: { token } } = await this.oauthApp.createToken({
-    user: User,
+      code
-  ): Promise<{ token: string }> {
-    const {
-      authentication: { token },
-    } = await this.oauthApp.createToken({
-      code,
     });
 
     await this.db.updateUser(user, { gitHubToken: token });
@@ -1071,10 +968,7 @@ export class Service {
     return { token };
   }
 
-  async unauthenticateGitHub(
+  async unauthenticateGitHub (user: User, data: DeepPartial<User>): Promise<boolean> {
-    user: User,
-    data: DeepPartial<User>,
-  ): Promise<boolean> {
     return this.db.updateUser(user, data);
   }
 }

packages/backend/src/types.ts

@@ -41,7 +41,7 @@ export interface AppDeploymentRecordAttributes {
 export interface AppDeploymentRemovalRecordAttributes {
   deployment: string;
   request: string;
-  type: 'ApplicationDeploymentRemovalRecord';
+  type: "ApplicationDeploymentRemovalRecord";
   version: string;
 }
 
@@ -61,11 +61,3 @@ export interface AppDeploymentRecord extends RegistryRecord {
 export interface AppDeploymentRemovalRecord extends RegistryRecord {
   attributes: AppDeploymentRemovalRecordAttributes;
 }
-
-export interface AddProjectFromTemplateInput {
-  templateOwner: string;
-  templateRepo: string;
-  owner: string;
-  name: string;
-  isPrivate: boolean;
-}

packages/deployer/README.md

@@ -1,11 +1,9 @@
 # deployer
 
 - Install dependencies
-
   ```bash
   yarn
   ```
-
   ```bash
   brew install jq # if you do not have jq installed already
   ```
@@ -14,13 +12,13 @@
 
   - To deploy frontend app to `dashboard.staging.apps.snowballtools.com`
 
-    ```bash
+    ```
     ./deploy-frontend.staging.sh
     ```
   
   - To deploy frontend app to `dashboard.apps.snowballtools.com`
 
-    ```bash
+    ```
     ./deploy-frontend.sh
     ```
 
@@ -29,7 +27,6 @@
 ## Notes
 
 - Any config env can be updated in [records/application-deployment-request.yml](records/application-deployment-request.yml)
-
   ```yml
   record:
     ...
@@ -38,7 +35,6 @@
         LACONIC_HOSTED_CONFIG_app_server_url: https://snowballtools-base-api-001.apps.snowballtools.com
         ...
   ```
-
   - On changing `LACONIC_HOSTED_CONFIG_app_github_clientid`, the GitHub client ID and secret need to be changed in backend config too
 
 ## Troubleshoot
@@ -48,7 +44,6 @@
 
 - If deployment fails due to low bond balance
   - Check balances
-
     ```bash
     # Account balance
     yarn laconic cns account get
@@ -56,9 +51,7 @@
     # Bond balance
     yarn laconic cns bond get --id 99c0e9aec0ac1b8187faa579be3b54f93fafb6060ac1fd29170b860df605be32
     ```
-
   - Command to refill bond
-
     ```bash
     yarn laconic cns bond refill --id 99c0e9aec0ac1b8187faa579be3b54f93fafb6060ac1fd29170b860df605be32 --type aphoton --quantity 10000000
     ```

packages/deployer/config.staging.yml

@@ -3,7 +3,7 @@ services:
     restEndpoint: 'http://console.laconic.com:1317'
     gqlEndpoint: 'http://console.laconic.com:9473/api'
     userKey: 87d00f66a73e2ca428adeb49ba9164d0ad9a87edc60e33d46ad3031b9c5701fe
-    bondId: 89c75c7bc5759861d10285aff6f9e7227d6855e446b77ad5d8324822dfec7deb
+    bondId: 098c906850b87412f02200e41f449bc79e055eab77acfef32c0b22443bb46661
     chainId: laconic_9000-1
-    gas: 1200000
+    gas: 550000
     fees: 200000aphoton

packages/deployer/deploy-frontend.sh

@@ -37,9 +37,9 @@ record:
     env:
       LACONIC_HOSTED_CONFIG_server_url: https://snowballtools-base-api-001.apps.snowballtools.com
       LACONIC_HOSTED_CONFIG_github_clientid: b7c63b235ca1dd5639ab
-      LACONIC_HOSTED_CONFIG_github_templaterepo: snowball-tools/test-progressive-web-app
+      LACONIC_HOSTED_CONFIG_github_templaterepo: snowball-tools-platform/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: snowball-tools/test-progressive-web-app
+      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: snowball-tools-platform/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: snowball-tools/image-upload-pwa-example
+      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: snowball-tools-platform/image-upload-pwa-example
       LACONIC_HOSTED_CONFIG_wallet_connect_id: eda9ba18042a5ea500f358194611ece2
   meta:
     note: Added by Snowball @ $CURRENT_DATE_TIME
@@ -64,13 +64,7 @@ echo "Files generated successfully."
 RECORD_FILE=records/application-record.yml
 
 # Publish ApplicationRecord
-publish_response=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE)
+RECORD_ID=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE | jq -r '.id')
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to publish record"
-  exit $rc
-fi
-RECORD_ID=$(echo $publish_response | jq -r '.id')
 echo "ApplicationRecord published"
 echo $RECORD_ID
 
@@ -79,36 +73,15 @@ REGISTRY_APP_CRN="crn://snowballtools/applications/snowballtools-base-frontend"
 
 sleep 2
 yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN@${PACKAGE_VERSION}" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set name: $REGISTRY_APP_CRN@${PACKAGE_VERSION}"
-  exit $rc
-fi
 sleep 2
 yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN@${LATEST_HASH}" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set hash"
-  exit $rc
-fi
 sleep 2
 # Set name if latest release
 yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set release"
-  exit $rc
-fi
 echo "$REGISTRY_APP_CRN set for ApplicationRecord"
 
 # Check if record found for REGISTRY_APP_CRN
-query_response=$(yarn --silent laconic -c $CONFIG_FILE cns name resolve "$REGISTRY_APP_CRN")
+APP_RECORD=$(yarn --silent laconic -c $CONFIG_FILE cns name resolve "$REGISTRY_APP_CRN" | jq '.[0]')
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to query name"
-  exit $rc
-fi
-APP_RECORD=$(echo $query_response | jq '.[0]')
 if [ -z "$APP_RECORD" ] || [ "null" == "$APP_RECORD" ]; then
   echo "No record found for $REGISTRY_APP_CRN."
   exit 1
@@ -117,11 +90,6 @@ fi
 RECORD_FILE=records/application-deployment-request.yml
 
 sleep 2
-deployment_response=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE)
+DEPLOYMENT_REQUEST_ID=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE | jq -r '.id')
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to query deployment request"
-  exit $rc
-fi
-DEPLOYMENT_REQUEST_ID=$(echo $deployment_response | jq -r '.id')
 echo "ApplicationDeploymentRequest published"
 echo $DEPLOYMENT_REQUEST_ID

packages/deployer/deploy-frontend.staging.sh

@@ -36,16 +36,16 @@ record:
   config:
     env:
       LACONIC_HOSTED_CONFIG_server_url: https://snowballtools-base-api.staging.apps.snowballtools.com
-      LACONIC_HOSTED_CONFIG_github_clientid: Ov23liOaoahRTYd4nSCV
+      LACONIC_HOSTED_CONFIG_github_clientid: 905c09553f527d2cdff5
       LACONIC_HOSTED_CONFIG_github_templaterepo: snowball-tools/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: snowball-tools/test-progressive-web-app
+      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: snowball-tools/image-upload-pwa-example
-      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: snowball-tools/image-upload-pwa-example
+      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: snowball-tools-platform/image-upload-pwa-example
       LACONIC_HOSTED_CONFIG_wallet_connect_id: eda9ba18042a5ea500f358194611ece2
       LACONIC_HOSTED_CONFIG_lit_relay_api_key: 15DDD969-E75F-404D-AAD9-58A37C4FD354_snowball
       LACONIC_HOSTED_CONFIG_aplchemy_api_key: THvPart_gqI5x02RNYSBntlmwA66I_qc
       LACONIC_HOSTED_CONFIG_bugsnag_api_key: 8c480cd5386079f9dd44f9581264a073
-      LACONIC_HOSTED_CONFIG_passkey_wallet_rpid: dashboard.staging.apps.snowballtools.com
+      LACONIC_HOSTED_CONFIG_passkey_wallet_rpid: localhost
-      LACONIC_HOSTED_CONFIG_turnkey_api_base_url: https://api.turnkey.com
+      LACONIC_HOSTED_CONFIG_turnkey_api_base_url: https://api.turnkey.com/
       LACONIC_HOSTED_CONFIG_turnkey_organization_id: 5049ae99-5bca-40b3-8317-504384d4e591
   meta:
     note: Added by Snowball @ $CURRENT_DATE_TIME
@@ -70,13 +70,7 @@ echo "Files generated successfully."
 RECORD_FILE=staging-records/application-record.yml
 
 # Publish ApplicationRecord
-publish_response=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE)
+RECORD_ID=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE | jq -r '.id')
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to publish record"
-  exit $rc
-fi
-RECORD_ID=$(echo $publish_response | jq -r '.id')
 echo "ApplicationRecord published"
 echo $RECORD_ID
 
@@ -85,36 +79,15 @@ REGISTRY_APP_CRN="crn://staging-snowballtools/applications/staging-snowballtools
 
 sleep 2
 yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN@${PACKAGE_VERSION}" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set name: $REGISTRY_APP_CRN@${PACKAGE_VERSION}"
-  exit $rc
-fi
 sleep 2
 yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN@${LATEST_HASH}" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set hash"
-  exit $rc
-fi
 sleep 2
 # Set name if latest release
 yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set release"
-  exit $rc
-fi
 echo "$REGISTRY_APP_CRN set for ApplicationRecord"
 
 # Check if record found for REGISTRY_APP_CRN
-query_response=$(yarn --silent laconic -c $CONFIG_FILE cns name resolve "$REGISTRY_APP_CRN")
+APP_RECORD=$(yarn --silent laconic -c $CONFIG_FILE cns name resolve "$REGISTRY_APP_CRN" | jq '.[0]')
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to query name"
-  exit $rc
-fi
-APP_RECORD=$(echo $query_response | jq '.[0]')
 if [ -z "$APP_RECORD" ] || [ "null" == "$APP_RECORD" ]; then
   echo "No record found for $REGISTRY_APP_CRN."
   exit 1
@@ -123,11 +96,6 @@ fi
 RECORD_FILE=staging-records/application-deployment-request.yml
 
 sleep 2
-deployment_response=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE)
+DEPLOYMENT_REQUEST_ID=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE | jq -r '.id')
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to query deployment request"
-  exit $rc
-fi
-DEPLOYMENT_REQUEST_ID=$(echo $deployment_response | jq -r '.id')
 echo "ApplicationDeploymentRequest published"
 echo $DEPLOYMENT_REQUEST_ID

packages/deployer/records/application-deployment-request.yml

@@ -1,6 +1,6 @@
 record:
   type: ApplicationDeploymentRequest
-  version: "1.0.0"
+  version: '1.0.0'
   name: snowballtools-base-frontend@0.1.8
   application: crn://snowballtools/applications/snowballtools-base-frontend@0.1.8
   dns: dashboard
@@ -8,9 +8,9 @@ record:
     env:
       LACONIC_HOSTED_CONFIG_app_server_url: https://snowballtools-base-api-001.apps.snowballtools.com
       LACONIC_HOSTED_CONFIG_app_github_clientid: b7c63b235ca1dd5639ab
-      LACONIC_HOSTED_CONFIG_app_github_templaterepo: snowball-tools/test-progressive-web-app
+      LACONIC_HOSTED_CONFIG_app_github_templaterepo: snowball-tools-platform/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_app_github_pwa_templaterepo: snowball-tools/test-progressive-web-app
+      LACONIC_HOSTED_CONFIG_app_github_pwa_templaterepo: snowball-tools-platform/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_app_github_image_upload_templaterepo: snowball-tools/image-upload-pwa-example
+      LACONIC_HOSTED_CONFIG_app_github_image_upload_templaterepo: snowball-tools-platform/image-upload-pwa-example
       LACONIC_HOSTED_CONFIG_app_wallet_connect_id: eda9ba18042a5ea500f358194611ece2
   meta:
     note: Added by Snowball @ Thu Apr  4 14:49:41 UTC 2024

packages/deployer/staging-records/application-deployment-request.yml

@@ -7,18 +7,18 @@ record:
   config:
     env:
       LACONIC_HOSTED_CONFIG_server_url: https://snowballtools-base-api.staging.apps.snowballtools.com
-      LACONIC_HOSTED_CONFIG_github_clientid: Ov23liOaoahRTYd4nSCV
+      LACONIC_HOSTED_CONFIG_github_clientid: 905c09553f527d2cdff5
       LACONIC_HOSTED_CONFIG_github_templaterepo: snowball-tools/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: snowball-tools/test-progressive-web-app
+      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: snowball-tools/image-upload-pwa-example
-      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: snowball-tools/image-upload-pwa-example
+      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: snowball-tools-platform/image-upload-pwa-example
       LACONIC_HOSTED_CONFIG_wallet_connect_id: eda9ba18042a5ea500f358194611ece2
       LACONIC_HOSTED_CONFIG_lit_relay_api_key: 15DDD969-E75F-404D-AAD9-58A37C4FD354_snowball
       LACONIC_HOSTED_CONFIG_aplchemy_api_key: THvPart_gqI5x02RNYSBntlmwA66I_qc
       LACONIC_HOSTED_CONFIG_bugsnag_api_key: 8c480cd5386079f9dd44f9581264a073
-      LACONIC_HOSTED_CONFIG_passkey_wallet_rpid: dashboard.staging.apps.snowballtools.com
+      LACONIC_HOSTED_CONFIG_passkey_wallet_rpid: localhost
-      LACONIC_HOSTED_CONFIG_turnkey_api_base_url: https://api.turnkey.com
+      LACONIC_HOSTED_CONFIG_turnkey_api_base_url: https://api.turnkey.com/
       LACONIC_HOSTED_CONFIG_turnkey_organization_id: 5049ae99-5bca-40b3-8317-504384d4e591
   meta:
-    note: Added by Snowball @ Mon Jun 24 23:51:48 UTC 2024
+    note: Added by Snowball @ Tuesday 21 May 2024 06:17:23 AM UTC
     repository: "https://git.vdb.to/cerc-io/snowballtools-base"
-    repository_ref: 61e3e88a6c9d57e95441059369ee5a46f5c07601
+    repository_ref: 8488cfab8353321ed05c4234bf1b914c9ad3aa99

packages/deployer/staging-records/application-record.yml

@@ -1,7 +1,7 @@
 record:
   type: ApplicationRecord
-  version: 0.0.1
+  version: 0.0.2
-  repository_ref: 61e3e88a6c9d57e95441059369ee5a46f5c07601
+  repository_ref: 8488cfab8353321ed05c4234bf1b914c9ad3aa99
   repository: ["https://git.vdb.to/cerc-io/snowballtools-base"]
   app_type: webapp
   name: staging-snowballtools-base-frontend

packages/deployer/test/README.md

@@ -2,7 +2,7 @@
 
 Check if the live web app deployer is in a working state
 
-- Web app repo used: <https://github.com/snowball-tools/test-progressive-web-app> (main branch)
+- Web app repo used: https://github.com/snowball-tools-platform/test-progressive-web-app (main branch)
 - Config used: [../config.yml](../config.yml)
 - The script [test-webapp-deployment-undeployment.sh](./test-webapp-deployment-undeployment.sh) performs the following:
   - Create / update [`ApplicationRecord`](./records/application-record.yml) and [`ApplicationDeploymentRequest`](./records/application-deployment-request.yml) records with latest meta data from the repo

packages/deployer/test/records/application-deployment-request.yml

@@ -1,6 +1,6 @@
 record:
   type: ApplicationDeploymentRequest
-  version: "1.0.0"
+  version: '1.0.0'
   name: deployment-test-app@0.1.24
   application: crn://snowballtools/applications/deployment-test-app@0.1.24
   dns: deployment-ci-test
@@ -11,5 +11,5 @@ record:
       CERC_WEBAPP_DEBUG: 0
   meta:
     note: Deployment test @ Thu 11 Apr 2024 07:29:19 AM UTC
-    repository: "https://github.com/snowball-tools/test-progressive-web-app"
+    repository: "https://github.com/snowball-tools-platform/test-progressive-web-app"
     repository_ref: 05819619487a0d2dbc5453b6d1ccff3044c0dd26

packages/deployer/test/records/application-record.yml

@@ -2,7 +2,7 @@ record:
   type: ApplicationRecord
   version: 0.0.1
   repository_ref: 05819619487a0d2dbc5453b6d1ccff3044c0dd26
-  repository: ["https://github.com/snowball-tools/test-progressive-web-app"]
+  repository: ["https://github.com/snowball-tools-platform/test-progressive-web-app"]
   app_type: webapp
   name: deployment-test-app
   app_version: 0.1.24

packages/deployer/test/test-webapp-deployment-undeployment.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Repository URL
-REPO_URL="https://github.com/snowball-tools/test-progressive-web-app"
+REPO_URL="https://github.com/snowball-tools-platform/test-progressive-web-app"
 
 # Get the latest commit hash from the repository
 LATEST_HASH=$(git ls-remote $REPO_URL HEAD | awk '{print $1}')

packages/frontend/.storybook/main.ts

@@ -9,7 +9,6 @@ import { join, dirname } from 'path';
 function getAbsolutePath(value: string): any {
   return dirname(require.resolve(join(value, 'package.json')));
 }
-
 const config: StorybookConfig = {
   stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
   addons: [
@@ -27,7 +26,6 @@ const config: StorybookConfig = {
   docs: {
     autodocs: 'tag',
   },
-  staticDirs: ['../public'],
 };
 
 export default config;

packages/frontend/README.md

@@ -1,63 +1,30 @@
-# frontend
+# React + TypeScript + Vite
 
-This is a [vite](https://vitejs.dev/) [react](https://reactjs.org/) [nextjs](https://nextjs.org/) project in a [yarn workspace](https://yarnpkg.com/features/workspaces).
+This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
 
-## Getting Started
+Currently, two official plugins are available:
 
-### Install dependencies
+- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
+- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
 
-In the root of the project, run:
+## Expanding the ESLint configuration
 
-```zsh
+If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
-yarn
+
+- Configure the top-level `parserOptions` property like this:
+
+```js
+export default {
+  // other rules...
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+    project: ['./tsconfig.json', './tsconfig.node.json'],
+    tsconfigRootDir: __dirname,
+  },
+};
 ```
 
-### Build backend
+- Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked`
-
+- Optionally add `plugin:@typescript-eslint/stylistic-type-checked`
-```zsh
+- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and add `plugin:react/recommended` & `plugin:react/jsx-runtime` to the `extends` list
-yarn build --ignore frontend
-```
-
-### Environment variables
-
-#### Local
-
-Copy the `.env.example` file to `.env`:
-
-```zsh
-cp .env.example .env
-```
-
-#### Staging environment variables
-
-Change in [deployer/deploy-frontend.staging.sh](/packages/deployer/deploy-frontend.staging.sh)
-
-#### Production environment variables
-
-Change in [deployer/deploy-frontend.sh](/packages/deployer/deploy-frontend.sh)
-
-### Run development server
-
-```zsh
-yarn dev
-```
-
-## Deployment
-
-From the root of the project, run:
-
-### Staging
-
-```zsh
-cd packages/deployer && ./deploy-frontend.staging.sh
-```
-
-### Production
-
-```zsh
-cd packages/deployer && ./deploy-frontend.sh
-```
-
-### Deployment status
-
-Check the status of the deployment [here](https://webapp-deployer.apps.snowballtools.com)

packages/frontend/package.json

@@ -62,6 +62,7 @@
     "react-dom": "^18.2.0",
     "react-dropdown": "^1.11.0",
     "react-hook-form": "^7.49.0",
+    "react-hot-toast": "^2.4.1",
     "react-oauth-popup": "^1.0.5",
     "react-router-dom": "^6.20.1",
     "react-timer-hook": "^3.0.7",

packages/frontend/src/App.tsx

@@ -1,4 +1,3 @@
-import { useEffect } from 'react';
 import { createBrowserRouter, RouterProvider } from 'react-router-dom';
 
 import Projects from './pages/org-slug';
@@ -11,8 +10,8 @@ import ProjectSearchLayout from './layouts/ProjectSearch';
 import Index from './pages';
 import AuthPage from './pages/AuthPage';
 import { DashboardLayout } from './pages/org-slug/layout';
+import { useEffect } from 'react';
 import Web3Provider from 'context/Web3Provider';
-import { baseUrl } from 'utils/constants';
 
 const router = createBrowserRouter([
   {
@@ -60,7 +59,7 @@ function App() {
   // Hacky way of checking session
   // TODO: Handle redirect backs
   useEffect(() => {
-    fetch(`${baseUrl}/auth/session`, {
+    fetch(`${import.meta.env.VITE_SERVER_URL}/auth/session`, {
       credentials: 'include',
     }).then((res) => {
       if (res.status !== 200) {

packages/frontend/src/assets/templates.ts

@@ -1,21 +1,16 @@
-import {
-  VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO,
-  VITE_GITHUB_PWA_TEMPLATE_REPO,
-} from 'utils/constants';
-
 export default [
   {
     id: '1',
     name: 'Progressive Web App (PWA)',
     icon: 'pwa',
-    repoFullName: `${VITE_GITHUB_PWA_TEMPLATE_REPO}`,
+    repoFullName: `${import.meta.env.VITE_GITHUB_PWA_TEMPLATE_REPO}`,
     isComingSoon: false,
   },
   {
     id: '2',
     name: 'Image Upload PWA',
     icon: 'pwa',
-    repoFullName: `${VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO}`,
+    repoFullName: `${import.meta.env.VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO}`,
     isComingSoon: false,
   },
   {

packages/frontend/src/components/projects/ProjectSearchBar/ProjectSearchBar.tsx

@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useState } from 'react';
 import { useCombobox } from 'downshift';
 import { Project } from 'gql-client';
-import { useDebounceValue } from 'usehooks-ts';
+import { useDebounce } from 'usehooks-ts';
 
 import SearchBar from 'components/SearchBar';
 import { useGQLClient } from 'context/GQLClientContext';
@@ -42,7 +42,7 @@ export const ProjectSearchBar = ({ onChange }: ProjectSearchBarProps) => {
     },
   });
 
-  const [debouncedInputValue, _] = useDebounceValue<string>(inputValue, 300);
+  const debouncedInputValue = useDebounce<string>(inputValue, 300);
 
   const fetchProjects = useCallback(
     async (inputValue: string) => {
@@ -62,7 +62,7 @@ export const ProjectSearchBar = ({ onChange }: ProjectSearchBarProps) => {
     <div className="relative w-full lg:w-fit">
       <SearchBar {...getInputProps()} />
       <div
-        {...getMenuProps({}, { suppressRefError: true })}
+        {...getMenuProps()}
         className={cn(
           'flex flex-col shadow-dropdown rounded-xl bg-surface-card absolute w-[459px] max-h-52 overflow-y-auto px-2 py-2 gap-1 z-50',
           { hidden: !inputValue || !isOpen },

packages/frontend/src/components/projects/ProjectSearchBar/ProjectSearchBarDialog.tsx

@@ -5,7 +5,7 @@ import { CrossIcon, SearchIcon } from 'components/shared/CustomIcon';
 import { Input } from 'components/shared/Input';
 import { useGQLClient } from 'context/GQLClientContext';
 import { Project } from 'gql-client';
-import { useDebounceValue } from 'usehooks-ts';
+import { useDebounce } from 'usehooks-ts';
 import { ProjectSearchBarItem } from './ProjectSearchBarItem';
 import { ProjectSearchBarEmpty } from './ProjectSearchBarEmpty';
 import { useNavigate } from 'react-router-dom';
@@ -27,13 +27,8 @@ export const ProjectSearchBarDialog = ({
   const client = useGQLClient();
   const navigate = useNavigate();
 
-  const {
+  const { getInputProps, getItemProps, inputValue, setInputValue } =
-    getInputProps,
+    useCombobox({
-    getItemProps,
-    getMenuProps,
-    inputValue,
-    setInputValue,
-  } = useCombobox({
       items,
       itemToString(item) {
         return item ? item.name : '';
@@ -50,7 +45,7 @@ export const ProjectSearchBarDialog = ({
       },
     });
 
-  const [debouncedInputValue, _] = useDebounceValue<string>(inputValue, 300);
+  const debouncedInputValue = useDebounce<string>(inputValue, 300);
 
   const fetchProjects = useCallback(
     async (inputValue: string) => {
@@ -80,7 +75,7 @@ export const ProjectSearchBarDialog = ({
           <div className="h-full flex flex-col fixed top-0 inset-0">
             <div className="py-2.5 px-4 flex items-center justify-between border-b border-border-separator/[0.06]">
               <Input
-                {...getInputProps({}, { suppressRefError: true })}
+                {...getInputProps()}
                 leftIcon={<SearchIcon />}
                 placeholder="Search"
                 appearance="borderless"
@@ -91,33 +86,23 @@ export const ProjectSearchBarDialog = ({
               </Button>
             </div>
             {/* Content */}
-            <div
+            <div className="flex flex-col gap-1 px-2 py-2">
-              className="flex flex-col gap-1 px-2 py-2"
+              {items.length > 0
-              {...getMenuProps(
+                ? items.map((item, index) => (
-                {},
-                {
-                  suppressRefError: true,
-                },
-              )}
-            >
-              {items.length > 0 ? (
                     <>
                       <div className="px-2 py-2">
                         <p className="text-elements-mid-em text-xs font-medium">
                           Suggestions
                         </p>
                       </div>
-                  {items.map((item, index) => (
                       <ProjectSearchBarItem
                         key={item.id}
                         item={item}
                         {...getItemProps({ item, index })}
                       />
-                  ))}
                     </>
-              ) : (
+                  ))
-                inputValue && <ProjectSearchBarEmpty />
+                : inputValue && <ProjectSearchBarEmpty />}
-              )}
             </div>
           </div>
         </Dialog.Content>

packages/frontend/src/components/projects/create/ConnectAccount.tsx

@@ -14,10 +14,11 @@ import { useToast } from '../../shared/Toast';
 import { IconWithFrame } from '../../shared/IconWithFrame';
 import { Heading } from '../../shared/Heading';
 import { MockConnectGitCard } from './MockConnectGitCard';
-import { VITE_GITHUB_CLIENT_ID } from 'utils/constants';
 
 const SCOPES = 'repo user';
-const GITHUB_OAUTH_URL = `https://github.com/login/oauth/authorize?client_id=${VITE_GITHUB_CLIENT_ID}&scope=${encodeURIComponent(SCOPES)}`;
+const GITHUB_OAUTH_URL = `https://github.com/login/oauth/authorize?client_id=${
+  import.meta.env.VITE_GITHUB_CLIENT_ID
+}&scope=${encodeURIComponent(SCOPES)}`;
 
 interface ConnectAccountInterface {
   onAuth: (token: string) => void;

packages/frontend/src/components/projects/project/deployments/AssignDomainDialog.tsx

@@ -1,8 +1,13 @@
 import { CopyBlock, atomOneLight } from 'react-code-blocks';
 import { Link } from 'react-router-dom';
 
-import { Modal } from 'components/shared/Modal';
+import {
-import { Button } from 'components/shared/Button';
+  Button,
+  Dialog,
+  DialogHeader,
+  DialogBody,
+  DialogFooter,
+} from '@snowballtools/material-tailwind-react-fork';
 
 interface AssignDomainProps {
   open: boolean;
@@ -11,12 +16,11 @@ interface AssignDomainProps {
 
 const AssignDomainDialog = ({ open, handleOpen }: AssignDomainProps) => {
   return (
-    <Modal open={open} onOpenChange={handleOpen}>
+    <Dialog open={open} handler={handleOpen}>
-      <Modal.Content>
+      <DialogHeader>Assign Domain</DialogHeader>
-        <Modal.Header>Assign Domain</Modal.Header>
+      <DialogBody>
-        <Modal.Body>
+        In order to assign a domain to your production deployments, configure it
-          In order to assign a domain to your production deployments, configure
+        in the{' '}
-          it in the{' '}
         {/* TODO: Fix selection of project settings tab on navigation to domains */}
         <Link to="../settings/domains" className="text-light-blue-800 inline">
           project settings{' '}
@@ -30,12 +34,18 @@ const AssignDomainDialog = ({ open, handleOpen }: AssignDomainProps) => {
           showLineNumbers={false}
           theme={atomOneLight}
         />
-        </Modal.Body>
+      </DialogBody>
-        <Modal.Footer className="flex justify-start">
+      <DialogFooter className="flex justify-start">
-          <Button onClick={handleOpen}>Okay</Button>
+        <Button
-        </Modal.Footer>
+          className="rounded-3xl"
-      </Modal.Content>
+          variant="gradient"
-    </Modal>
+          color="blue"
+          onClick={handleOpen}
+        >
+          <span>Okay</span>
+        </Button>
+      </DialogFooter>
+    </Dialog>
   );
 };
 

packages/frontend/src/components/projects/project/deployments/DeploymentMenu.tsx

@@ -1,12 +1,5 @@
-import { useState, ComponentPropsWithRef } from 'react';
+import { useState } from 'react';
-
+import toast from 'react-hot-toast';
-import {
-  Menu,
-  MenuHandler,
-  MenuItem,
-  MenuList,
-} from '@snowballtools/material-tailwind-react-fork';
-
 import { Deployment, Domain, Environment, Project } from 'gql-client';
 import { Button } from 'components/shared/Button';
 import {
@@ -18,11 +11,17 @@ import {
   UndoIcon,
   CrossCircleIcon,
 } from 'components/shared/CustomIcon';
+import {
+  Menu,
+  MenuHandler,
+  MenuItem,
+  MenuList,
+} from '@snowballtools/material-tailwind-react-fork';
+import { ComponentPropsWithRef } from 'react';
 import AssignDomainDialog from './AssignDomainDialog';
 import { useGQLClient } from 'context/GQLClientContext';
 import { cn } from 'utils/classnames';
 import { ChangeStateToProductionDialog } from 'components/projects/Dialog/ChangeStateToProductionDialog';
-import { useToast } from 'components/shared/Toast';
 
 interface DeploymentMenuProps extends ComponentPropsWithRef<'div'> {
   deployment: Deployment;
@@ -42,7 +41,6 @@ export const DeploymentMenu = ({
   ...props
 }: DeploymentMenuProps) => {
   const client = useGQLClient();
-  const { toast, dismiss } = useToast();
 
   const [changeToProduction, setChangeToProduction] = useState(false);
   const [redeployToProduction, setRedeployToProduction] = useState(false);
@@ -53,19 +51,9 @@ export const DeploymentMenu = ({
     const isUpdated = await client.updateDeploymentToProd(deployment.id);
     if (isUpdated) {
       await onUpdate();
-      toast({
+      toast.success('Deployment changed to production');
-        id: 'deployment_changed_to_production',
-        title: 'Deployment changed to production',
-        variant: 'success',
-        onDismiss: dismiss,
-      });
     } else {
-      toast({
+      toast.error('Unable to change deployment to production');
-        id: 'deployment_not_changed_to_production',
-        title: 'Error changing deployment to production',
-        variant: 'error',
-        onDismiss: dismiss,
-      });
     }
   };
 
@@ -73,19 +61,9 @@ export const DeploymentMenu = ({
     const isRedeployed = await client.redeployToProd(deployment.id);
     if (isRedeployed) {
       await onUpdate();
-      toast({
+      toast.success('Redeployed to production');
-        id: 'redeployed_to_production',
-        title: 'Redeployed to production',
-        variant: 'success',
-        onDismiss: dismiss,
-      });
     } else {
-      toast({
+      toast.error('Unable to redeploy to production');
-        id: 'redeployed_to_production_failed',
-        title: 'Error redeploying to production',
-        variant: 'error',
-        onDismiss: dismiss,
-      });
     }
   };
 
@@ -96,19 +74,9 @@ export const DeploymentMenu = ({
     );
     if (isRollbacked) {
       await onUpdate();
-      toast({
+      toast.success('Deployment rolled back');
-        id: 'deployment_rolled_back',
-        title: 'Deployment rolled back',
-        variant: 'success',
-        onDismiss: dismiss,
-      });
     } else {
-      toast({
+      toast.error('Unable to rollback deployment');
-        id: 'deployment_rollback_failed',
-        title: 'Error rolling back deployment',
-        variant: 'error',
-        onDismiss: dismiss,
-      });
     }
   };
 
@@ -116,19 +84,9 @@ export const DeploymentMenu = ({
     const isDeleted = await client.deleteDeployment(deployment.id);
     if (isDeleted) {
       await onUpdate();
-      toast({
+      toast.success('Deleted deployment');
-        id: 'deployment_deleted',
-        title: 'Deployment deleted',
-        variant: 'success',
-        onDismiss: dismiss,
-      });
     } else {
-      toast({
+      toast.error('Unable to delete deployment');
-        id: 'deployment_not_deleted',
-        title: 'Error deleting deployment',
-        variant: 'error',
-        onDismiss: dismiss,
-      });
     }
   };
 

packages/frontend/src/components/projects/project/settings/DomainCard.tsx

@@ -2,6 +2,7 @@ import { useState } from 'react';
 import { Domain, DomainStatus, Project } from 'gql-client';
 
 import {
+  Chip,
   Typography,
   Menu,
   MenuHandler,
@@ -14,15 +15,6 @@ import EditDomainDialog from './EditDomainDialog';
 import { useGQLClient } from 'context/GQLClientContext';
 import { DeleteDomainDialog } from 'components/projects/Dialog/DeleteDomainDialog';
 import { useToast } from 'components/shared/Toast';
-import { Tag } from 'components/shared/Tag';
-import {
-  CheckIcon,
-  CrossIcon,
-  GearIcon,
-  LoadingIcon,
-} from 'components/shared/CustomIcon';
-import { Heading } from 'components/shared/Heading';
-import { Button } from 'components/shared/Button';
 
 enum RefreshStatus {
   IDLE,
@@ -87,29 +79,22 @@ const DomainCard = ({
     <>
       <div className="flex justify-between py-3">
         <div className="flex justify-start gap-1">
-          <Heading as="h6" className="flex-col">
+          <Typography variant="h6">
-            {domain.name}{' '}
+            <i>^</i> {domain.name}
-            <Tag
+          </Typography>
-              type={
+          <Chip
-                domain.status === DomainStatus.Live ? 'positive' : 'negative'
+            className="w-fit capitalize"
-              }
+            value={domain.status}
-              leftIcon={
+            color={domain.status === DomainStatus.Live ? 'green' : 'orange'}
-                domain.status === DomainStatus.Live ? (
+            variant="ghost"
-                  <CheckIcon />
+            icon={<i>^</i>}
-                ) : (
+          />
-                  <CrossIcon />
-                )
-              }
-            >
-              {domain.status}
-            </Tag>
-          </Heading>
         </div>
 
         <div className="flex justify-start gap-1">
           <i
             id="refresh"
-            className="cursor-pointer"
+            className="cursor-pointer w-8 h-8"
             onClick={() => {
               SetRefreshStatus(RefreshStatus.CHECKING);
               setTimeout(() => {
@@ -117,17 +102,11 @@ const DomainCard = ({
               }, CHECK_FAIL_TIMEOUT);
             }}
           >
-            {refreshStatus === RefreshStatus.CHECKING ? (
+            {refreshStatus === RefreshStatus.CHECKING ? 'L' : 'R'}
-              <LoadingIcon className="animate-spin" />
-            ) : (
-              'L'
-            )}
           </i>
           <Menu placement="bottom-end">
             <MenuHandler>
-              <Button iconOnly>
+              <button className="border-2 rounded-full w-8 h-8">...</button>
-                <GearIcon />
-              </Button>
             </MenuHandler>
             <MenuList>
               <MenuItem
@@ -164,13 +143,13 @@ const DomainCard = ({
       {domain.status === DomainStatus.Pending && (
         <Card className="bg-slate-100 p-4 text-sm">
           {refreshStatus === RefreshStatus.IDLE ? (
-            <Heading>
+            <Typography variant="small">
               ^ Add these records to your domain and refresh to check
-            </Heading>
+            </Typography>
           ) : refreshStatus === RefreshStatus.CHECKING ? (
-            <Heading className="text-blue-500">
+            <Typography variant="small" className="text-blue-500">
               ^ Checking records for {domain.name}
-            </Heading>
+            </Typography>
           ) : (
             <div className="flex gap-2 text-red-500 mb-2">
               <div className="grow">

packages/frontend/src/components/projects/project/settings/EditDomainDialog.tsx

@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useMemo } from 'react';
 import { Controller, useForm, SubmitHandler } from 'react-hook-form';
+import toast from 'react-hot-toast';
 import { Domain } from 'gql-client';
 
 import {
@@ -8,11 +9,10 @@ import {
   Option,
 } from '@snowballtools/material-tailwind-react-fork';
 
-import { useGQLClient } from 'context/GQLClientContext';
+import { useGQLClient } from '../../../../context/GQLClientContext';
 import { Modal } from 'components/shared/Modal';
 import { Button } from 'components/shared/Button';
 import { Input } from 'components/shared/Input';
-import { useToast } from 'components/shared/Toast';
 
 const DEFAULT_REDIRECT_OPTIONS = ['none'];
 
@@ -40,7 +40,6 @@ const EditDomainDialog = ({
   onUpdate,
 }: EditDomainDialogProp) => {
   const client = useGQLClient();
-  const { toast, dismiss } = useToast();
 
   const getRedirectUrl = (domain: Domain) => {
     const redirectDomain = domain.redirectTo;
@@ -100,20 +99,10 @@ const EditDomainDialog = ({
 
       if (updateDomain) {
         await onUpdate();
-        toast({
+        toast.success(`Domain ${domain.name} has been updated`);
-          id: 'domain_id_updated',
-          title: `Domain ${domain.name} has been updated`,
-          variant: 'success',
-          onDismiss: dismiss,
-        });
       } else {
         reset();
-        toast({
+        toast.error(`Error updating domain ${domain.name}`);
-          id: 'domain_id_error_update',
-          title: `Error updating domain ${domain.name}`,
-          variant: 'error',
-          onDismiss: dismiss,
-        });
       }
 
       handleOpen();

packages/frontend/src/components/projects/project/settings/WebhookCard.tsx

@@ -3,8 +3,6 @@ import { useState } from 'react';
 import { DeleteWebhookDialog } from 'components/projects/Dialog/DeleteWebhookDialog';
 import { Button } from 'components/shared/Button';
 import { useToast } from 'components/shared/Toast';
-import { Input } from 'components/shared/Input';
-import { CopyIcon, TrashIcon } from 'components/shared/CustomIcon';
 
 interface WebhookCardProps {
   webhookUrl: string;
@@ -16,12 +14,11 @@ const WebhookCard = ({ webhookUrl, onDelete }: WebhookCardProps) => {
 
   const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
   return (
-    <div className="flex justify-between w-full mb-3 gap-3">
+    <div className="flex justify-between w-full mb-3">
-      <Input value={webhookUrl} disabled />
+      {webhookUrl}
       <div className="flex gap-3">
         <Button
-          iconOnly
+          size="sm"
-          size="md"
           onClick={() => {
             navigator.clipboard.writeText(webhookUrl);
             toast({
@@ -32,17 +29,16 @@ const WebhookCard = ({ webhookUrl, onDelete }: WebhookCardProps) => {
             });
           }}
         >
-          <CopyIcon />
+          Copy
         </Button>
         <Button
-          iconOnly
+          size="sm"
-          size="md"
           variant="danger"
           onClick={() => {
             setDeleteDialogOpen(true);
           }}
         >
-          <TrashIcon />
+          X
         </Button>
       </div>
       <DeleteWebhookDialog

packages/frontend/src/components/shared/Sidebar/Sidebar.tsx

@@ -20,7 +20,6 @@ import { cn } from 'utils/classnames';
 import { useMediaQuery } from 'usehooks-ts';
 import { SIDEBAR_MENU } from './constants';
 import { UserSelect } from 'components/shared/UserSelect';
-import { baseUrl } from 'utils/constants';
 
 interface SidebarProps {
   mobileOpen?: boolean;
@@ -84,7 +83,7 @@ export const Sidebar = ({ mobileOpen }: SidebarProps) => {
   }, [orgSlug]);
 
   const handleLogOut = useCallback(async () => {
-    await fetch(`${baseUrl}/auth/logout`, {
+    await fetch(`${import.meta.env.VITE_SERVER_URL}/auth/logout`, {
       method: 'POST',
       credentials: 'include',
     });

packages/frontend/src/components/shared/VerifyCodeInput/VerifyCodeInput.tsx

@@ -1,117 +0,0 @@
-import { useEffect, useRef } from 'react';
-import { Input } from '../Input';
-
-export interface VerifyCodeInputProps {
-  code: string;
-  setCode: (code: string) => void;
-  submitCode: () => void;
-  loading: boolean;
-}
-
-export const VerifyCodeInput = ({
-  code,
-  setCode,
-  submitCode,
-  loading,
-}: VerifyCodeInputProps) => {
-  const inputRefs = useRef<(HTMLInputElement | null)[]>([]);
-
-  const handlePaste = (
-    e: React.ClipboardEvent<HTMLInputElement>,
-    i: number,
-  ) => {
-    e.preventDefault();
-    const pasteData = e.clipboardData.getData('text').replace(/\D/g, ''); // Only digits
-    if (pasteData.length > 0) {
-      let newCodeArray = code.split('');
-      for (let j = 0; j < pasteData.length && i + j < 6; j++) {
-        newCodeArray[i + j] = pasteData[j];
-      }
-      const newCode = newCodeArray.join('');
-      setCode(newCode);
-      const nextIndex = Math.min(i + pasteData.length, 5);
-      const nextInput = inputRefs.current[nextIndex];
-      if (nextInput) nextInput.focus();
-      if (!newCode.includes(' ')) {
-        submitCode();
-      }
-    }
-  };
-
-  const handleKeyDown = (
-    e: React.KeyboardEvent<HTMLInputElement>,
-    i: number,
-  ) => {
-    if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) return;
-
-    if (e.key === 'Backspace') {
-      e.preventDefault();
-      const isEmpty = code[i] === ' ';
-      const newCode = !isEmpty
-        ? code.slice(0, i) + ' ' + code.slice(i + 1, 6)
-        : code.slice(0, i - 1) + ' ' + code.slice(i, 6);
-
-      setCode(newCode.slice(0, 6));
-
-      if (i === 0 || !isEmpty) return;
-      const prev = inputRefs.current[i - 1];
-      if (prev) prev.focus();
-      return;
-    }
-
-    if (!e.key.match(/[0-9]/)) return;
-
-    e.preventDefault(); // Prevent the default event to avoid duplicate input
-
-    const newCode = code.slice(0, i) + e.key + code.slice(i + 1, 6);
-    setCode(newCode);
-
-    if (i === 5) {
-      submitCode();
-      return;
-    }
-
-    const next = inputRefs.current[i + 1];
-    if (next) next.focus();
-  };
-
-  const handleChange = (e: React.ChangeEvent<HTMLInputElement>, i: number) => {
-    const value = e.target.value.slice(-1);
-    if (!value.match(/[0-9]/)) return;
-
-    const newCode = code.slice(0, i) + value + code.slice(i + 1, 6);
-    setCode(newCode);
-
-    if (i < 5) {
-      const next = inputRefs.current[i + 1];
-      if (next) next.focus();
-    }
-
-    if (!newCode.includes(' ')) {
-      submitCode();
-    }
-  };
-
-  useEffect(() => {
-    if (inputRefs.current[0]) {
-      inputRefs.current[0].focus();
-    }
-  }, []);
-
-  return (
-    <div className="flex gap-2">
-      {code.split('').map((char, i) => (
-        <Input
-          key={i}
-          value={char === ' ' ? '' : char}
-          ref={(el) => (inputRefs.current[i] = el)}
-          onChange={(e) => handleChange(e, i)}
-          onPaste={(e) => handlePaste(e, i)}
-          onKeyDown={(e) => handleKeyDown(e, i)}
-          disabled={!!loading}
-          style={{ textAlign: 'center' }} // Add this line to center text
-        />
-      ))}
-    </div>
-  );
-};

packages/frontend/src/components/shared/VerifyCodeInput/index.ts

@@ -1 +0,0 @@
-export { VerifyCodeInput } from './VerifyCodeInput';

packages/frontend/src/components/shared/index.ts

@@ -1,27 +0,0 @@
-export { Avatar } from './Avatar';
-export { Badge } from './Badge';
-export { Button } from './Button';
-export { Calendar } from './Calendar';
-export { Checkbox } from './Checkbox';
-export { DatePicker } from './DatePicker';
-export { DotBorder } from './DotBorder';
-export { Heading } from './Heading';
-export { IconWithFrame } from './IconWithFrame';
-export { InlineNotification } from './InlineNotification';
-export { Input } from './Input';
-export { Modal } from './Modal';
-export { OverflownText } from './OverflownText';
-export { Radio } from './Radio';
-export { SegmentedControls } from './SegmentedControls';
-export { Select } from './Select';
-export { Sidebar } from './Sidebar';
-export { Step } from './Steps';
-export { Switch } from './Switch';
-export { Table } from './Table';
-export { Tabs } from './Tabs';
-export { Tag } from './Tag';
-export { useToast } from './Toast';
-export { Tooltip } from './Tooltip';
-export { UserSelect } from './UserSelect';
-export { VerifyCodeInput } from './VerifyCodeInput';
-export { WavyBorder } from './WavyBorder';

packages/frontend/src/context/Web3Provider.tsx

@@ -1,11 +1,9 @@
 import { ReactNode } from 'react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 
-import { VITE_WALLET_CONNECT_ID } from 'utils/constants';
-
 const queryClient = new QueryClient();
 
-if (!VITE_WALLET_CONNECT_ID) {
+if (!import.meta.env.VITE_WALLET_CONNECT_ID) {
   throw new Error('Error: REACT_APP_WALLET_CONNECT_ID env config is not set');
 }
 

packages/frontend/src/index.tsx

@@ -14,17 +14,13 @@ import { GQLClientProvider } from './context/GQLClientContext';
 import { SERVER_GQL_PATH } from './constants';
 import { Toaster } from 'components/shared/Toast';
 import { LogErrorBoundary } from 'utils/log-error';
-import { baseUrl } from 'utils/constants';
-
-// @ts-ignore
-console.log(`v-${__VERSION__}`);
 
 const root = ReactDOM.createRoot(
   document.getElementById('root') as HTMLElement,
 );
 
-assert(baseUrl, 'VITE_SERVER_URL is not set in env');
+assert(import.meta.env.VITE_SERVER_URL, 'VITE_SERVER_URL is not set in env');
-const gqlEndpoint = `${baseUrl}/${SERVER_GQL_PATH}`;
+const gqlEndpoint = `${import.meta.env.VITE_SERVER_URL}/${SERVER_GQL_PATH}`;
 
 const gqlClient = new GQLClient({ gqlEndpoint });
 

packages/frontend/src/layouts/ProjectSearch.tsx

@@ -32,7 +32,7 @@ const ProjectSearch = () => {
   return (
     <section className="h-full flex flex-col">
       {/* Header */}
-      <div className="sticky hidden lg:block top-0 border-b bg-base-bg border-border-separator/[0.06] hover:z-30">
+      <div className="sticky hidden lg:block top-0 border-b bg-base-bg border-border-separator/[0.06] z-30">
         <div className="flex pr-6 pl-2 py-2 items-center">
           <div className="flex-1">
             <ProjectSearchBar

packages/frontend/src/pages/auth/AccessCode.tsx

@@ -1,99 +0,0 @@
-import React, { useState } from 'react';
-
-import { Button } from 'components/shared/Button';
-import {
-  ArrowRightCircleFilledIcon,
-  LoaderIcon,
-} from 'components/shared/CustomIcon';
-import { WavyBorder } from 'components/shared/WavyBorder';
-import { VerifyCodeInput } from 'components/shared/VerifyCodeInput';
-import { verifyAccessCode } from 'utils/accessCode';
-
-type AccessMethod = 'accesscode' | 'passkey';
-
-type Err = { type: AccessMethod; message: string };
-
-type AccessCodeProps = {
-  onCorrectAccessCode: () => void;
-};
-
-export const AccessCode: React.FC<AccessCodeProps> = ({
-  onCorrectAccessCode,
-}) => {
-  const [accessCode, setAccessCode] = useState('     ');
-  const [error, setError] = useState<Err | null>();
-  const [accessMethod, setAccessMethod] = useState<AccessMethod | false>(false);
-
-  async function validateAccessCode() {
-    setAccessMethod('accesscode');
-    try {
-      const isValidAccessCode = await verifyAccessCode(accessCode);
-
-      // add a pause for ux
-      await new Promise((resolve) => setTimeout(resolve, 250));
-      if (isValidAccessCode) {
-        localStorage.setItem('accessCode', accessCode);
-        onCorrectAccessCode();
-      } else {
-        setError({
-          type: 'accesscode',
-          message: 'Invalid access code',
-        });
-      }
-    } catch (err: any) {
-      setError({ type: 'accesscode', message: err.message });
-    }
-  }
-
-  const loading = accessMethod;
-  const isValidAccessCodeLength = accessCode.trim().length === 5;
-
-  return (
-    <div>
-      <div className="self-stretch p-3 xs:p-6 flex-col justify-center items-center gap-5 flex">
-        <div className="self-stretch text-center text-sky-950 text-2xl font-medium font-display leading-tight">
-          Access Code
-        </div>
-      </div>
-      <WavyBorder className="self-stretch" variant="stroke" />
-      <div className="self-stretch p-4 xs:p-6 flex-col justify-center items-center gap-8 flex">
-        <div className="self-stretch flex-col gap-8 flex">
-          <div className="flex-col justify-start items-start gap-2 inline-flex">
-            <VerifyCodeInput
-              loading={!!loading}
-              code={accessCode}
-              setCode={setAccessCode}
-              submitCode={validateAccessCode}
-            />
-          </div>
-          <Button
-            rightIcon={
-              loading && loading === 'accesscode' ? (
-                <LoaderIcon className="animate-spin" />
-              ) : (
-                <ArrowRightCircleFilledIcon height="16" />
-              )
-            }
-            onClick={validateAccessCode}
-            variant={'secondary'}
-            disabled={!accessCode || !isValidAccessCodeLength || !!loading}
-          >
-            Submit
-          </Button>
-          {error && error.type === 'accesscode' && (
-            <div className="flex flex-col gap-3">
-              <div className="justify-center items-center gap-2 inline-flex">
-                <div className="text-red-500 text-sm">
-                  Error: {error.message}.{' '}
-                  <a href="/signup" className="underline">
-                    Try again?
-                  </a>
-                </div>
-              </div>
-            </div>
-          )}
-        </div>
-      </div>
-    </div>
-  );
-};

packages/frontend/src/pages/auth/AccessSignUp.tsx

@@ -1,20 +0,0 @@
-import React, { useState } from 'react';
-
-import { AccessCode } from './AccessCode';
-import { SignUp } from './SignUp';
-
-type AccessSignUpProps = {
-  onDone: () => void;
-};
-
-export const AccessSignUp: React.FC<AccessSignUpProps> = ({ onDone }) => {
-  const [isValidAccessCode, setIsValidAccessCode] = useState<boolean>(
-    !!localStorage.getItem('accessCode'),
-  );
-
-  return isValidAccessCode ? (
-    <SignUp onDone={onDone} />
-  ) : (
-    <AccessCode onCorrectAccessCode={() => setIsValidAccessCode(true)} />
-  );
-};

packages/frontend/src/pages/auth/Login.tsx

@@ -47,9 +47,7 @@ export const Login = ({ onDone }: Props) => {
       console.log('Handling google redirect back');
       try {
         await google.handleOAuthRedirectBack();
-        // @ts-ignore
         wallet = await google.getEthersWallet();
-        // @ts-ignore
         const result = await signInWithEthereum(1, 'login', wallet);
         if (result.error) {
           setError(result.error);

packages/frontend/src/pages/auth/SignUp.tsx

@@ -21,7 +21,6 @@ import {
   turnkeySignin,
   turnkeySignup,
 } from 'utils/turnkey-frontend';
-import { verifyAccessCode } from 'utils/accessCode';
 
 type Provider = 'google' | 'github' | 'apple' | 'email';
 
@@ -46,9 +45,7 @@ export const SignUp = ({ onDone }: Props) => {
       setProvider('google');
       try {
         await google.handleOAuthRedirectBack();
-        // @ts-ignore
         wallet = await google.getEthersWallet();
-        // @ts-ignore
         const result = await signInWithEthereum(1, 'signup', wallet);
         if (result.error) {
           setError({ type: 'provider', message: result.error });
@@ -112,29 +109,6 @@ export const SignUp = ({ onDone }: Props) => {
   const loading = provider;
   const emailValid = /.@./.test(email);
 
-  useEffect(() => {
-    const validateAccessCode = async () => {
-      const accessCode = localStorage.getItem('accessCode');
-      if (!accessCode) {
-        redirectToSignup();
-        return;
-      }
-
-      try {
-        await verifyAccessCode(accessCode);
-      } catch (err: any) {
-        redirectToSignup();
-      }
-    };
-
-    const redirectToSignup = () => {
-      localStorage.removeItem('accessCode');
-      window.location.href = '/signup';
-    };
-
-    validateAccessCode();
-  }, []);
-
   return (
     <div>
       <div className="self-stretch p-3 xs:p-6 flex-col justify-center items-center gap-5 flex">

packages/frontend/src/pages/auth/SnowballAuth.tsx

@@ -1,15 +1,14 @@
-import React, { useEffect, useState } from 'react';
-
 import { snowball } from 'utils/use-snowball';
 import { Login } from './Login';
+import { SignUp } from './SignUp';
+import { useEffect, useState } from 'react';
 import { Done } from './Done';
-import { AccessSignUp } from './AccessSignUp';
 
 type Screen = 'login' | 'signup' | 'success';
 
 const DASHBOARD_URL = '/';
 
-export const SnowballAuth: React.FC = () => {
+export const SnowballAuth = () => {
   const path = window.location.pathname;
   const [screen, setScreen] = useState<Screen>(
     path === '/login' ? 'login' : 'signup',
@@ -31,7 +30,7 @@ export const SnowballAuth: React.FC = () => {
 
   if (screen === 'signup') {
     return (
-      <AccessSignUp
+      <SignUp
         onDone={() => {
           setScreen('success');
         }}

packages/frontend/src/pages/org-slug/Settings.tsx

@@ -1,19 +1,5 @@
-import { Heading } from 'components/shared/Heading';
-
 const Settings = () => {
-  return (
+  return <div className="p-5">Settings page</div>;
-    <section className="px-4 md:px-6 py-6 flex flex-col gap-6">
-      {/* Header */}
-      <div className="flex items-center">
-        <div className="grow">
-          <div className="flex gap-4 items-center">
-            <Heading as="h2" className="text-[24px]">
-              Settings
-            </Heading>
-          </div>
-        </div>
-      </div>
-    </section>
-  );
 };
+
 export default Settings;

packages/frontend/src/pages/org-slug/index.tsx

@@ -1,11 +1,13 @@
 import { useCallback, useEffect, useState } from 'react';
 import { Link, useParams } from 'react-router-dom';
-
-import { ProjectCard } from 'components/projects/ProjectCard';
-import { Heading, Badge, Button } from 'components/shared';
-import { PlusIcon } from 'components/shared/CustomIcon';
-import { useGQLClient } from 'context/GQLClientContext';
 import { Project } from 'gql-client';
+import { Button } from 'components/shared/Button';
+
+import { PlusIcon } from 'components/shared/CustomIcon';
+import { ProjectCard } from 'components/projects/ProjectCard';
+import { Heading } from 'components/shared/Heading';
+import { Badge } from 'components/shared/Badge';
+import { useGQLClient } from 'context/GQLClientContext';
 
 const Projects = () => {
   const client = useGQLClient();

packages/frontend/src/pages/org-slug/projects/create/success/Id.tsx

@@ -11,37 +11,14 @@ import {
 import { Heading } from 'components/shared/Heading';
 
 import logoAnimation from 'components/../../public/lottie/logo.json';
-import { useGQLClient } from 'context/GQLClientContext';
-import { Project } from 'gql-client';
-import { useEffect, useState } from 'react';
 
 const Id = () => {
   const { id, orgSlug } = useParams();
-  const client = useGQLClient();
-  const [project, setProject] = useState<Project | null>(null);
 
-  const handleSetupDomain = async () => {
+  const handleSetupDomain = () => {
-    if (id) {
+    //TODO: Implement this
-      // console.log('id', id);
-      // console.log('getting project for id', id);
-      const project = await client.getProject(id);
-      // console.log('project found:', project);
-      if (project && project.project) {
-        // console.log('project:', project.project);
-        setProject(project.project);
-      }
-    } else {
-      window.location.href = '/';
-    }
   };
-
-  useEffect(() => {
-    handleSetupDomain();
-  });
-
   return (
-    <>
-      {project ? (
     <div className="flex flex-col gap-8 lg:gap-11 max-w-[522px] mx-auto py-6 lg:py-12">
       {/* Icon */}
       <div className="flex justify-center">
@@ -58,13 +35,14 @@ const Id = () => {
           <Button
             className="no-underline text-elements-link"
             // TODO: use dynamic value
-                href={project ? `https://${project.subDomain}` : ''}
+            href="https://www.iglootools.snowballtools.xyz"
             as="a"
             variant="link-emphasized"
             external
             leftIcon={<LinkChainIcon />}
           >
-                {project.subDomain}
+            {/* // TODO: use dynamic value */}
+            www.iglootools.snowballtools.xyz
           </Button>
         </p>
       </div>
@@ -95,11 +73,7 @@ const Id = () => {
                   custom domain.
                 </p>
               </div>
-                  <Button
+              <Button onClick={handleSetupDomain} variant="tertiary" size="sm">
-                    onClick={handleSetupDomain}
-                    variant="tertiary"
-                    size="sm"
-                  >
                 Setup domain
               </Button>
             </div>
@@ -129,10 +103,6 @@ const Id = () => {
         </div>
       </div>
     </div>
-      ) : (
-        <></>
-      )}
-    </>
   );
 };
 

packages/frontend/src/pages/org-slug/projects/create/template/index.tsx

@@ -11,10 +11,7 @@ import { Template } from '../../../../../types/types';
 import { Heading } from 'components/shared/Heading';
 import { Input } from 'components/shared/Input';
 import { Select, SelectOption } from 'components/shared/Select';
-import {
+import { ArrowRightCircleFilledIcon } from 'components/shared/CustomIcon';
-  ArrowRightCircleFilledIcon,
-  LoadingIcon,
-} from 'components/shared/CustomIcon';
 import { Checkbox } from 'components/shared/Checkbox';
 import { Button } from 'components/shared/Button';
 import { useToast } from 'components/shared/Toast';
@@ -53,22 +50,36 @@ const CreateRepo = () => {
         assert(template.repoFullName, 'Template URL not provided');
         const [owner, repo] = template.repoFullName.split('/');
 
-        setIsLoading(true);
+        // TODO: Handle this functionality in backend
-
+        const gitRepo = await octokit?.rest.repos.createUsingTemplate({
-        const { addProjectFromTemplate } = await client.addProjectFromTemplate(
+          template_owner: owner,
-          orgSlug!,
+          template_repo: repo,
-          {
-            templateOwner: owner,
-            templateRepo: repo,
           owner: data.account,
           name: data.repoName,
-            isPrivate: false,
+          include_all_branches: false,
-          },
+          private: data.isPrivate,
-        );
+        });
 
-        navigate(
+        if (!gitRepo) {
-          `deploy?projectId=${addProjectFromTemplate.id}&templateId=${template.id}`,
+          return;
-        );
+        }
+
+        // Refetch to always get correct default branch
+        const templateRepo = await octokit.rest.repos.get({
+          owner: template.repoFullName.split('/')[0],
+          repo: template.repoFullName.split('/')[1],
+        });
+        const prodBranch = templateRepo.data.default_branch ?? 'main';
+
+        const { addProject } = await client.addProject(orgSlug!, {
+          name: `${gitRepo.data.owner!.login}-${gitRepo.data.name}`,
+          prodBranch,
+          repository: gitRepo.data.full_name,
+          // TODO: Set selected template
+          template: 'webapp',
+        });
+
+        navigate(`deploy?projectId=${addProject.id}&templateId=${template.id}`);
       } catch (err) {
         setIsLoading(false);
 
@@ -195,13 +206,7 @@ const CreateRepo = () => {
             {...buttonSize}
             type="submit"
             disabled={!Boolean(template.repoFullName) || isLoading}
-            rightIcon={
+            rightIcon={<ArrowRightCircleFilledIcon />}
-              isLoading ? (
-                <LoadingIcon className="animate-spin" />
-              ) : (
-                <ArrowRightCircleFilledIcon />
-              )
-            }
           >
             Deploy
           </Button>

packages/frontend/src/pages/org-slug/projects/id/Overview.tsx

@@ -1,11 +1,14 @@
 import { useEffect, useState } from 'react';
+import { Domain, DomainStatus } from 'gql-client';
 import { Link, useNavigate, useOutletContext } from 'react-router-dom';
 import { RequestError } from 'octokit';
 
-import { useOctokit } from 'context/OctokitContext';
+import { useOctokit } from '../../../../context/OctokitContext';
 import { GitCommitWithBranch, OutletContextType } from '../../../../types';
-import { useGQLClient } from 'context/GQLClientContext';
+import { useGQLClient } from '../../../../context/GQLClientContext';
-import { Button, Heading, Avatar, Tag } from 'components/shared';
+import { Button } from 'components/shared/Button';
+import { Heading } from 'components/shared/Heading';
+import { Avatar } from 'components/shared/Avatar';
 import { getInitials } from 'utils/geInitials';
 import {
   BranchStrokeIcon,
@@ -15,12 +18,12 @@ import {
   GithubStrokeIcon,
   GlobeIcon,
   LinkIcon,
-  CalendarDaysIcon,
 } from 'components/shared/CustomIcon';
+import { Tag } from 'components/shared/Tag';
 import { Activity } from 'components/projects/project/overview/Activity';
 import { OverviewInfo } from 'components/projects/project/overview/OverviewInfo';
+import { CalendarDaysIcon } from 'components/shared/CustomIcon/CalendarDaysIcon';
 import { relativeTimeMs } from 'utils/time';
-import { Domain, DomainStatus } from 'gql-client';
 
 const COMMITS_PER_PAGE = 4;
 
@@ -128,12 +131,9 @@ const OverviewTabPanel = () => {
             <Heading className="text-lg leading-6 font-medium truncate">
               {project.name}
             </Heading>
-            <a
+            <p className="text-sm text-elements-low-em tracking-tight truncate">
-              href={`https://${project.subDomain}`}
-              className="text-sm text-elements-low-em tracking-tight truncate"
-            >
               {project.subDomain}
-            </a>
+            </p>
           </div>
         </div>
         <OverviewInfo label="Domain" icon={<GlobeIcon />}>

packages/frontend/src/pages/org-slug/projects/id/settings/EnvironmentVariables.tsx

@@ -1,12 +1,14 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';
+import toast from 'react-hot-toast';
 import { useParams } from 'react-router-dom';
+import { Environment, EnvironmentVariable } from 'gql-client';
 
 import { Collapse } from '@snowballtools/material-tailwind-react-fork';
 
 import AddEnvironmentVariableRow from 'components/projects/project/settings/AddEnvironmentVariableRow';
 import DisplayEnvironmentVariables from 'components/projects/project/settings/DisplayEnvironmentVariables';
-import { useGQLClient } from 'context/GQLClientContext';
+import { useGQLClient } from '../../../../../context/GQLClientContext';
 import { EnvironmentVariablesFormValues } from '../../../../../types';
 import HorizontalLine from 'components/HorizontalLine';
 import { Heading } from 'components/shared/Heading';
@@ -15,13 +17,10 @@ import { Checkbox } from 'components/shared/Checkbox';
 import { PlusIcon } from 'components/shared/CustomIcon';
 import { InlineNotification } from 'components/shared/InlineNotification';
 import { ProjectSettingContainer } from 'components/projects/project/settings/ProjectSettingContainer';
-import { useToast } from 'components/shared/Toast';
-import { Environment, EnvironmentVariable } from 'gql-client';
 
 export const EnvironmentVariablesTabPanel = () => {
   const { id } = useParams();
   const client = useGQLClient();
-  const { toast, dismiss } = useToast();
 
   const [environmentVariables, setEnvironmentVariables] = useState<
     EnvironmentVariable[]
@@ -119,25 +118,13 @@ export const EnvironmentVariablesTabPanel = () => {
 
         fetchEnvironmentVariables(id);
 
-        toast({
+        toast.success(
-          id:
-            createFormData.variables.length > 1
-              ? 'env_variable_added'
-              : 'env_variables_added',
-          title:
           createFormData.variables.length > 1
             ? `${createFormData.variables.length} variables added`
             : `Variable added`,
-          variant: 'success',
+        );
-          onDismiss: dismiss,
-        });
       } else {
-        toast({
+        toast.error('Environment variables not added');
-          id: 'env_variables_not_added',
-          title: 'Environment variables not added',
-          variant: 'error',
-          onDismiss: dismiss,
-        });
       }
     },
     [id, client],

packages/frontend/src/pages/org-slug/projects/id/settings/domains/add/Config.tsx

@@ -1,12 +1,12 @@
+import toast from 'react-hot-toast';
 import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
 
-import { useGQLClient } from 'context/GQLClientContext';
+import { useGQLClient } from '../../../../../../../context/GQLClientContext';
 import { Table } from 'components/shared/Table';
 import { Button } from 'components/shared/Button';
 import { InlineNotification } from 'components/shared/InlineNotification';
 import { ArrowRightCircleIcon } from 'components/shared/CustomIcon';
 import { ProjectSettingContainer } from 'components/projects/project/settings/ProjectSettingContainer';
-import { useToast } from 'components/shared/Toast';
 
 const Config = () => {
   const { id, orgSlug } = useParams();
@@ -14,26 +14,15 @@ const Config = () => {
   const navigate = useNavigate();
   const [searchParams] = useSearchParams();
   const primaryDomainName = searchParams.get('name');
-  const { toast, dismiss } = useToast();
 
   const handleSubmitDomain = async () => {
     if (primaryDomainName === null) {
-      toast({
+      toast.error('Cannot resolve domain name');
-        id: 'unresolvable_domain_name',
-        title: 'Cannot resolve domain name',
-        variant: 'error',
-        onDismiss: dismiss,
-      });
       return;
     }
 
     if (id === undefined) {
-      toast({
+      toast.error('Cannot find project');
-        id: 'domain_cannot_find_project',
-        title: 'Cannot find project',
-        variant: 'error',
-        onDismiss: dismiss,
-      });
       return;
     }
 
@@ -42,20 +31,10 @@ const Config = () => {
     });
 
     if (isAdded) {
-      toast({
+      toast.success('Domain added successfully');
-        id: 'domain_added_successfully',
-        title: 'Domain added successfully',
-        variant: 'success',
-        onDismiss: dismiss,
-      });
       navigate(`/${orgSlug}/projects/${id}/settings/domains`);
     } else {
-      toast({
+      toast.error('Error adding domain');
-        id: 'generic_error_adding_domain',
-        title: 'Error adding domaint',
-        variant: 'error',
-        onDismiss: dismiss,
-      });
     }
   };
 

packages/frontend/src/stories/Components/Icons/ChevronDownSmallIcon.stories.tsx

@@ -6,13 +6,9 @@ const meta: Meta<typeof ChevronDownSmallIcon> = {
   title: 'Icons/ChevronDownSmallIcon',
   component: ChevronDownSmallIcon,
   tags: ['autodocs'],
-  argTypes: {
+  args: {
-    size: {
+    size: 'string | number' as unknown as any,
-      control: 'text',
+    name: 'string',
-    },
-    name: {
-      control: 'text',
-    },
   },
 };
 

packages/frontend/src/stories/Components/Icons/ChevronRight.stories.tsx

@@ -6,13 +6,9 @@ const meta: Meta<typeof ChevronRight> = {
   title: 'Icons/ChevronRight',
   component: ChevronRight,
   tags: ['autodocs'],
-  argTypes: {
+  args: {
-    size: {
+    size: 'string | number' as unknown as any,
-      control: 'text',
+    name: 'string',
-    },
-    name: {
-      control: 'text',
-    },
   },
 };
 

packages/frontend/src/stories/Components/Icons/ChevronUpDown.stories.tsx

@@ -6,13 +6,9 @@ const meta: Meta<typeof ChevronUpDown> = {
   title: 'Icons/ChevronUpDown',
   component: ChevronUpDown,
   tags: ['autodocs'],
-  argTypes: {
+  args: {
-    size: {
+    size: 'string | number' as unknown as any,
-      control: 'text',
+    name: 'string',
-    },
-    name: {
-      control: 'text',
-    },
   },
 };
 

packages/frontend/src/stories/Components/Icons/ChevronUpSmallIcon.stories.tsx

@@ -3,16 +3,12 @@ import { Meta, StoryObj } from '@storybook/react';
 import { ChevronUpSmallIcon } from 'components/shared/CustomIcon';
 
 const meta: Meta<typeof ChevronUpSmallIcon> = {
-  title: 'Icons/ChevronUpSmallIcon',
+  title: 'Components/ChevronUpSmallIcon',
   component: ChevronUpSmallIcon,
   tags: ['autodocs'],
-  argTypes: {
+  args: {
-    size: {
+    size: 'string | number' as unknown as any,
-      control: 'text',
+    name: 'string',
-    },
-    name: {
-      control: 'text',
-    },
   },
 };
 

packages/frontend/src/stories/Components/Icons/CollaboratorsIcon.stories.tsx

@@ -3,7 +3,7 @@ import { Meta, StoryObj } from '@storybook/react';
 import { CollaboratorsIcon } from 'components/shared/CustomIcon';
 
 const meta: Meta<typeof CollaboratorsIcon> = {
-  title: 'Icons/CollaboratorsIcon',
+  title: 'Components/CollaboratorsIcon',
   component: CollaboratorsIcon,
   tags: ['autodocs'],
   argTypes: {

packages/frontend/src/stories/Components/ProjectSearchBar.stories.tsx

@@ -1,20 +0,0 @@
-import { StoryObj, Meta } from '@storybook/react';
-
-import { ProjectSearchBar } from 'components/projects/ProjectSearchBar';
-
-const meta: Meta<typeof ProjectSearchBar> = {
-  title: 'Components/ProjectSearchBar',
-  component: ProjectSearchBar,
-  tags: ['autodocs'],
-  argTypes: {
-    onChange: {
-      action: 'change',
-    },
-  },
-};
-
-export default meta;
-
-type Story = StoryObj<typeof ProjectSearchBar>;
-
-export const Default: Story = {};

packages/frontend/src/stories/MockStoriesData.ts

@@ -11,7 +11,6 @@ import {
   DomainStatus,
   Domain,
   Environment,
-  Permission,
 } from 'gql-client';
 
 export const user: User = {
@@ -45,7 +44,7 @@ export const organization: Organization = {
 export const member: ProjectMember = {
   id: '1',
   member: user,
-  permissions: [Permission.Edit],
+  permissions: [],
   isPending: false,
   createdAt: '2021-08-01T00:00:00.000Z',
   updatedAt: '2021-08-01T00:00:00.000Z',
@@ -71,7 +70,7 @@ export const environmentVariable1: EnvironmentVariable = {
 
 export const domain0: Domain = {
   id: '1',
-  name: 'domain.com',
+  name: 'Domain',
   createdAt: '2021-08-01T00:00:00.000Z',
   updatedAt: '2021-08-01T00:00:00.000Z',
   branch: 'Branch',
@@ -79,16 +78,6 @@ export const domain0: Domain = {
   redirectTo: null,
 };
 
-export const domain1: Domain = {
-  id: '2',
-  name: 'www.domain.com',
-  createdAt: '2021-08-01T00:00:00.000Z',
-  updatedAt: '2021-08-01T00:00:00.000Z',
-  branch: 'Branch',
-  status: DomainStatus.Live,
-  redirectTo: domain0,
-};
-
 export const deployment0: Deployment = {
   id: '1',
   url: 'https://deployment.com',

packages/frontend/src/stories/Project/Settings/DomainCard.stories.tsx

@@ -1,48 +0,0 @@
-import { StoryObj, Meta } from '@storybook/react';
-
-import DomainCard from 'components/projects/project/settings/DomainCard';
-import { domain0, domain1, project } from '../../MockStoriesData';
-
-const meta: Meta<typeof DomainCard> = {
-  title: 'Project/Settings/DomainCard',
-  component: DomainCard,
-  tags: ['autodocs'],
-  argTypes: {
-    domains: {
-      control: {
-        type: 'object',
-      },
-    },
-    domain: {
-      control: {
-        type: 'object',
-      },
-    },
-    branches: {
-      control: {
-        type: 'object',
-      },
-    },
-    project: {
-      control: {
-        type: 'object',
-      },
-    },
-    onUpdate: {
-      action: 'update',
-    },
-  },
-};
-
-export default meta;
-
-type Story = StoryObj<typeof DomainCard>;
-
-export const Default: Story = {
-  args: {
-    domains: [domain0, domain1],
-    domain: domain0,
-    branches: ['main'],
-    project: project,
-  },
-};

packages/frontend/src/stories/Project/Settings/EditDomainDialog.stories.tsx

@@ -1,43 +0,0 @@
-import { StoryObj, Meta } from '@storybook/react';
-
-import EditDomainDialog from 'components/projects/project/settings/EditDomainDialog';
-
-const meta: Meta<typeof EditDomainDialog> = {
-  title: 'Components/EditDomainDialog',
-  component: EditDomainDialog,
-  tags: ['autodocs'],
-  argTypes: {
-    domains: {
-      control: {
-        type: 'object',
-      },
-    },
-    open: {
-      control: {
-        type: 'boolean',
-      },
-    },
-    handleOpen: {
-      action: 'open',
-    },
-    domain: {
-      control: {
-        type: 'object',
-      },
-    },
-    branches: {
-      control: {
-        type: 'object',
-      },
-    },
-    onUpdate: {
-      action: 'update',
-    },
-  },
-};
-
-export default meta;
-
-type Story = StoryObj<typeof EditDomainDialog>;
-
-export const Default: Story = {};

packages/frontend/src/stories/Project/Settings/WebhookCard.stories.tsx

@@ -1,29 +0,0 @@
-import { Meta, StoryObj } from '@storybook/react';
-
-import WebhookCard from 'components/projects/project/settings/WebhookCard';
-
-const meta: Meta<typeof WebhookCard> = {
-  title: 'Project/Settings/WebhookCard',
-  component: WebhookCard,
-  tags: ['autodocs'],
-  argTypes: {
-    webhookUrl: {
-      control: {
-        type: 'text',
-      },
-    },
-    onDelete: {
-      action: 'delete',
-    },
-  },
-};
-
-export default meta;
-
-type Story = StoryObj<typeof WebhookCard>;
-
-export const Default: Story = {
-  args: {
-    webhookUrl: 'https://api.retool.com',
-  },
-};

packages/frontend/src/utils/accessCode.ts

@@ -1,28 +0,0 @@
-import { baseUrl } from './constants';
-
-export async function verifyAccessCode(
-  accesscode: string,
-): Promise<boolean | null> {
-  const res = await fetch(`${baseUrl}/auth/accesscode`, {
-    method: 'POST',
-    body: JSON.stringify({
-      accesscode,
-    }),
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    credentials: 'include',
-  });
-  // If API returns a non-empty 200, this is a valid access code.
-  if (res.status == 200) {
-    const isValid = (await res.json()).isValid as boolean;
-    console.log('isValid', isValid);
-    return isValid;
-  } else if (res.status === 204) {
-    return null;
-  } else {
-    throw new Error(
-      `Unexpected response from access code endpoint: ${res.status}: ${await res.text()}`,
-    );
-  }
-}

packages/frontend/src/utils/constants.ts

@@ -1,11 +0,0 @@
-export const baseUrl = import.meta.env.VITE_SERVER_URL;
-export const PASSKEY_WALLET_RPID = import.meta.env.VITE_PASSKEY_WALLET_RPID!;
-export const TURNKEY_BASE_URL = import.meta.env.VITE_TURNKEY_API_BASE_URL!;
-export const VITE_GITHUB_PWA_TEMPLATE_REPO = import.meta.env
-  .VITE_GITHUB_PWA_TEMPLATE_REPO;
-export const VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO = import.meta.env
-  .VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO;
-export const VITE_GITHUB_CLIENT_ID = import.meta.env.VITE_GITHUB_CLIENT_ID;
-export const VITE_WALLET_CONNECT_ID = import.meta.env.VITE_WALLET_CONNECT_ID;
-export const VITE_BUGSNAG_API_KEY = import.meta.env.VITE_BUGSNAG_API_KEY;
-export const VITE_LIT_RELAY_API_KEY = import.meta.env.VITE_LIT_RELAY_API_KEY;

packages/frontend/src/utils/log-error.ts

@@ -1,21 +1,21 @@
-import React from 'react';
 import Bugsnag from '@bugsnag/js';
 import BugsnagPluginReact from '@bugsnag/plugin-react';
 import BugsnagPerformance from '@bugsnag/browser-performance';
+import React from 'react';
 
-import { VITE_BUGSNAG_API_KEY } from './constants';
+const bugsnagApiKey = import.meta.env.VITE_BUGSNAG_API_KEY;
 
-if (VITE_BUGSNAG_API_KEY) {
+if (bugsnagApiKey) {
   Bugsnag.start({
-    apiKey: VITE_BUGSNAG_API_KEY,
+    apiKey: bugsnagApiKey,
     plugins: [new BugsnagPluginReact()],
   });
-  BugsnagPerformance.start({ apiKey: VITE_BUGSNAG_API_KEY });
+  BugsnagPerformance.start({ apiKey: bugsnagApiKey });
 }
 
-export const errorLoggingEnabled = !!VITE_BUGSNAG_API_KEY;
+export const errorLoggingEnabled = !!bugsnagApiKey;
 
-export const LogErrorBoundary = VITE_BUGSNAG_API_KEY
+export const LogErrorBoundary = bugsnagApiKey
   ? Bugsnag.getPlugin('react')!.createErrorBoundary(React)
   : ({ children }: any) => children;
 
@@ -28,7 +28,7 @@ export function logError(error: Error) {
   }
   console.error(...errors);
 
-  if (VITE_BUGSNAG_API_KEY) {
+  if (import.meta.env.VITE_BUGSNAG_API_KEY) {
     Bugsnag.notify(error);
   }
 }

packages/frontend/src/utils/siwe.ts

@@ -2,8 +2,6 @@ import { SiweMessage } from 'siwe';
 import { PKPEthersWallet } from '@lit-protocol/pkp-ethers';
 import { v4 as uuid } from 'uuid';
 
-import { baseUrl } from './constants';
-
 const domain = window.location.host;
 const origin = window.location.origin;
 
@@ -19,7 +17,7 @@ export async function signInWithEthereum(
   );
   const signature = await wallet.signMessage(message);
 
-  const res = await fetch(`${baseUrl}/auth/validate`, {
+  const res = await fetch(`${import.meta.env.VITE_SERVER_URL}/auth/validate`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',

packages/frontend/src/utils/turnkey-frontend.ts

@@ -1,7 +1,10 @@
 import { TurnkeyClient, getWebAuthnAttestation } from '@turnkey/http';
 import { WebauthnStamper } from '@turnkey/webauthn-stamper';
 
-import { baseUrl, PASSKEY_WALLET_RPID, TURNKEY_BASE_URL } from './constants';
+const baseUrl = import.meta.env.VITE_SERVER_URL;
+
+const PASSKEY_WALLET_RPID = import.meta.env.VITE_PASSKEY_WALLET_RPID!;
+const TURNKEY_BASE_URL = import.meta.env.VITE_TURNKEY_API_BASE_URL!;
 
 // All algorithms can be found here: https://www.iana.org/assignments/cose/cose.xhtml#algorithms
 // We only support ES256, which is listed here

packages/frontend/src/utils/use-snowball.ts

@@ -5,17 +5,16 @@ import {
   LitGoogleAuth,
   LitPasskeyAuth,
 } from '@snowballtools/auth-lit';
-import { VITE_LIT_RELAY_API_KEY } from './constants';
 
 export const snowball = Snowball.withAuth({
   google: LitGoogleAuth.configure({
-    litRelayApiKey: VITE_LIT_RELAY_API_KEY!,
+    litRelayApiKey: import.meta.env.VITE_LIT_RELAY_API_KEY!,
   }),
   // apple: LitAppleAuth.configure({
-  //   litRelayApiKey: VITE_LIT_RELAY_API_KEY!,
+  //   litRelayApiKey: import.meta.env.VITE_LIT_RELAY_API_KEY!,
   // }),
   passkey: LitPasskeyAuth.configure({
-    litRelayApiKey: VITE_LIT_RELAY_API_KEY!,
+    litRelayApiKey: import.meta.env.VITE_LIT_RELAY_API_KEY!,
   }),
 }).create({
   initialChain: SnowballChain.sepolia,

packages/frontend/vite.config.ts

@@ -1,7 +1,5 @@
 import { defineConfig, PluginOption } from 'vite';
 import react from '@vitejs/plugin-react';
-import { exec } from 'child_process';
-import { promisify } from 'util';
 
 // https://vitejs.dev/config/
 export default defineConfig({
@@ -18,8 +16,5 @@ export default defineConfig({
   },
   define: {
     'process.env': {},
-    __VERSION__: JSON.stringify(
-      (await promisify(exec)('git rev-parse --short HEAD')).stdout.trim(),
-    ),
   },
 });

packages/gql-client/dist/index.d.mts

@@ -185,9 +185,6 @@ type RemoveEnvironmentVariableResponse = {
 type UpdateDeploymentToProdResponse = {
     updateDeploymentToProd: boolean;
 };
-type AddProjectFromTemplateResponse = {
-    addProjectFromTemplate: Project;
-};
 type AddProjectResponse = {
     addProject: Project;
 };
@@ -203,13 +200,6 @@ type DeleteProjectResponse = {
 type DeleteDomainResponse = {
     deleteDomain: boolean;
 };
-type AddProjectFromTemplateInput = {
-    templateOwner: string;
-    templateRepo: string;
-    owner: string;
-    name: string;
-    isPrivate: boolean;
-};
 type AddProjectInput = {
     name: string;
     repository: string;
@@ -277,7 +267,6 @@ declare class GQLClient {
     updateEnvironmentVariable(environmentVariableId: string, data: UpdateEnvironmentVariableInput): Promise<UpdateEnvironmentVariableResponse>;
     removeEnvironmentVariable(environmentVariableId: string): Promise<RemoveEnvironmentVariableResponse>;
     updateDeploymentToProd(deploymentId: string): Promise<UpdateDeploymentToProdResponse>;
-    addProjectFromTemplate(organizationSlug: string, data: AddProjectFromTemplateInput): Promise<AddProjectFromTemplateResponse>;
     addProject(organizationSlug: string, data: AddProjectInput): Promise<AddProjectResponse>;
     updateProject(projectId: string, data: UpdateProjectInput): Promise<UpdateProjectResponse>;
     updateDomain(domainId: string, data: UpdateDomainInput): Promise<UpdateDomainResponse>;
@@ -292,4 +281,4 @@ declare class GQLClient {
     unauthenticateGithub(): Promise<UnauthenticateGitHubResponse>;
 }
 
-export { type AddDomainInput, type AddDomainResponse, type AddEnvironmentVariableInput, type AddEnvironmentVariablesResponse, type AddProjectFromTemplateInput, type AddProjectFromTemplateResponse, type AddProjectInput, type AddProjectMemberInput, type AddProjectMemberResponse, type AddProjectResponse, type AuthenticateGitHubResponse, type DeleteDeploymentResponse, type DeleteDomainResponse, type DeleteProjectResponse, type Deployment, DeploymentStatus, type Domain, DomainStatus, Environment, type EnvironmentVariable, type FilterDomainInput, GQLClient, type GetDeploymentsResponse, type GetDomainsResponse, type GetEnvironmentVariablesResponse, type GetOrganizationsResponse, type GetProjectMembersResponse, type GetProjectResponse, type GetProjectsInOrganizationResponse, type GetUserResponse, type GraphQLConfig, type Organization, type OrganizationMember, type OrganizationProject, Permission, type Project, type ProjectMember, type RedeployToProdResponse, type RemoveEnvironmentVariableResponse, type RemoveProjectMemberResponse, Role, type RollbackDeploymentResponse, type SearchProjectsResponse, type UnauthenticateGitHubResponse, type UpdateDeploymentToProdResponse, type UpdateDomainInput, type UpdateDomainResponse, type UpdateEnvironmentVariableInput, type UpdateEnvironmentVariableResponse, type UpdateProjectInput, type UpdateProjectMemberInput, type UpdateProjectMemberResponse, type UpdateProjectResponse, type User };
+export { type AddDomainInput, type AddDomainResponse, type AddEnvironmentVariableInput, type AddEnvironmentVariablesResponse, type AddProjectInput, type AddProjectMemberInput, type AddProjectMemberResponse, type AddProjectResponse, type AuthenticateGitHubResponse, type DeleteDeploymentResponse, type DeleteDomainResponse, type DeleteProjectResponse, type Deployment, DeploymentStatus, type Domain, DomainStatus, Environment, type EnvironmentVariable, type FilterDomainInput, GQLClient, type GetDeploymentsResponse, type GetDomainsResponse, type GetEnvironmentVariablesResponse, type GetOrganizationsResponse, type GetProjectMembersResponse, type GetProjectResponse, type GetProjectsInOrganizationResponse, type GetUserResponse, type GraphQLConfig, type Organization, type OrganizationMember, type OrganizationProject, Permission, type Project, type ProjectMember, type RedeployToProdResponse, type RemoveEnvironmentVariableResponse, type RemoveProjectMemberResponse, Role, type RollbackDeploymentResponse, type SearchProjectsResponse, type UnauthenticateGitHubResponse, type UpdateDeploymentToProdResponse, type UpdateDomainInput, type UpdateDomainResponse, type UpdateEnvironmentVariableInput, type UpdateEnvironmentVariableResponse, type UpdateProjectInput, type UpdateProjectMemberInput, type UpdateProjectMemberResponse, type UpdateProjectResponse, type User };

packages/gql-client/dist/index.d.ts

@@ -185,9 +185,6 @@ type RemoveEnvironmentVariableResponse = {
 type UpdateDeploymentToProdResponse = {
     updateDeploymentToProd: boolean;
 };
-type AddProjectFromTemplateResponse = {
-    addProjectFromTemplate: Project;
-};
 type AddProjectResponse = {
     addProject: Project;
 };
@@ -203,13 +200,6 @@ type DeleteProjectResponse = {
 type DeleteDomainResponse = {
     deleteDomain: boolean;
 };
-type AddProjectFromTemplateInput = {
-    templateOwner: string;
-    templateRepo: string;
-    owner: string;
-    name: string;
-    isPrivate: boolean;
-};
 type AddProjectInput = {
     name: string;
     repository: string;
@@ -277,7 +267,6 @@ declare class GQLClient {
     updateEnvironmentVariable(environmentVariableId: string, data: UpdateEnvironmentVariableInput): Promise<UpdateEnvironmentVariableResponse>;
     removeEnvironmentVariable(environmentVariableId: string): Promise<RemoveEnvironmentVariableResponse>;
     updateDeploymentToProd(deploymentId: string): Promise<UpdateDeploymentToProdResponse>;
-    addProjectFromTemplate(organizationSlug: string, data: AddProjectFromTemplateInput): Promise<AddProjectFromTemplateResponse>;
     addProject(organizationSlug: string, data: AddProjectInput): Promise<AddProjectResponse>;
     updateProject(projectId: string, data: UpdateProjectInput): Promise<UpdateProjectResponse>;
     updateDomain(domainId: string, data: UpdateDomainInput): Promise<UpdateDomainResponse>;
@@ -292,4 +281,4 @@ declare class GQLClient {
     unauthenticateGithub(): Promise<UnauthenticateGitHubResponse>;
 }
 
-export { type AddDomainInput, type AddDomainResponse, type AddEnvironmentVariableInput, type AddEnvironmentVariablesResponse, type AddProjectFromTemplateInput, type AddProjectFromTemplateResponse, type AddProjectInput, type AddProjectMemberInput, type AddProjectMemberResponse, type AddProjectResponse, type AuthenticateGitHubResponse, type DeleteDeploymentResponse, type DeleteDomainResponse, type DeleteProjectResponse, type Deployment, DeploymentStatus, type Domain, DomainStatus, Environment, type EnvironmentVariable, type FilterDomainInput, GQLClient, type GetDeploymentsResponse, type GetDomainsResponse, type GetEnvironmentVariablesResponse, type GetOrganizationsResponse, type GetProjectMembersResponse, type GetProjectResponse, type GetProjectsInOrganizationResponse, type GetUserResponse, type GraphQLConfig, type Organization, type OrganizationMember, type OrganizationProject, Permission, type Project, type ProjectMember, type RedeployToProdResponse, type RemoveEnvironmentVariableResponse, type RemoveProjectMemberResponse, Role, type RollbackDeploymentResponse, type SearchProjectsResponse, type UnauthenticateGitHubResponse, type UpdateDeploymentToProdResponse, type UpdateDomainInput, type UpdateDomainResponse, type UpdateEnvironmentVariableInput, type UpdateEnvironmentVariableResponse, type UpdateProjectInput, type UpdateProjectMemberInput, type UpdateProjectMemberResponse, type UpdateProjectResponse, type User };
+export { type AddDomainInput, type AddDomainResponse, type AddEnvironmentVariableInput, type AddEnvironmentVariablesResponse, type AddProjectInput, type AddProjectMemberInput, type AddProjectMemberResponse, type AddProjectResponse, type AuthenticateGitHubResponse, type DeleteDeploymentResponse, type DeleteDomainResponse, type DeleteProjectResponse, type Deployment, DeploymentStatus, type Domain, DomainStatus, Environment, type EnvironmentVariable, type FilterDomainInput, GQLClient, type GetDeploymentsResponse, type GetDomainsResponse, type GetEnvironmentVariablesResponse, type GetOrganizationsResponse, type GetProjectMembersResponse, type GetProjectResponse, type GetProjectsInOrganizationResponse, type GetUserResponse, type GraphQLConfig, type Organization, type OrganizationMember, type OrganizationProject, Permission, type Project, type ProjectMember, type RedeployToProdResponse, type RemoveEnvironmentVariableResponse, type RemoveProjectMemberResponse, Role, type RollbackDeploymentResponse, type SearchProjectsResponse, type UnauthenticateGitHubResponse, type UpdateDeploymentToProdResponse, type UpdateDomainInput, type UpdateDomainResponse, type UpdateEnvironmentVariableInput, type UpdateEnvironmentVariableResponse, type UpdateProjectInput, type UpdateProjectMemberInput, type UpdateProjectMemberResponse, type UpdateProjectResponse, type User };

packages/gql-client/dist/index.js

@@ -287,14 +287,8 @@ var addEnvironmentVariables = import_client2.gql`
 }
 `;
 var updateEnvironmentVariable = import_client2.gql`
-  mutation (
+mutation ($environmentVariableId: String!, $data: UpdateEnvironmentVariableInput!) {
-    $environmentVariableId: String!
+  updateEnvironmentVariable(environmentVariableId: $environmentVariableId, data: $data)
-    $data: UpdateEnvironmentVariableInput!
-  ) {
-    updateEnvironmentVariable(
-      environmentVariableId: $environmentVariableId
-      data: $data
-    )
 }
 `;
 var removeEnvironmentVariable = import_client2.gql`
@@ -307,30 +301,20 @@ var updateDeploymentToProd = import_client2.gql`
   updateDeploymentToProd(deploymentId: $deploymentId)
 }
 `;
-var addProjectFromTemplate = import_client2.gql`
-  mutation ($organizationSlug: String!, $data: AddProjectFromTemplateInput) {
-    addProjectFromTemplate(organizationSlug: $organizationSlug, data: $data) {
-      id
-    }
-  }
-`;
 var addProject = import_client2.gql`
 mutation ($organizationSlug: String!, $data: AddProjectInput) {
   addProject(organizationSlug: $organizationSlug, data: $data) {
     id
   }
-  }
+}`;
-`;
 var updateProjectMutation = import_client2.gql`
 mutation ($projectId: String!, $data: UpdateProjectInput) {
   updateProject(projectId: $projectId, data: $data)
-  }
+}`;
-`;
 var updateDomainMutation = import_client2.gql`
 mutation ($domainId: String!, $data: UpdateDomainInput!) {
   updateDomain(domainId: $domainId, data: $data)
-  }
+}`;
-`;
 var redeployToProd = import_client2.gql`
 mutation ($deploymentId: String!) {
   redeployToProd(deploymentId: $deploymentId)
@@ -344,8 +328,7 @@ var deleteProject = import_client2.gql`
 var deleteDomain = import_client2.gql`
 mutation ($domainId: String!) {
   deleteDomain(domainId: $domainId)
-  }
+}`;
-`;
 var rollbackDeployment = import_client2.gql`
 mutation ($projectId: String! ,$deploymentId: String!) {
   rollbackDeployment(projectId: $projectId, deploymentId: $deploymentId)
@@ -366,13 +349,11 @@ var authenticateGitHub = import_client2.gql`
   authenticateGitHub(code: $code) {
     token
   }
-  }
+}`;
-`;
 var unauthenticateGitHub = import_client2.gql`
 mutation {
   unauthenticateGitHub
-  }
+}`;
-`;
 
 // src/client.ts
 var defaultOptions = {
@@ -557,18 +538,6 @@ var GQLClient = class {
       return data;
     });
   }
-  addProjectFromTemplate(organizationSlug, data) {
-    return __async(this, null, function* () {
-      const result = yield this.client.mutate({
-        mutation: addProjectFromTemplate,
-        variables: {
-          organizationSlug,
-          data
-        }
-      });
-      return result.data;
-    });
-  }
   addProject(organizationSlug, data) {
     return __async(this, null, function* () {
       const result = yield this.client.mutate({

packages/gql-client/dist/index.mjs

@@ -20,10 +20,7 @@ var __async = (__this, __arguments, generator) => {
 };
 
 // src/client.ts
-import {
+import { ApolloClient, InMemoryCache } from "@apollo/client";
-  ApolloClient,
-  InMemoryCache
-} from "@apollo/client";
 
 // src/queries.ts
 import { gql } from "@apollo/client";
@@ -260,14 +257,8 @@ var addEnvironmentVariables = gql2`
 }
 `;
 var updateEnvironmentVariable = gql2`
-  mutation (
+mutation ($environmentVariableId: String!, $data: UpdateEnvironmentVariableInput!) {
-    $environmentVariableId: String!
+  updateEnvironmentVariable(environmentVariableId: $environmentVariableId, data: $data)
-    $data: UpdateEnvironmentVariableInput!
-  ) {
-    updateEnvironmentVariable(
-      environmentVariableId: $environmentVariableId
-      data: $data
-    )
 }
 `;
 var removeEnvironmentVariable = gql2`
@@ -280,30 +271,20 @@ var updateDeploymentToProd = gql2`
   updateDeploymentToProd(deploymentId: $deploymentId)
 }
 `;
-var addProjectFromTemplate = gql2`
-  mutation ($organizationSlug: String!, $data: AddProjectFromTemplateInput) {
-    addProjectFromTemplate(organizationSlug: $organizationSlug, data: $data) {
-      id
-    }
-  }
-`;
 var addProject = gql2`
 mutation ($organizationSlug: String!, $data: AddProjectInput) {
   addProject(organizationSlug: $organizationSlug, data: $data) {
     id
   }
-  }
+}`;
-`;
 var updateProjectMutation = gql2`
 mutation ($projectId: String!, $data: UpdateProjectInput) {
   updateProject(projectId: $projectId, data: $data)
-  }
+}`;
-`;
 var updateDomainMutation = gql2`
 mutation ($domainId: String!, $data: UpdateDomainInput!) {
   updateDomain(domainId: $domainId, data: $data)
-  }
+}`;
-`;
 var redeployToProd = gql2`
 mutation ($deploymentId: String!) {
   redeployToProd(deploymentId: $deploymentId)
@@ -317,8 +298,7 @@ var deleteProject = gql2`
 var deleteDomain = gql2`
 mutation ($domainId: String!) {
   deleteDomain(domainId: $domainId)
-  }
+}`;
-`;
 var rollbackDeployment = gql2`
 mutation ($projectId: String! ,$deploymentId: String!) {
   rollbackDeployment(projectId: $projectId, deploymentId: $deploymentId)
@@ -339,13 +319,11 @@ var authenticateGitHub = gql2`
   authenticateGitHub(code: $code) {
     token
   }
-  }
+}`;
-`;
 var unauthenticateGitHub = gql2`
 mutation {
   unauthenticateGitHub
-  }
+}`;
-`;
 
 // src/client.ts
 var defaultOptions = {
@@ -530,18 +508,6 @@ var GQLClient = class {
       return data;
     });
   }
-  addProjectFromTemplate(organizationSlug, data) {
-    return __async(this, null, function* () {
-      const result = yield this.client.mutate({
-        mutation: addProjectFromTemplate,
-        variables: {
-          organizationSlug,
-          data
-        }
-      });
-      return result.data;
-    });
-  }
   addProject(organizationSlug, data) {
     return __async(this, null, function* () {
       const result = yield this.client.mutate({

packages/gql-client/src/client.ts

@@ -1,13 +1,8 @@
-import {
+import { ApolloClient, DefaultOptions, InMemoryCache, NormalizedCacheObject } from '@apollo/client';
-  ApolloClient,
-  DefaultOptions,
-  InMemoryCache,
-  NormalizedCacheObject,
-} from "@apollo/client";
 
-import * as queries from "./queries";
+import * as queries from './queries';
-import * as types from "./types";
+import * as types from './types';
-import * as mutations from "./mutations";
+import * as mutations from './mutations';
 
 export interface GraphQLConfig {
   gqlEndpoint: string;
@@ -16,13 +11,13 @@ export interface GraphQLConfig {
 // TODO: check options
 const defaultOptions: DefaultOptions = {
   watchQuery: {
-    fetchPolicy: "no-cache",
+    fetchPolicy: 'no-cache',
-    errorPolicy: "ignore",
+    errorPolicy: 'ignore'
   },
   query: {
-    fetchPolicy: "no-cache",
+    fetchPolicy: 'no-cache',
-    errorPolicy: "all",
+    errorPolicy: 'all'
-  },
+  }
 };
 
 export class GQLClient {
@@ -33,13 +28,13 @@ export class GQLClient {
       uri: config.gqlEndpoint,
       cache: new InMemoryCache(),
       defaultOptions,
-      credentials: "include",
+      credentials: 'include'
     });
   }
 
   async getUser () : Promise<types.GetUserResponse> {
     const { data } = await this.client.query({
-      query: queries.getUser,
+      query: queries.getUser
     });
 
     return data;
@@ -49,21 +44,19 @@ export class GQLClient {
     const { data } = await this.client.query({
       query: queries.getProject,
       variables: {
-        projectId,
+        projectId
-      },
+      }
     });
 
     return data;
   }
 
-  async getProjectsInOrganization(
+  async getProjectsInOrganization (organizationSlug: string) : Promise<types.GetProjectsInOrganizationResponse> {
-    organizationSlug: string
-  ): Promise<types.GetProjectsInOrganizationResponse> {
     const { data } = await this.client.query({
       query: queries.getProjectsInOrganization,
       variables: {
-        organizationSlug,
+        organizationSlug
-      },
+      }
     });
 
     return data;
@@ -71,231 +64,179 @@ export class GQLClient {
 
   async getOrganizations () : Promise<types.GetOrganizationsResponse> {
     const { data } = await this.client.query({
-      query: queries.getOrganizations,
+      query: queries.getOrganizations
     });
 
     return data;
   }
 
-  async getDeployments(
+  async getDeployments (projectId: string) : Promise<types.GetDeploymentsResponse> {
-    projectId: string
-  ): Promise<types.GetDeploymentsResponse> {
     const { data } = await this.client.query({
       query: queries.getDeployments,
       variables: {
-        projectId,
+        projectId
-      },
+      }
     });
 
     return data;
   }
 
-  async getEnvironmentVariables(
+  async getEnvironmentVariables (projectId: string) : Promise<types.GetEnvironmentVariablesResponse> {
-    projectId: string
-  ): Promise<types.GetEnvironmentVariablesResponse> {
     const { data } = await this.client.query({
       query: queries.getEnvironmentVariables,
       variables: {
-        projectId,
+        projectId
-      },
+      }
     });
 
     return data;
   }
 
-  async getProjectMembers(
+  async getProjectMembers (projectId: string) : Promise<types.GetProjectMembersResponse> {
-    projectId: string
-  ): Promise<types.GetProjectMembersResponse> {
     const result = await this.client.query({
       query: queries.getProjectMembers,
       variables: {
-        projectId,
+        projectId
-      },
+      }
     });
 
     return result.data;
   }
 
-  async addProjectMember(
+  async addProjectMember (projectId: string, data: types.AddProjectMemberInput) : Promise<types.AddProjectMemberResponse> {
-    projectId: string,
-    data: types.AddProjectMemberInput
-  ): Promise<types.AddProjectMemberResponse> {
     const result = await this.client.mutate({
       mutation: mutations.addProjectMember,
       variables: {
         projectId,
-        data,
+        data
-      },
+      }
     });
 
     return result.data;
   }
 
-  async updateProjectMember(
+  async updateProjectMember (projectMemberId: string, data: types.UpdateProjectMemberInput): Promise<types.UpdateProjectMemberResponse> {
-    projectMemberId: string,
-    data: types.UpdateProjectMemberInput
-  ): Promise<types.UpdateProjectMemberResponse> {
     const result = await this.client.mutate({
       mutation: mutations.updateProjectMember,
       variables: {
         projectMemberId,
-        data,
+        data
-      },
+      }
     });
 
     return result.data;
   }
 
-  async removeProjectMember(
+  async removeProjectMember (projectMemberId: string): Promise<types.RemoveProjectMemberResponse> {
-    projectMemberId: string
-  ): Promise<types.RemoveProjectMemberResponse> {
     const result = await this.client.mutate({
       mutation: mutations.removeProjectMember,
       variables: {
-        projectMemberId,
+        projectMemberId
-      },
+      }
     });
 
     return result.data;
   }
 
-  async searchProjects(
+  async searchProjects (searchText: string) : Promise<types.SearchProjectsResponse> {
-    searchText: string
-  ): Promise<types.SearchProjectsResponse> {
     const { data } = await this.client.query({
       query: queries.searchProjects,
       variables: {
-        searchText,
+        searchText
-      },
+      }
     });
 
     return data;
   }
 
-  async addEnvironmentVariables(
+  async addEnvironmentVariables (projectId: string, data: types.AddEnvironmentVariableInput[]): Promise<types.AddEnvironmentVariablesResponse> {
-    projectId: string,
-    data: types.AddEnvironmentVariableInput[]
-  ): Promise<types.AddEnvironmentVariablesResponse> {
     const result = await this.client.mutate({
       mutation: mutations.addEnvironmentVariables,
       variables: {
         projectId,
-        data,
+        data
-      },
+      }
     });
 
     return result.data;
   }
 
-  async updateEnvironmentVariable(
+  async updateEnvironmentVariable (environmentVariableId: string, data: types.UpdateEnvironmentVariableInput): Promise<types.UpdateEnvironmentVariableResponse> {
-    environmentVariableId: string,
-    data: types.UpdateEnvironmentVariableInput
-  ): Promise<types.UpdateEnvironmentVariableResponse> {
     const result = await this.client.mutate({
       mutation: mutations.updateEnvironmentVariable,
       variables: {
         environmentVariableId,
-        data,
+        data
-      },
+      }
     });
 
     return result.data;
   }
 
-  async removeEnvironmentVariable(
+  async removeEnvironmentVariable (environmentVariableId: string): Promise<types.RemoveEnvironmentVariableResponse> {
-    environmentVariableId: string
-  ): Promise<types.RemoveEnvironmentVariableResponse> {
     const { data } = await this.client.mutate({
       mutation: mutations.removeEnvironmentVariable,
       variables: {
-        environmentVariableId,
+        environmentVariableId
-      },
+      }
     });
 
     return data;
   }
 
-  async updateDeploymentToProd(
+  async updateDeploymentToProd (deploymentId: string): Promise<types.UpdateDeploymentToProdResponse> {
-    deploymentId: string
-  ): Promise<types.UpdateDeploymentToProdResponse> {
     const { data } = await this.client.mutate({
       mutation: mutations.updateDeploymentToProd,
       variables: {
-        deploymentId,
+        deploymentId
-      },
+      }
     });
 
     return data;
   }
 
-  async addProjectFromTemplate(
+  async addProject (organizationSlug: string, data: types.AddProjectInput): Promise<types.AddProjectResponse> {
-    organizationSlug: string,
-    data: types.AddProjectFromTemplateInput
-  ): Promise<types.AddProjectFromTemplateResponse> {
-    const result = await this.client.mutate({
-      mutation: mutations.addProjectFromTemplate,
-      variables: {
-        organizationSlug,
-        data,
-      },
-    });
-
-    return result.data;
-  }
-
-  async addProject(
-    organizationSlug: string,
-    data: types.AddProjectInput
-  ): Promise<types.AddProjectResponse> {
     const result = await this.client.mutate({
       mutation: mutations.addProject,
       variables: {
         organizationSlug,
-        data,
+        data
-      },
+      }
     });
 
     return result.data;
   }
 
-  async updateProject(
+  async updateProject (projectId: string, data: types.UpdateProjectInput): Promise<types.UpdateProjectResponse> {
-    projectId: string,
-    data: types.UpdateProjectInput
-  ): Promise<types.UpdateProjectResponse> {
     const result = await this.client.mutate({
       mutation: mutations.updateProjectMutation,
       variables: {
         projectId,
-        data,
+        data
-      },
+      }
     });
 
     return result.data;
   }
 
-  async updateDomain(
+  async updateDomain (domainId: string, data: types.UpdateDomainInput): Promise<types.UpdateDomainResponse> {
-    domainId: string,
-    data: types.UpdateDomainInput
-  ): Promise<types.UpdateDomainResponse> {
     const result = await this.client.mutate({
       mutation: mutations.updateDomainMutation,
       variables: {
         domainId,
-        data,
+        data
-      },
+      }
     });
 
     return result.data;
   }
 
-  async redeployToProd(
+  async redeployToProd (deploymentId: string): Promise<types.RedeployToProdResponse> {
-    deploymentId: string
-  ): Promise<types.RedeployToProdResponse> {
     const { data } = await this.client.mutate({
       mutation: mutations.redeployToProd,
       variables: {
-        deploymentId,
+        deploymentId
-      },
+      }
     });
 
     return data;
@@ -305,8 +246,8 @@ export class GQLClient {
     const { data } = await this.client.mutate({
       mutation: mutations.deleteProject,
       variables: {
-        projectId,
+        projectId
-      },
+      }
     });
 
     return data;
@@ -316,79 +257,66 @@ export class GQLClient {
     const { data } = await this.client.mutate({
       mutation: mutations.deleteDomain,
       variables: {
-        domainId,
+        domainId
-      },
+      }
     });
 
     return data;
   }
 
-  async rollbackDeployment(
+  async rollbackDeployment (projectId: string, deploymentId: string): Promise<types.RollbackDeploymentResponse> {
-    projectId: string,
-    deploymentId: string
-  ): Promise<types.RollbackDeploymentResponse> {
     const { data } = await this.client.mutate({
       mutation: mutations.rollbackDeployment,
       variables: {
         projectId,
-        deploymentId,
+        deploymentId
-      },
+      }
     });
 
     return data;
   }
 
-  async deleteDeployment(
+  async deleteDeployment (deploymentId: string): Promise<types.DeleteDeploymentResponse> {
-    deploymentId: string
-  ): Promise<types.DeleteDeploymentResponse> {
     const { data } = await this.client.mutate({
       mutation: mutations.deleteDeployment,
       variables: {
-        deploymentId,
+        deploymentId
-      },
+      }
     });
 
     return data;
   }
 
-  async addDomain(
+  async addDomain (projectId: string, data: types.AddDomainInput): Promise<types.AddDomainResponse> {
-    projectId: string,
-    data: types.AddDomainInput
-  ): Promise<types.AddDomainResponse> {
     const result = await this.client.mutate({
       mutation: mutations.addDomain,
       variables: {
         projectId,
-        data,
+        data
-      },
+      }
     });
 
     return result.data;
   }
 
-  async getDomains(
+  async getDomains (projectId: string, filter?: types.FilterDomainInput): Promise<types.GetDomainsResponse> {
-    projectId: string,
-    filter?: types.FilterDomainInput
-  ): Promise<types.GetDomainsResponse> {
     const { data } = await this.client.query({
       query: queries.getDomains,
       variables: {
         projectId,
-        filter,
+        filter
-      },
+      }
     });
 
     return data;
   }
 
-  async authenticateGitHub(
+  async authenticateGitHub (code: string): Promise<types.AuthenticateGitHubResponse> {
-    code: string
-  ): Promise<types.AuthenticateGitHubResponse> {
     const { data } = await this.client.mutate({
       mutation: mutations.authenticateGitHub,
       variables: {
-        code,
+        code
-      },
+      }
     });
 
     return data;
@@ -396,7 +324,7 @@ export class GQLClient {
 
   async unauthenticateGithub (): Promise<types.UnauthenticateGitHubResponse> {
     const { data } = await this.client.mutate({
-      mutation: mutations.unauthenticateGitHub,
+      mutation: mutations.unauthenticateGitHub
     });
 
     return data;

packages/gql-client/src/mutations.ts

@@ -1,4 +1,4 @@
-import { gql } from "@apollo/client";
+import { gql } from '@apollo/client';
 
 export const removeProjectMember = gql`
 mutation ($projectMemberId: String!) {
@@ -25,14 +25,8 @@ export const addEnvironmentVariables = gql`
 `;
 
 export const updateEnvironmentVariable = gql`
-  mutation (
+mutation ($environmentVariableId: String!, $data: UpdateEnvironmentVariableInput!) {
-    $environmentVariableId: String!
+  updateEnvironmentVariable(environmentVariableId: $environmentVariableId, data: $data)
-    $data: UpdateEnvironmentVariableInput!
-  ) {
-    updateEnvironmentVariable(
-      environmentVariableId: $environmentVariableId
-      data: $data
-    )
 }
 `;
 
@@ -48,33 +42,22 @@ export const updateDeploymentToProd = gql`
 }
 `;
 
-export const addProjectFromTemplate = gql`
-  mutation ($organizationSlug: String!, $data: AddProjectFromTemplateInput) {
-    addProjectFromTemplate(organizationSlug: $organizationSlug, data: $data) {
-      id
-    }
-  }
-`;
-
 export const addProject = gql`
 mutation ($organizationSlug: String!, $data: AddProjectInput) {
   addProject(organizationSlug: $organizationSlug, data: $data) {
     id
   }
-  }
+}`;
-`;
 
 export const updateProjectMutation = gql`
 mutation ($projectId: String!, $data: UpdateProjectInput) {
   updateProject(projectId: $projectId, data: $data)
-  }
+}`;
-`;
 
 export const updateDomainMutation = gql`
 mutation ($domainId: String!, $data: UpdateDomainInput!) {
   updateDomain(domainId: $domainId, data: $data)
-  }
+}`;
-`;
 
 export const redeployToProd = gql`
 mutation ($deploymentId: String!) {
@@ -91,8 +74,7 @@ export const deleteProject = gql`
 export const deleteDomain = gql`
 mutation ($domainId: String!) {
   deleteDomain(domainId: $domainId)
-  }
+}`;
-`;
 
 export const rollbackDeployment = gql`
 mutation ($projectId: String! ,$deploymentId: String!) {
@@ -117,11 +99,9 @@ export const authenticateGitHub = gql`
   authenticateGitHub(code: $code) {
     token
   }
-  }
+}`;
-`;
 
 export const unauthenticateGitHub = gql`
 mutation {
   unauthenticateGitHub
-  }
+}`;
-`;

packages/gql-client/src/types.ts

@@ -1,311 +1,298 @@
-import { addProjectFromTemplate } from "./mutations";
 // Note: equivalent to types present in GQL schema
 
 export enum Role {
-  Owner = "Owner",
+  Owner = 'Owner',
-  Maintainer = "Maintainer",
+  Maintainer = 'Maintainer',
-  Reader = "Reader",
+  Reader = 'Reader',
 }
 
 export enum Permission {
-  View = "View",
+  View = 'View',
-  Edit = "Edit",
+  Edit = 'Edit',
 }
 
 export enum Environment {
-  Production = "Production",
+  Production = 'Production',
-  Preview = "Preview",
+  Preview = 'Preview',
-  Development = "Development",
+  Development = 'Development',
 }
 
 export enum DeploymentStatus {
-  Building = "Building",
+  Building = 'Building',
-  Ready = "Ready",
+  Ready = 'Ready',
-  Error = "Error",
+  Error = 'Error',
-  Deleting = "Deleting",
+  Deleting = 'Deleting'
 }
 
 export enum DomainStatus {
-  Live = "Live",
+  Live = 'Live',
-  Pending = "Pending",
+  Pending = 'Pending',
 }
 
 export type EnvironmentVariable = {
-  id: string;
+  id: string
-  environment: Environment;
+  environment: Environment
-  key: string;
+  key: string
-  value: string;
+  value: string
-  createdAt: string;
+  createdAt: string
-  updatedAt: string;
+  updatedAt: string
-};
+}
 
 export type Domain = {
-  id: string;
+  id: string
-  branch: string;
+  branch: string
-  name: string;
+  name: string
-  status: DomainStatus;
+  status: DomainStatus
-  redirectTo: Domain | null;
+  redirectTo: Domain | null
-  createdAt: string;
+  createdAt: string
-  updatedAt: string;
+  updatedAt: string
-};
+}
 
 export type User = {
-  id: string;
+  id: string
-  name: string | null;
+  name: string | null
-  email: string;
+  email: string
-  isVerified: boolean;
+  isVerified: boolean
-  createdAt: string;
+  createdAt: string
-  updatedAt: string;
+  updatedAt: string
-  gitHubToken: string | null;
+  gitHubToken: string | null
-};
+}
 
 export type Deployment = {
-  id: string;
+  id: string
-  domain: Domain;
+  domain: Domain
-  branch: string;
+  branch: string
-  commitHash: string;
+  commitHash: string
-  commitMessage: string;
+  commitMessage: string
-  url?: string;
+  url?: string
-  environment: Environment;
+  environment: Environment
-  isCurrent: boolean;
+  isCurrent: boolean
-  status: DeploymentStatus;
+  status: DeploymentStatus
-  createdBy: User;
+  createdBy: User
-  createdAt: string;
+  createdAt: string
-  updatedAt: string;
+  updatedAt: string
-};
+}
 
 export type OrganizationMember = {
-  id: string;
+  id: string
-  member: User;
+  member: User
-  role: Role;
+  role: Role
-  createdAt: string;
+  createdAt: string
-  updatedAt: string;
+  updatedAt: string
-};
+}
 
 export type ProjectMember = {
-  id: string;
+  id: string
-  member: User;
+  member: User
-  permissions: Permission[];
+  permissions: Permission[]
-  isPending: boolean;
+  isPending: boolean
-  createdAt: string;
+  createdAt: string
-  updatedAt: string;
+  updatedAt: string
-};
+}
 
 export type OrganizationProject = {
-  id: string;
+  id: string
-  owner: User;
+  owner: User
-  deployments: Deployment[];
+  deployments: Deployment[]
-  name: string;
+  name: string
-  repository: string;
+  repository: string
-  prodBranch: string;
+  prodBranch: string
-  description: string;
+  description: string
-  template: string;
+  template: string
-  framework: string;
+  framework: string
-  webhooks: string[];
+  webhooks: string[]
-  members: ProjectMember[];
+  members: ProjectMember[]
-  environmentVariables: EnvironmentVariable[];
+  environmentVariables: EnvironmentVariable[]
-  createdAt: string;
+  createdAt: string
-  updatedAt: string;
+  updatedAt: string
-};
+}
 
 export type Organization = {
-  id: string;
+  id: string
-  name: string;
+  name: string
-  slug: string;
+  slug: string
-  projects: OrganizationProject[];
+  projects: OrganizationProject[]
-  createdAt: string;
+  createdAt: string
-  updatedAt: string;
+  updatedAt: string
-  members: OrganizationMember[];
+  members: OrganizationMember[]
-};
+}
 
 export type Project = {
-  id: string;
+  id: string
-  owner: User;
+  owner: User
-  deployments: Deployment[];
+  deployments: Deployment[]
-  name: string;
+  name: string
-  repository: string;
+  repository: string
-  prodBranch: string;
+  prodBranch: string
-  description: string;
+  description: string
-  template: string;
+  template: string
-  framework: string;
+  framework: string
-  webhooks: string[];
+  webhooks: string[]
-  members: ProjectMember[];
+  members: ProjectMember[]
-  environmentVariables: EnvironmentVariable[];
+  environmentVariables: EnvironmentVariable[]
-  createdAt: string;
+  createdAt: string
-  updatedAt: string;
+  updatedAt: string
-  organization: Organization;
+  organization: Organization
-  icon: string;
+  icon: string
-  subDomain: string;
+  subDomain: string
-};
+}
 
 export type GetProjectMembersResponse = {
-  projectMembers: ProjectMember[];
+  projectMembers: ProjectMember[]
-};
+}
 
 export type AddProjectMemberResponse = {
-  addProjectMember: boolean;
+  addProjectMember: boolean
-};
+}
 
 export type RemoveProjectMemberResponse = {
   removeProjectMember: boolean;
-};
+}
 
 export type UpdateProjectMemberResponse = {
   updateProjectMember: boolean;
-};
+}
 
 export type GetDeploymentsResponse = {
-  deployments: Deployment[];
+  deployments: Deployment[]
-};
+}
 
 export type GetEnvironmentVariablesResponse = {
-  environmentVariables: EnvironmentVariable[];
+  environmentVariables: EnvironmentVariable[]
-};
+}
 
 export type GetOrganizationsResponse = {
-  organizations: Organization[];
+  organizations: Organization[]
-};
+}
 
 export type GetUserResponse = {
-  user: User;
+  user: User
-};
+}
 
 export type GetProjectResponse = {
-  project: Project | null;
+  project: Project | null
-};
+}
 
 export type GetProjectsInOrganizationResponse = {
-  projectsInOrganization: Project[];
+  projectsInOrganization: Project[]
-};
+}
 
 export type GetDomainsResponse = {
-  domains: Domain[];
+  domains: Domain[]
-};
+}
 
 export type SearchProjectsResponse = {
-  searchProjects: Project[];
+  searchProjects: Project[]
-};
+}
 
 export type AddEnvironmentVariablesResponse = {
   addEnvironmentVariables: boolean;
-};
+}
 
 export type AddEnvironmentVariableInput = {
   environments: string[];
   key: string;
   value: string;
-};
+}
 
 export type UpdateEnvironmentVariableInput = {
   key: string;
   value: string;
-};
+}
 
 export type UpdateProjectMemberInput = {
   permissions: Permission[];
-};
+}
 
 export type AddProjectMemberInput = {
   email: string;
-  permissions: Permission[];
+  permissions: Permission[]
-};
+}
 
 export type UpdateEnvironmentVariableResponse = {
   updateEnvironmentVariable: boolean;
-};
+}
 
 export type RemoveEnvironmentVariableResponse = {
   removeEnvironmentVariable: boolean;
-};
+}
 
 export type UpdateDeploymentToProdResponse = {
   updateDeploymentToProd: boolean;
-};
+}
-
-export type AddProjectFromTemplateResponse = {
-  addProjectFromTemplate: Project;
-};
 
 export type AddProjectResponse = {
-  addProject: Project;
+  addProject: Project
-};
+}
 
 export type UpdateProjectResponse = {
   updateProject: boolean;
-};
+}
 
 export type UpdateDomainResponse = {
   updateDomain: boolean;
-};
+}
 
 export type DeleteProjectResponse = {
   deleteProject: boolean;
-};
+}
 
 export type DeleteDomainResponse = {
   deleteDomain: boolean;
-};
+}
-
-export type AddProjectFromTemplateInput = {
-  templateOwner: string;
-  templateRepo: string;
-  owner: string;
-  name: string;
-  isPrivate: boolean;
-};
 
 export type AddProjectInput = {
   name: string;
   repository: string;
   prodBranch: string;
   template?: string;
-};
+}
 
 export type UpdateProjectInput = {
-  name?: string;
+  name?: string
-  description?: string;
+  description?: string
-  prodBranch?: string;
+  prodBranch?: string
-  webhooks?: string[];
+  webhooks?: string[]
-  organizationId?: string;
+  organizationId?: string
-};
+}
 
 export type UpdateDomainInput = {
   name?: string;
   branch?: string;
   redirectToId?: string | null;
-};
+}
 
 export type RedeployToProdResponse = {
-  redeployToProd: boolean;
+  redeployToProd: boolean
-};
+}
 
 export type RollbackDeploymentResponse = {
-  rollbackDeployment: boolean;
+  rollbackDeployment: boolean
-};
+}
 
 export type DeleteDeploymentResponse = {
-  deleteDeployment: boolean;
+  deleteDeployment: boolean
-};
+}
 
 export type AddDomainInput = {
-  name: string;
+  name: string
-};
+}
 
 export type FilterDomainInput = {
-  branch?: string;
+  branch?: string
-  status?: DomainStatus;
+  status?: DomainStatus
-};
+}
 
 export type AddDomainResponse = {
-  addDomain: true;
+  addDomain: true
-};
+}
 
 export type AuthenticateGitHubResponse = {
   authenticateGitHub: {
-    token: string;
+    token: string
-  };
+  }
-};
+}
 
 export type UnauthenticateGitHubResponse = {
-  unauthenticateGitHub: boolean;
+  unauthenticateGitHub: boolean
-};
+}

yarn.lock

@@ -10575,11 +10575,6 @@ exponential-backoff@^3.1.1:
   resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
   integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
 
-express-async-errors@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/express-async-errors/-/express-async-errors-3.1.1.tgz#6053236d61d21ddef4892d6bd1d736889fc9da41"
-  integrity sha512-h6aK1da4tpqWSbyCa3FxB/V6Ehd4EEB15zyQq9qe75OZBp0krinNKuH4rAY+S/U/2I36vdLAUFSjQJ+TFmODng==
-
 express-session@^1.18.0:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.18.0.tgz#a6ae39d9091f2efba5f20fc5c65a3ce7c9ce16a3"
@@ -11264,6 +11259,11 @@ globby@11.1.0, globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
+goober@^2.1.10:
+  version "2.1.14"
+  resolved "https://registry.yarnpkg.com/goober/-/goober-2.1.14.tgz#4a5c94fc34dc086a8e6035360ae1800005135acd"
+  integrity sha512-4UpC0NdGyAFqLNPnhCT2iHpza2q+RAY3GV85a/mRPdzyPQMsj0KmMMuetdIkzWRbJ+Hgau1EZztq8ImmiMGhsg==
+
 google-protobuf@^3.19.4:
   version "3.21.2"
   resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.21.2.tgz#4580a2bea8bbb291ee579d1fefb14d6fa3070ea4"
@@ -15323,6 +15323,13 @@ react-hook-form@^7.49.0:
   resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.51.3.tgz#7486dd2d52280b6b28048c099a98d2545931cab3"
   integrity sha512-cvJ/wbHdhYx8aviSWh28w9ImjmVsb5Y05n1+FW786vEZQJV5STNM0pW6ujS+oiBecb0ARBxJFyAnXj9+GHXACQ==
 
+react-hot-toast@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/react-hot-toast/-/react-hot-toast-2.4.1.tgz#df04295eda8a7b12c4f968e54a61c8d36f4c0994"
+  integrity sha512-j8z+cQbWIM5LY37pR6uZR6D4LfseplqnuAO4co4u8917hBUvXlEqyP1ZzqVLcqoyUesZZv/ImreoCeHVDpE5pQ==
+  dependencies:
+    goober "^2.1.10"
+
 react-inspector@6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-6.0.2.tgz#aa3028803550cb6dbd7344816d5c80bf39d07e9d"