Fix Input component react hook

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

@@ -17,7 +17,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
         return context.user;
       },
 
-      organizations: async (_: any, __: any, context: any) => {
+      organizations: async (_:any, __: any, context: any) => {
         return service.getOrganizationsByUserId(context.user);
       },
 
@@ -25,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 }) => {
@@ -42,7 +35,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       environmentVariables: async (
         _: any,
-        { projectId }: { projectId: string },
+        { projectId }: { projectId: string }
       ) => {
         return service.getEnvironmentVariablesByProjectId(projectId);
       },
@@ -51,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);
       },
 
@@ -63,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
@@ -75,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;
@@ -92,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);
@@ -112,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));
@@ -133,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);
@@ -153,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);
@@ -172,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);
@@ -185,12 +171,10 @@ 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;
@@ -201,9 +185,9 @@ export const createResolvers = async (service: Service): Promise<any> => {
         _: any,
         {
           organizationSlug,
-          data,
+          data
         }: { organizationSlug: string; data: DeepPartial<Project> },
-        context: any,
+        context: any
       ) => {
         try {
           return await service.addProject(context.user, organizationSlug, data);
@@ -215,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);
@@ -228,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;
@@ -262,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);
@@ -275,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);
@@ -287,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));
@@ -299,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);
@@ -312,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);
@@ -324,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.8' });
-});
-
-export default router;

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/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

@@ -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

@@ -44,8 +44,8 @@ record:
       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/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/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,31 +16,36 @@ 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 */}
-          {/* TODO: Fix selection of project settings tab on navigation to domains */}
+        <Link to="../settings/domains" className="text-light-blue-800 inline">
-          <Link to="../settings/domains" className="text-light-blue-800 inline">
+          project settings{' '}
-            project settings{' '}
+        </Link>
-          </Link>
+        (recommended). If you want to assign to this specific deployment,
-          (recommended). If you want to assign to this specific deployment,
+        however, you can do so using our command-line interface:
-          however, you can do so using our command-line interface:
+        {/* https://github.com/rajinwonderland/react-code-blocks/issues/138 */}
-          {/* https://github.com/rajinwonderland/react-code-blocks/issues/138 */}
+        <CopyBlock
-          <CopyBlock
+          text="snowball alias <deployment> <domain>"
-            text="snowball alias <deployment> <domain>"
+          language=""
-            language=""
+          showLineNumbers={false}
-            showLineNumbers={false}
+          theme={atomOneLight}
-            theme={atomOneLight}
+        />
-          />
+      </DialogBody>
-        </Modal.Body>
+      <DialogFooter className="flex justify-start">
-        <Modal.Footer className="flex justify-start">
+        <Button
-          <Button onClick={handleOpen}>Okay</Button>
+          className="rounded-3xl"
-        </Modal.Footer>
+          variant="gradient"
-      </Modal.Content>
+          color="blue"
-    </Modal>
+          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/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/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/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/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.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";

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,372 +11,320 @@ 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 {
   private client: ApolloClient<NormalizedCacheObject>;
 
-  constructor(config: GraphQLConfig) {
+  constructor (config: GraphQLConfig) {
     this.client = new ApolloClient({
       uri: config.gqlEndpoint,
       cache: new InMemoryCache(),
       defaultOptions,
-      credentials: "include",
+      credentials: 'include'
     });
   }
 
-  async getUser(): Promise<types.GetUserResponse> {
+  async getUser () : Promise<types.GetUserResponse> {
     const { data } = await this.client.query({
-      query: queries.getUser,
+      query: queries.getUser
     });
 
     return data;
   }
 
-  async getProject(projectId: string): Promise<types.GetProjectResponse> {
+  async getProject (projectId: string) : Promise<types.GetProjectResponse> {
     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;
   }
 
-  async getOrganizations(): Promise<types.GetOrganizationsResponse> {
+  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 addProject(
+  async addProject (organizationSlug: string, data: types.AddProjectInput): Promise<types.AddProjectResponse> {
-    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;
   }
 
-  async deleteProject(projectId: string): Promise<types.DeleteProjectResponse> {
+  async deleteProject (projectId: string): Promise<types.DeleteProjectResponse> {
     const { data } = await this.client.mutate({
       mutation: mutations.deleteProject,
       variables: {
-        projectId,
+        projectId
-      },
+      }
     });
 
     return data;
   }
 
-  async deleteDomain(domainId: string): Promise<types.DeleteDomainResponse> {
+  async deleteDomain (domainId: string): Promise<types.DeleteDomainResponse> {
     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;
   }
 
-  async unauthenticateGithub(): Promise<types.UnauthenticateGitHubResponse> {
+  async unauthenticateGithub (): Promise<types.UnauthenticateGitHubResponse> {
     const { data } = await this.client.mutate({
-      mutation: mutations.unauthenticateGitHub,
+      mutation: mutations.unauthenticateGitHub
     });
 
     return data;

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"