Merge branch 'andrehadianto/design-system-components' of https://github.com/snowball-tools/snowballtools-base into ayungavis/T-4866-switch

.gitignore

@@ -1,7 +1 @@
 node_modules/
-yarn-error.log
-.yarnrc.yml
-.yarn/
-.yarnrc
-
-packages/backend/environments/local.toml

.vscode/settings.json

@@ -1,7 +1,6 @@
 {
   // IntelliSense for taiwind variants
   "tailwindCSS.experimental.classRegex": [
-    "tv\\('([^)]*)\\')",
-    "(?:'|\"|`)([^\"'`]*)(?:'|\"|`)"
+    ["tv\\((([^()]*|\\([^()]*\\))*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]
   ]
 }

README.md

@@ -1,15 +1,14 @@
-# snowballtools-base
+# snowballtools
 
 ## Setup
 
-- Clone the `snowballtools-base` repo
+- Clone the  `snowballtools` repo
 
   ```bash
   git clone git@github.com:snowball-tools/snowballtools-base.git
-  cd snowballtools-base
   ```
 
-- Install dependencies in root
+- In root of the repo, install depedencies
 
   ```bash
   yarn
@@ -21,212 +20,131 @@
   yarn build --ignore frontend
   ```
 
-Let us assume the following domains for backend and frontend
-  - Backend server: `api.snowballtools.com`
-  - Frontend app: `dashboard.snowballtools.com`
+## Backend
 
-- 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 --stack fixturenet-laconic-loaded deploy 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
-          ```
-      
-        - Get the REST and GQL endpoint ports of Laconicd and replace the ports for `registryConfig.restEndpoint` and `registryConfig.gqlEndpoint` in backend [config file](packages/backend/environments/local.toml)
-      
-          ```bash
-          # For registryConfig.restEndpoint
-          laconic-so --stack fixturenet-laconic-loaded deploy port laconicd 1317
-          # 0.0.0.0:32777
-      
-          # For registryConfig.gqlEndpoint
-          laconic-so --stack fixturenet-laconic-loaded deploy port laconicd 9473
-          # 0.0.0.0:32771
-          ```
-      
-        - 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
-      REACT_APP_GITHUB_CLIENT_ID = <CLIENT_ID>
-      ```
-    
-    - Set `REACT_APP_GITHUB_PWA_TEMPLATE_REPO` and `REACT_APP_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO` in [.env](packages/frontend/.env) file
-    
-      ```env
-      REACT_APP_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
-      REACT_APP_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
-        REACT_APP_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 `REACT_APP_WALLET_CONNECT_ID` in [.env](packages/frontend/.env) file
-      
-        ```env
-        REACT_APP_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
-        REACT_APP_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 `REACT_APP_WALLET_CONNECT_ID` in [.env](packages/frontend/.env) file
-      
-        ```env
-        REACT_APP_WALLET_CONNECT_ID = <Project_ID>
-        ```
-      
-      - The React application will be running in `http://localhost:3000/`
-
-## Development
-
-- Start the backend server
+- Change directory to `packages/backend`
 
   ```bash
-  yarn start:backend
+  cd packages/backend
   ```
 
-- Start the frontend
+- Load fixtures in database
+
+  ```bash
+  yarn test:db:load:fixtures
+  ```
+
+- Set `gitHub.oAuth.clientId` and `gitHub.oAuth.clientSecret` in backend [config file](packages/backend/environments/local.toml)
+  - Client ID and secret will be available after creating Github OAuth app
+    - https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/creating-an-oauth-app
+    - In "Homepage URL", type `http://localhost:3000`
+    - In "Authorization callback URL", type `http://localhost:3000/organization/projects/create`
+    - Generate a new client secret after app is created
+
+- 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 --stack fixturenet-laconic-loaded deploy 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
+  ```
+
+- Get the REST and GQL endpoint ports of Laconicd and replace the ports for `registryConfig.restEndpoint` and `registryConfig.gqlEndpoint` in backend [config file](packages/backend/environments/local.toml)
+
+  ```bash
+  # For registryConfig.restEndpoint
+  laconic-so --stack fixturenet-laconic-loaded deploy port laconicd 1317
+  # 0.0.0.0:32777
+
+  # For registryConfig.gqlEndpoint
+  laconic-so --stack fixturenet-laconic-loaded deploy port laconicd 9473
+  # 0.0.0.0:32771
+  ```
+
+- 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
+  - 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
+    ```
+    ...
+    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"
+    ...
+    ```
+
+- Start the server in `packages/backend`
 
   ```bash
   yarn start
   ```
+
+## Frontend
+
+- Change directory to `packages/frontend` in a new terminal
+
+  ```bash
+  cd packages/frontend
+  ```
+
+- Copy the graphQL endpoint from terminal and add the endpoint in the [.env](packages/frontend/.env) file present in `packages/frontend`
+
+  ```env
+  REACT_APP_GQL_SERVER_URL = 'http://localhost:8000/graphql'
+  ```
+
+- Copy the GitHub OAuth app client ID from previous steps and set it in frontend [.env](packages/frontend/.env) file
+
+  ```env
+  REACT_APP_GITHUB_CLIENT_ID = <CLIENT_ID>
+  ```
+
+- Set `REACT_APP_GITHUB_TEMPLATE_REPO` in [.env](packages/frontend/.env) file
+
+  ```env
+  REACT_APP_GITHUB_TEMPLATE_REPO = cerc-io/test-progressive-web-app
+  ```
+
+### Development
+
+- Start the React application
+
+  ```bash
+  yarn start
+  ```
+
+- The React application will be running in `http://localhost:3000/`
+
+### Production
+
+- Build the React application
+
+  ```bash
+  yarn build
+  ```
+
+- Use a web server for hosting static built files
+
+  ```bash
+  python3 -m http.server -d build 3000
+  ```
+

build-webapp.sh

@@ -10,11 +10,9 @@ if [[ -d "$DEST_DIR" ]]; then
 fi
 
 cat > $PKG_DIR/.env <<EOF
-REACT_APP_SERVER_URL = 'LACONIC_HOSTED_CONFIG_app_server_url'
+REACT_APP_GQL_SERVER_URL = 'LACONIC_HOSTED_CONFIG_app_gql_url'
 REACT_APP_GITHUB_CLIENT_ID = 'LACONIC_HOSTED_CONFIG_app_github_clientid'
-REACT_APP_GITHUB_PWA_TEMPLATE_REPO = 'LACONIC_HOSTED_CONFIG_app_github_pwa_templaterepo'
-REACT_APP_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO = 'LACONIC_HOSTED_CONFIG_app_github_image_upload_templaterepo'
-REACT_APP_WALLET_CONNECT_ID = 'LACONIC_HOSTED_CONFIG_app_wallet_connect_id'
+REACT_APP_GITHUB_TEMPLATE_REPO = 'LACONIC_HOSTED_CONFIG_app_github_templaterepo'
 EOF
 
 yarn || exit 1

packages/backend/.gitignore

@@ -1,3 +1,2 @@
 db
 dist
-environments/local.toml

packages/backend/environments/local.toml

@@ -2,11 +2,6 @@
   host = "127.0.0.1"
   port = 8000
   gqlPath = "/graphql"
-  [server.session]
-    secret = "p4yfpkqnddkui2iw7t6hbhwq74lbqs7bhobvmfhrowoi"
-    appOriginUrl = "http://localhost:3000"
-    trustProxy = false
-    domain = "localhost"
 
 [database]
   dbPath = "db/snowball"
@@ -24,11 +19,7 @@
   chainId = "laconic_9000-1"
   privateKey = ""
   bondId = ""
-  authority = ""
   [registryConfig.fee]
     amount = "200000"
     denom = "aphoton"
-    gas = "750000"
-
-[misc]
-  projectDomain = "apps.snowballtools.com"
+    gas = "550000"

packages/backend/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "main": "index.js",
   "dependencies": {
-    "@cerc-io/laconic-sdk": "^0.1.16",
+    "@cerc-io/laconic-sdk": "^0.1.14",
     "@graphql-tools/schema": "^10.0.2",
     "@graphql-tools/utils": "^10.0.12",
     "@octokit/oauth-app": "^6.1.0",
@@ -12,10 +12,8 @@
     "@types/node": "^20.11.0",
     "apollo-server-core": "^3.13.0",
     "apollo-server-express": "^3.13.0",
-    "cors": "^2.8.5",
     "debug": "^4.3.1",
     "express": "^4.18.2",
-    "express-session": "^1.18.0",
     "fs-extra": "^11.2.0",
     "graphql": "^16.8.1",
     "luxon": "^3.4.4",
@@ -44,7 +42,6 @@
     "test:db:delete": "DEBUG=snowball:* ts-node ./test/delete-db.ts"
   },
   "devDependencies": {
-    "@types/express-session": "^1.17.10",
     "@types/fs-extra": "^11.0.4",
     "@typescript-eslint/eslint-plugin": "^6.18.1",
     "@typescript-eslint/parser": "^6.18.1",

packages/backend/src/config.ts

@@ -1,18 +1,7 @@
-export interface SessionConfig {
-  secret: string;
-  appOriginUrl: string;
-  trustProxy: boolean;
-  domain: string;
-}
-
 export interface ServerConfig {
   host: string;
   port: number;
   gqlPath?: string;
-  sessionSecret: string;
-  appOriginUrl: string;
-  isProduction: boolean;
-  session: SessionConfig;
 }
 
 export interface DatabaseConfig {
@@ -34,7 +23,6 @@ export interface RegistryConfig {
   privateKey: string;
   bondId: string;
   fetchDeploymentRecordDelay: number;
-  authority: string;
   fee: {
     amount: string;
     denom: string;
@@ -42,14 +30,9 @@ export interface RegistryConfig {
   };
 }
 
-export interface MiscConfig {
-  projectDomain: string;
-}
-
 export interface Config {
   server: ServerConfig;
   database: DatabaseConfig;
   gitHub: GitHubConfig;
   registryConfig: RegistryConfig;
-  misc: MiscConfig;
 }

packages/backend/src/constants.ts

@@ -4,3 +4,11 @@ export const DEFAULT_CONFIG_FILE_PATH =
   process.env.SNOWBALL_BACKEND_CONFIG_FILE_PATH || 'environments/local.toml';
 
 export const DEFAULT_GQL_PATH = '/graphql';
+
+// Note: temporary hardcoded user, later to be derived from auth token
+export const USER_ID =
+  process.env.SNOWBALL_BACKEND_USER_ID ||
+  '59f4355d-9549-4aac-9b54-eeefceeabef0';
+
+export const PROJECT_DOMAIN =
+  process.env.SNOWBALL_BACKEND_PROJECT_DOMAIN || 'snowball.xyz';

packages/backend/src/database.ts

@@ -11,7 +11,7 @@ import assert from 'assert';
 import { customAlphabet } from 'nanoid';
 import { lowercase, numbers } from 'nanoid-dictionary';
 
-import { DatabaseConfig, MiscConfig } from './config';
+import { DatabaseConfig } from './config';
 import { User } from './entity/User';
 import { Organization } from './entity/Organization';
 import { Project } from './entity/Project';
@@ -19,10 +19,13 @@ import { Deployment } from './entity/Deployment';
 import { ProjectMember } from './entity/ProjectMember';
 import { EnvironmentVariable } from './entity/EnvironmentVariable';
 import { Domain } from './entity/Domain';
+import { PROJECT_DOMAIN } from './constants';
 import { getEntities, loadAndSaveData } from './utils';
 import { UserOrganization } from './entity/UserOrganization';
 
 const ORGANIZATION_DATA_PATH = '../test/fixtures/organizations.json';
+const USER_DATA_PATH = '../test/fixtures/users.json';
+const USER_ORGANIZATION_DATA_PATH = '../test/fixtures/user-organizations.json';
 
 const log = debug('snowball:database');
 
@@ -31,9 +34,8 @@ const nanoid = customAlphabet(lowercase + numbers, 8);
 // TODO: Fix order of methods
 export class Database {
   private dataSource: DataSource;
-  private projectDomain: string;
 
-  constructor ({ dbPath } : DatabaseConfig, { projectDomain } : MiscConfig) {
+  constructor ({ dbPath }: DatabaseConfig) {
     this.dataSource = new DataSource({
       type: 'better-sqlite3',
       database: dbPath,
@@ -41,8 +43,6 @@ export class Database {
       synchronize: true,
       logging: false
     });
-
-    this.projectDomain = projectDomain;
   }
 
   async init (): Promise<void> {
@@ -51,10 +51,36 @@ export class Database {
 
     const organizations = await this.getOrganizations({});
 
-    // Load an organization if none exist
     if (!organizations.length) {
-      const orgEntities = await getEntities(path.resolve(__dirname, ORGANIZATION_DATA_PATH));
-      await loadAndSaveData(Organization, this.dataSource, [orgEntities[0]]);
+      const orgEntities = await getEntities(
+        path.resolve(__dirname, ORGANIZATION_DATA_PATH)
+      );
+      const savedOrgs = await loadAndSaveData(Organization, this.dataSource, [
+        orgEntities[0]
+      ]);
+
+      // TODO: Remove user once authenticated
+      const userEntities = await getEntities(
+        path.resolve(__dirname, USER_DATA_PATH)
+      );
+      const savedUsers = await loadAndSaveData(User, this.dataSource, [
+        userEntities[0]
+      ]);
+
+      const userOrganizationRelations = {
+        member: savedUsers,
+        organization: savedOrgs
+      };
+
+      const userOrgEntities = await getEntities(
+        path.resolve(__dirname, USER_ORGANIZATION_DATA_PATH)
+      );
+      await loadAndSaveData(
+        UserOrganization,
+        this.dataSource,
+        [userOrgEntities[0]],
+        userOrganizationRelations
+      );
     }
   }
 
@@ -72,9 +98,9 @@ export class Database {
     return user;
   }
 
-  async updateUser (user: User, data: DeepPartial<User>): Promise<boolean> {
+  async updateUser (userId: string, data: DeepPartial<User>): Promise<boolean> {
     const userRepository = this.dataSource.getRepository(User);
-    const updateResult = await userRepository.update({ id: user.id }, data);
+    const updateResult = await userRepository.update({ id: userId }, data);
     assert(updateResult.affected);
 
     return updateResult.affected > 0;
@@ -114,13 +140,6 @@ export class Database {
     return userOrgs;
   }
 
-  async addUserOrganization (data: DeepPartial<UserOrganization>): Promise<UserOrganization> {
-    const userOrganizationRepository = this.dataSource.getRepository(UserOrganization);
-    const newUserOrganization = await userOrganizationRepository.save(data);
-
-    return newUserOrganization;
-  }
-
   async getProjects (options: FindManyOptions<Project>): Promise<Project[]> {
     const projectRepository = this.dataSource.getRepository(Project);
     const projects = await projectRepository.find(options);
@@ -436,7 +455,11 @@ export class Database {
     return Boolean(updateResult.affected);
   }
 
-  async addProject (user: User, organizationId: string, data: DeepPartial<Project>): Promise<Project> {
+  async addProject (
+    userId: string,
+    organizationId: string,
+    data: DeepPartial<Project>
+  ): Promise<Project> {
     const projectRepository = this.dataSource.getRepository(Project);
 
     // TODO: Check if organization exists
@@ -446,13 +469,15 @@ export class Database {
     // TODO: Set icon according to framework
     newProject.icon = '';
 
-    newProject.owner = user;
+    newProject.owner = Object.assign(new User(), {
+      id: userId
+    });
 
     newProject.organization = Object.assign(new Organization(), {
       id: organizationId
     });
 
-    newProject.subDomain = `${newProject.name}.${this.projectDomain}`;
+    newProject.subDomain = `${newProject.name}.${PROJECT_DOMAIN}`;
 
     return projectRepository.save(newProject);
   }

packages/backend/src/entity/Deployment.ts

@@ -87,11 +87,11 @@ export class Deployment {
   @Column('simple-json')
     applicationRecordData!: ApplicationRecord;
 
-  @Column('varchar', { nullable: true })
-    applicationDeploymentRequestId!: string | null;
+  @Column('varchar')
+    applicationDeploymentRequestId!: string;
 
-  @Column('simple-json', { nullable: true })
-    applicationDeploymentRequestData!: ApplicationDeploymentRequest | null;
+  @Column('simple-json')
+    applicationDeploymentRequestData!: ApplicationDeploymentRequest;
 
   @Column('varchar', { nullable: true })
     applicationDeploymentRecordId!: string | null;

packages/backend/src/entity/User.ts

@@ -12,15 +12,10 @@ import { UserOrganization } from './UserOrganization';
 
 @Entity()
 @Unique(['email'])
-@Unique(['ethAddress'])
 export class User {
   @PrimaryGeneratedColumn('uuid')
     id!: string;
 
-  // TODO: Set ethAddress as ID
-  @Column()
-    ethAddress!: string;
-
   @Column('varchar', { length: 255, nullable: true })
     name!: string | null;
 

packages/backend/src/entity/UserOrganization.ts

@@ -12,7 +12,7 @@ import {
 import { User } from './User';
 import { Organization } from './Organization';
 
-export enum Role {
+enum Role {
   Owner = 'Owner',
   Maintainer = 'Maintainer',
   Reader = 'Reader',

packages/backend/src/index.ts

@@ -19,7 +19,9 @@ const OAUTH_CLIENT_TYPE = 'oauth-app';
 
 export const main = async (): Promise<void> => {
   // TODO: get config path using cli
-  const { server, database, gitHub, registryConfig, misc } = await getConfig<Config>(DEFAULT_CONFIG_FILE_PATH);
+  const { server, database, gitHub, registryConfig } = await getConfig<Config>(
+    DEFAULT_CONFIG_FILE_PATH
+  );
 
   const app = new OAuthApp({
     clientType: OAUTH_CLIENT_TYPE,
@@ -27,7 +29,7 @@ export const main = async (): Promise<void> => {
     clientSecret: gitHub.oAuth.clientSecret
   });
 
-  const db = new Database(database, misc);
+  const db = new Database(database);
   await db.init();
 
   const registry = new Registry(registryConfig);

packages/backend/src/registry.ts

@@ -12,14 +12,12 @@ import {
   ApplicationDeploymentRequest
 } from './entity/Deployment';
 import { AppDeploymentRecord, PackageJSON } from './types';
-import { sleep } from './utils';
 
 const log = debug('snowball:registry');
 
 const APP_RECORD_TYPE = 'ApplicationRecord';
 const APP_DEPLOYMENT_REQUEST_TYPE = 'ApplicationDeploymentRequest';
 const APP_DEPLOYMENT_RECORD_TYPE = 'ApplicationDeploymentRecord';
-const SLEEP_DURATION = 1000;
 
 // TODO: Move registry code to laconic-sdk/watcher-ts
 export class Registry {
@@ -110,24 +108,19 @@ export class Registry {
     log('Application record data:', applicationRecord);
 
     // TODO: Discuss computation of CRN
-    const crn = this.getCrn(appName);
+    const crn = this.getCrn(packageJSON.name, appName);
     log(`Setting name: ${crn} for record ID: ${result.data.id}`);
 
-    await sleep(SLEEP_DURATION);
     await this.registry.setName(
       { cid: result.data.id, crn },
       this.registryConfig.privateKey,
       this.registryConfig.fee
     );
-
-    await sleep(SLEEP_DURATION);
     await this.registry.setName(
       { cid: result.data.id, crn: `${crn}@${applicationRecord.app_version}` },
       this.registryConfig.privateKey,
       this.registryConfig.fee
     );
-
-    await sleep(SLEEP_DURATION);
     await this.registry.setName(
       {
         cid: result.data.id,
@@ -144,16 +137,16 @@ export class Registry {
   }
 
   async createApplicationDeploymentRequest (data: {
-    deployment: Deployment,
-    appName: string,
-    repository: string,
-    environmentVariables: { [key: string]: string },
-    dns: string,
+    appName: string;
+    packageJsonName: string;
+    commitHash: string;
+    repository: string;
+    environmentVariables: { [key: string]: string };
   }): Promise<{
     applicationDeploymentRequestId: string;
     applicationDeploymentRequestData: ApplicationDeploymentRequest;
   }> {
-    const crn = this.getCrn(data.appName);
+    const crn = this.getCrn(data.packageJsonName, data.appName);
     const records = await this.registry.resolveNames([crn]);
     const applicationRecord = records[0];
 
@@ -167,9 +160,9 @@ export class Registry {
       version: '1.0.0',
       name: `${applicationRecord.attributes.name}@${applicationRecord.attributes.app_version}`,
       application: `${crn}@${applicationRecord.attributes.app_version}`,
-      dns: data.dns,
 
       // TODO: Not set in test-progressive-web-app CI
+      // dns: '$CERC_REGISTRY_DEPLOYMENT_SHORT_HOSTNAME',
       // deployment: '$CERC_REGISTRY_DEPLOYMENT_CRN',
 
       // https://git.vdb.to/cerc-io/laconic-registry-cli/commit/129019105dfb93bebcea02fde0ed64d0f8e5983b
@@ -181,11 +174,10 @@ export class Registry {
           "EEE LLL dd HH:mm:ss 'UTC' yyyy"
         )}`,
         repository: data.repository,
-        repository_ref: data.deployment.commitHash
+        repository_ref: data.commitHash
       })
     };
 
-    await sleep(SLEEP_DURATION);
     const result = await this.registry.setRecord(
       {
         privateKey: this.registryConfig.privateKey,
@@ -219,18 +211,19 @@ export class Registry {
       true
     );
 
-    // Filter records with ApplicationRecord ID and Deployment specific URL
+    // Filter records with ApplicationRecord ids
     return records.filter((record: AppDeploymentRecord) =>
       deployments.some(
         (deployment) =>
-          deployment.applicationRecordId === record.attributes.application &&
-          record.attributes.url.includes(deployment.id)
+          deployment.applicationRecordId === record.attributes.application
       )
     );
   }
 
-  getCrn (appName: string): string {
-    assert(this.registryConfig.authority, "Authority doesn't exist");
-    return `crn://${this.registryConfig.authority}/applications/${appName}`;
+  getCrn (packageJsonName: string, appName: string): string {
+    const [arg1] = packageJsonName.split('/');
+    const authority = arg1.replace('@', '');
+
+    return `crn://${authority}/applications/${appName}`;
   }
 }

packages/backend/src/resolvers.ts

@@ -14,19 +14,26 @@ export const createResolvers = async (service: Service): Promise<any> => {
     Query: {
       // TODO: add custom type for context
       user: (_: any, __: any, context: any) => {
-        return context.user;
+        return service.getUser(context.userId);
       },
 
-      organizations: async (_:any, __: any, context: any) => {
-        return service.getOrganizationsByUserId(context.user);
+      organizations: async (_: any, __: any, context: any) => {
+        return service.getOrganizationsByUserId(context.userId);
       },
 
       project: async (_: any, { projectId }: { projectId: string }) => {
         return service.getProjectById(projectId);
       },
 
-      projectsInOrganization: async (_: any, { organizationSlug }: {organizationSlug: string }, context: any) => {
-        return service.getProjectsInOrganization(context.user, organizationSlug);
+      projectsInOrganization: async (
+        _: any,
+        { organizationSlug }: { organizationSlug: string },
+        context: any
+      ) => {
+        return service.getProjectsInOrganization(
+          context.userId,
+          organizationSlug
+        );
       },
 
       deployments: async (_: any, { projectId }: { projectId: string }) => {
@@ -44,8 +51,12 @@ export const createResolvers = async (service: Service): Promise<any> => {
         return service.getProjectMembersByProjectId(projectId);
       },
 
-      searchProjects: async (_: any, { searchText }: { searchText: string }, context: any) => {
-        return service.searchProjects(context.user, searchText);
+      searchProjects: async (
+        _: any,
+        { searchText }: { searchText: string },
+        context: any
+      ) => {
+        return service.searchProjects(context.userId, searchText);
       },
 
       domains: async (
@@ -67,7 +78,10 @@ export const createResolvers = async (service: Service): Promise<any> => {
         context: any
       ) => {
         try {
-          return await service.removeProjectMember(context.user, projectMemberId);
+          return await service.removeProjectMember(
+            context.userId,
+            projectMemberId
+          );
         } catch (err) {
           log(err);
           return false;
@@ -174,7 +188,9 @@ export const createResolvers = async (service: Service): Promise<any> => {
         context: any
       ) => {
         try {
-          return Boolean(await service.updateDeploymentToProd(context.user, deploymentId));
+          return Boolean(
+            await service.updateDeploymentToProd(context.userId, deploymentId)
+          );
         } catch (err) {
           log(err);
           return false;
@@ -190,7 +206,11 @@ export const createResolvers = async (service: Service): Promise<any> => {
         context: any
       ) => {
         try {
-          return await service.addProject(context.user, organizationSlug, data);
+          return await service.addProject(
+            context.userId,
+            organizationSlug,
+            data
+          );
         } catch (err) {
           log(err);
           throw err;
@@ -215,7 +235,9 @@ export const createResolvers = async (service: Service): Promise<any> => {
         context: any
       ) => {
         try {
-          return Boolean(await service.redeployToProd(context.user, deploymentId));
+          return Boolean(
+            await service.redeployToProd(context.userId, deploymentId)
+          );
         } catch (err) {
           log(err);
           return false;
@@ -285,7 +307,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
         context: any
       ) => {
         try {
-          return await service.authenticateGitHub(code, context.user);
+          return await service.authenticateGitHub(code, context.userId);
         } catch (err) {
           log(err);
           return false;
@@ -294,7 +316,9 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       unauthenticateGitHub: async (_: any, __: object, context: any) => {
         try {
-          return service.unauthenticateGitHub(context.user, { gitHubToken: null });
+          return service.unauthenticateGitHub(context.userId, {
+            gitHubToken: null
+          });
         } catch (err) {
           log(err);
           return false;

packages/backend/src/routes/auth.ts

@@ -1,41 +0,0 @@
-import { Router } from 'express';
-import { SiweMessage, generateNonce } from 'siwe';
-
-const router = Router();
-
-router.get('/nonce', async (_, res) => {
-  res.send(generateNonce());
-});
-
-router.post('/validate', async (req, res) => {
-  const { message, signature } = req.body;
-  const { success, data } = await new SiweMessage(message).verify({
-    signature
-  });
-
-  if (success) {
-    req.session.address = data.address;
-    req.session.chainId = data.chainId;
-  }
-
-  res.send({ success });
-});
-
-router.get('/session', (req, res) => {
-  if (req.session.address && req.session.chainId) {
-    res.send({ address: req.session.address, chainId: req.session.chainId });
-  } else {
-    res.status(401).send({ error: 'Unauthorized: No active session' });
-  }
-});
-
-router.post('/logout', (req, res) => {
-  req.session.destroy((err) => {
-    if (err) {
-      return res.send({ success: false });
-    }
-    res.send({ success: true });
-  });
-});
-
-export default router;

packages/backend/src/server.ts

@@ -1,33 +1,22 @@
 import debug from 'debug';
 import express from 'express';
-import cors from 'cors';
 import { ApolloServer } from 'apollo-server-express';
 import { createServer } from 'http';
 import {
   ApolloServerPluginDrainHttpServer,
-  ApolloServerPluginLandingPageLocalDefault,
-  AuthenticationError
+  ApolloServerPluginLandingPageLocalDefault
 } from 'apollo-server-core';
-import session from 'express-session';
 
 import { TypeSource } from '@graphql-tools/utils';
 import { makeExecutableSchema } from '@graphql-tools/schema';
 
 import { ServerConfig } from './config';
-import { DEFAULT_GQL_PATH } from './constants';
+import { DEFAULT_GQL_PATH, USER_ID } from './constants';
 import githubRouter from './routes/github';
-import authRouter from './routes/auth';
 import { Service } from './service';
 
 const log = debug('snowball:server');
 
-declare module 'express-session' {
-  interface SessionData {
-    address: string;
-    chainId: number;
-  }
-}
-
 export const createAndStartServer = async (
   serverConfig: ServerConfig,
   typeDefs: TypeSource,
@@ -35,7 +24,6 @@ export const createAndStartServer = async (
   service: Service
 ): Promise<ApolloServer> => {
   const { host, port, gqlPath = DEFAULT_GQL_PATH } = serverConfig;
-  const { appOriginUrl, secret, domain, trustProxy } = serverConfig.session;
 
   const app = express();
 
@@ -51,19 +39,9 @@ export const createAndStartServer = async (
   const server = new ApolloServer({
     schema,
     csrfPrevention: true,
-    context: async ({ req }) => {
-      // https://www.apollographql.com/docs/apollo-server/v3/security/authentication#api-wide-authorization
-
-      const { address } = req.session;
-
-      if (!address) {
-        throw new AuthenticationError('Unauthorized: No active session');
-      }
-
-      // Find/create user from ETH address in request session
-      const user = await service.loadOrCreateUser(address);
-
-      return { user };
+    context: () => {
+      // TODO: Use userId derived from auth token
+      return { userId: USER_ID };
     },
     plugins: [
       // Proper shutdown for the HTTP server
@@ -74,49 +52,13 @@ export const createAndStartServer = async (
 
   await server.start();
 
-  app.use(cors({
-    origin: appOriginUrl,
-    credentials: true
-  }));
-
-  const sessionOptions: session.SessionOptions = {
-    secret: secret,
-    resave: false,
-    saveUninitialized: true,
-    cookie: {
-      secure: new URL(appOriginUrl).protocol === 'https:',
-      // TODO: Set cookie maxAge and handle cookie expiry in frontend
-      // maxAge: SESSION_COOKIE_MAX_AGE,
-      sameSite: new URL(appOriginUrl).protocol === 'https:' ? 'none' : 'lax'
-    }
-  };
-
-  if (domain) {
-    sessionOptions.cookie!.domain = domain;
-  }
-
-  if (trustProxy) {
-    // trust first proxy
-    app.set('trust proxy', 1);
-  }
-
-  app.use(
-    session(sessionOptions)
-  );
-
   server.applyMiddleware({
     app,
-    path: gqlPath,
-    cors: {
-      origin: [appOriginUrl],
-      credentials: true
-    }
+    path: gqlPath
   });
 
-  app.use(express.json());
-
   app.set('service', service);
-  app.use('/auth', authRouter);
+  app.use(express.json());
   app.use('/api/github', githubRouter);
 
   httpServer.listen(port, host, () => {

packages/backend/src/service.ts

@@ -16,7 +16,6 @@ import { User } from './entity/User';
 import { Registry } from './registry';
 import { GitHubConfig, RegistryConfig } from './config';
 import { AppDeploymentRecord, GitPushEventPayload, PackageJSON } from './types';
-import { Role } from './entity/UserOrganization';
 
 const log = debug('snowball:service');
 
@@ -161,36 +160,6 @@ export class Service {
     });
   }
 
-  async loadOrCreateUser (ethAddress: string): Promise<User> {
-    // Get user by ETH address
-    let user = await this.db.getUser({
-      where: {
-        ethAddress
-      }
-    });
-
-    if (!user) {
-      const [org] = await this.db.getOrganizations({});
-      assert(org, 'No organizations exists in database');
-
-      // Create user with new address
-      user = await this.db.addUser({
-        email: `${ethAddress}@example.com`,
-        name: ethAddress,
-        isVerified: true,
-        ethAddress
-      });
-
-      await this.db.addUserOrganization({
-        member: user,
-        organization: org,
-        role: Role.Owner
-      });
-    }
-
-    return user;
-  }
-
   async getOctokit (userId: string): Promise<Octokit> {
     const user = await this.db.getUser({ where: { id: userId } });
     assert(
@@ -201,8 +170,8 @@ export class Service {
     return new Octokit({ auth: user.gitHubToken });
   }
 
-  async getOrganizationsByUserId (user: User): Promise<Organization[]> {
-    const dbOrganizations = await this.db.getOrganizationsByUserId(user.id);
+  async getOrganizationsByUserId (userId: string): Promise<Organization[]> {
+    const dbOrganizations = await this.db.getOrganizationsByUserId(userId);
     return dbOrganizations;
   }
 
@@ -211,8 +180,14 @@ export class Service {
     return dbProject;
   }
 
-  async getProjectsInOrganization (user: User, organizationSlug: string): Promise<Project[]> {
-    const dbProjects = await this.db.getProjectsInOrganization(user.id, organizationSlug);
+  async getProjectsInOrganization (
+    userId: string,
+    organizationSlug: string
+  ): Promise<Project[]> {
+    const dbProjects = await this.db.getProjectsInOrganization(
+      userId,
+      organizationSlug
+    );
     return dbProjects;
   }
 
@@ -237,8 +212,11 @@ export class Service {
     return dbProjectMembers;
   }
 
-  async searchProjects (user: User, searchText: string): Promise<Project[]> {
-    const dbProjects = await this.db.getProjectsBySearchText(user.id, searchText);
+  async searchProjects (userId: string, searchText: string): Promise<Project[]> {
+    const dbProjects = await this.db.getProjectsBySearchText(
+      userId,
+      searchText
+    );
     return dbProjects;
   }
 
@@ -291,17 +269,20 @@ export class Service {
     return newProjectMember;
   }
 
-  async removeProjectMember (user: User, projectMemberId: string): Promise<boolean> {
+  async removeProjectMember (
+    userId: string,
+    projectMemberId: string
+  ): Promise<boolean> {
     const member = await this.db.getProjectMemberById(projectMemberId);
 
-    if (String(member.member.id) === user.id) {
+    if (String(member.member.id) === userId) {
       throw new Error('Invalid operation: cannot remove self');
     }
 
     const memberProject = member.project;
     assert(memberProject);
 
-    if (String(user.id) === String(memberProject.owner.id)) {
+    if (String(userId) === String(memberProject.owner.id)) {
       return this.db.removeProjectMemberById(projectMemberId);
     } else {
       throw new Error('Invalid operation: not authorized');
@@ -346,7 +327,10 @@ export class Service {
     return this.db.deleteEnvironmentVariable(environmentVariableId);
   }
 
-  async updateDeploymentToProd (user: User, deploymentId: string): Promise<Deployment> {
+  async updateDeploymentToProd (
+    userId: string,
+    deploymentId: string
+  ): Promise<Deployment> {
     const oldDeployment = await this.db.getDeployment({
       where: { id: deploymentId },
       relations: {
@@ -363,18 +347,16 @@ export class Service {
       { branch: oldDeployment.project.prodBranch }
     );
 
-    const octokit = await this.getOctokit(user.id);
+    const octokit = await this.getOctokit(userId);
 
-    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
-      });
+    const newDeployment = await this.createDeployment(userId, octokit, {
+      project: oldDeployment.project,
+      branch: oldDeployment.branch,
+      environment: Environment.Production,
+      domain: prodBranchDomains[0],
+      commitHash: oldDeployment.commitHash,
+      commitMessage: oldDeployment.commitMessage
+    });
 
     return newDeployment;
   }
@@ -382,7 +364,8 @@ export class Service {
   async createDeployment (
     userId: string,
     octokit: Octokit,
-    data: DeepPartial<Deployment>
+    data: DeepPartial<Deployment>,
+    recordData: { repoUrl?: string } = {}
   ): Promise<Deployment> {
     assert(data.project?.repository, 'Project repository not found');
     log(
@@ -406,10 +389,13 @@ export class Service {
 
     assert(packageJSON.name, "name field doesn't exist in package.json");
 
-    const repoUrl = (await octokit.rest.repos.get({
-      owner,
-      repo
-    })).data.html_url;
+    if (!recordData.repoUrl) {
+      const { data: repoDetails } = await octokit.rest.repos.get({
+        owner,
+        repo
+      });
+      recordData.repoUrl = repoDetails.html_url;
+    }
 
     // TODO: Set environment variables for each deployment (environment variables can`t be set in application record)
     const { applicationRecordId, applicationRecordData } =
@@ -418,18 +404,42 @@ export class Service {
         packageJSON,
         appType: data.project!.template!,
         commitHash: data.commitHash!,
-        repoUrl
+        repoUrl: recordData.repoUrl
+      });
+
+    const environmentVariables =
+      await this.db.getEnvironmentVariablesByProjectId(data.project.id!, {
+        environment: Environment.Production
+      });
+
+    const environmentVariablesObj = environmentVariables.reduce(
+      (acc, env) => {
+        acc[env.key] = env.value;
+
+        return acc;
+      },
+      {} as { [key: string]: string }
+    );
+
+    const { applicationDeploymentRequestId, applicationDeploymentRequestData } =
+      await this.registry.createApplicationDeploymentRequest({
+        appName: repo,
+        packageJsonName: packageJSON.name,
+        commitHash: data.commitHash!,
+        repository: recordData.repoUrl,
+        environmentVariables: environmentVariablesObj
       });
 
     // Update previous deployment with prod branch domain
     // TODO: Fix unique constraint error for domain
-    if (data.domain) {
-      await this.db.updateDeployment({
-        domainId: data.domain.id
-      }, {
+    await this.db.updateDeployment(
+      {
+        domainId: data.domain?.id
+      },
+      {
         domain: null
-      });
-    }
+      }
+    );
 
     const newDeployment = await this.db.addDeployment({
       project: data.project,
@@ -440,49 +450,25 @@ export class Service {
       status: DeploymentStatus.Building,
       applicationRecordId,
       applicationRecordData,
+      applicationDeploymentRequestId,
+      applicationDeploymentRequestData,
       domain: data.domain,
       createdBy: Object.assign(new User(), {
         id: userId
       })
     });
 
-    log(`Created deployment ${newDeployment.id} and published application record ${applicationRecordId}`);
-
-    const environmentVariables = await this.db.getEnvironmentVariablesByProjectId(data.project.id!, { environment: Environment.Production });
-
-    const environmentVariablesObj = environmentVariables.reduce((acc, env) => {
-      acc[env.key] = env.value;
-
-      return acc;
-    }, {} as { [key: string]: string });
-
-    const { applicationDeploymentRequestId, applicationDeploymentRequestData } = await this.registry.createApplicationDeploymentRequest(
-      {
-        deployment: newDeployment,
-        appName: repo,
-        repository: repoUrl,
-        environmentVariables: environmentVariablesObj,
-        dns: `${newDeployment.project.name}-${newDeployment.id}`
-      });
-
-    // To set project DNS
-    if (data.environment === Environment.Production) {
-      await this.registry.createApplicationDeploymentRequest(
-        {
-          deployment: newDeployment,
-          appName: repo,
-          repository: repoUrl,
-          environmentVariables: environmentVariablesObj,
-          dns: `${newDeployment.project.name}`
-        });
-    }
-
-    await this.db.updateDeploymentById(newDeployment.id, { applicationDeploymentRequestId, applicationDeploymentRequestData });
-
+    log(
+      `Created deployment ${newDeployment.id} and published application record ${applicationRecordId}`
+    );
     return newDeployment;
   }
 
-  async addProject (user: User, organizationSlug: string, data: DeepPartial<Project>): Promise<Project | undefined> {
+  async addProject (
+    userId: string,
+    organizationSlug: string,
+    data: DeepPartial<Project>
+  ): Promise<Project | undefined> {
     const organization = await this.db.getOrganization({
       where: {
         slug: organizationSlug
@@ -492,9 +478,9 @@ export class Service {
       throw new Error('Organization does not exist');
     }
 
-    const project = await this.db.addProject(user, organization.id, data);
+    const project = await this.db.addProject(userId, organization.id, data);
 
-    const octokit = await this.getOctokit(user.id);
+    const octokit = await this.getOctokit(userId);
     const [owner, repo] = project.repository.split('/');
 
     const {
@@ -506,8 +492,11 @@ export class Service {
       per_page: 1
     });
 
+    const { data: repoDetails } = await octokit.rest.repos.get({ owner, repo });
+
     // Create deployment with prod branch and latest commit
-    await this.createDeployment(user.id,
+    await this.createDeployment(
+      userId,
       octokit,
       {
         project,
@@ -516,6 +505,9 @@ export class Service {
         domain: null,
         commitHash: latestCommit.sha,
         commitMessage: latestCommit.commit.message
+      },
+      {
+        repoUrl: repoDetails.html_url
       }
     );
 
@@ -558,14 +550,8 @@ export class Service {
   }
 
   async handleGitHubPush (data: GitPushEventPayload): Promise<void> {
-    const { repository, ref, head_commit: headCommit, deleted } = data;
-
-    if (deleted) {
-      log(`Branch ${ref} deleted for project ${repository.full_name}`);
-      return;
-    }
-
-    log(`Handling GitHub push event from repository: ${repository.full_name}, branch: ${ref}`);
+    const { repository, ref, head_commit: headCommit } = data;
+    log(`Handling GitHub push event from repository: ${repository.full_name}`);
     const projects = await this.db.getProjects({
       where: { repository: repository.full_name }
     });
@@ -627,7 +613,10 @@ export class Service {
     return this.db.deleteDomainById(domainId);
   }
 
-  async redeployToProd (user: User, deploymentId: string): Promise<Deployment> {
+  async redeployToProd (
+    userId: string,
+    deploymentId: string
+  ): Promise<Deployment> {
     const oldDeployment = await this.db.getDeployment({
       relations: {
         project: true,
@@ -643,19 +632,17 @@ export class Service {
       throw new Error('Deployment not found');
     }
 
-    const octokit = await this.getOctokit(user.id);
+    const octokit = await this.getOctokit(userId);
 
-    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
-      });
+    const newDeployment = await this.createDeployment(userId, 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
+    });
 
     return newDeployment;
   }
@@ -791,17 +778,25 @@ export class Service {
     return updateResult;
   }
 
-  async authenticateGitHub (code:string, user: User): Promise<{token: string}> {
-    const { authentication: { token } } = await this.oauthApp.createToken({
+  async authenticateGitHub (
+    code: string,
+    userId: string
+  ): Promise<{ token: string }> {
+    const {
+      authentication: { token }
+    } = await this.oauthApp.createToken({
       code
     });
 
-    await this.db.updateUser(user, { gitHubToken: token });
+    await this.db.updateUser(userId, { gitHubToken: token });
 
     return { token };
   }
 
-  async unauthenticateGitHub (user: User, data: DeepPartial<User>): Promise<boolean> {
-    return this.db.updateUser(user, data);
+  async unauthenticateGitHub (
+    userId: string,
+    data: DeepPartial<User>
+  ): Promise<boolean> {
+    return this.db.updateUser(userId, data);
   }
 }

packages/backend/src/types.ts

@@ -24,7 +24,6 @@ export interface GitPushEventPayload {
     id: string;
     message: string;
   };
-  deleted: boolean;
 }
 
 export interface AppDeploymentRecordAttributes {

packages/backend/src/utils.ts

@@ -66,5 +66,3 @@ export const loadAndSaveData = async <Entity extends ObjectLiteral>(
 
   return savedEntity;
 };
-
-export const sleep = async (ms: number): Promise<void> => new Promise(resolve => setTimeout(resolve, ms));

packages/backend/test/fixtures/users.json

@@ -1,23 +1,20 @@
 [
   {
     "id": "59f4355d-9549-4aac-9b54-eeefceeabef0",
-    "name": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+    "name": "Snowball",
     "email": "snowball@snowballtools.xyz",
-    "isVerified": true,
-    "ethAddress": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
+    "isVerified": true
   },
   {
     "id": "e505b212-8da6-48b2-9614-098225dab34b",
-    "name": "0xbe0eb53f46cd790cd13851d5eff43d12404d33e8",
+    "name": "Alice Anderson",
     "email": "alice@snowballtools.xyz",
-    "isVerified": true,
-    "ethAddress": "0xbe0eb53f46cd790cd13851d5eff43d12404d33e8"
+    "isVerified": true
   },
   {
     "id": "cd892fad-9138-4aa2-a62c-414a32776ea7",
-    "name": "0x8315177ab297ba92a06054ce80a67ed4dbd7ed3a",
+    "name": "Bob Banner",
     "email": "bob@snowballtools.xyz",
-    "isVerified": true,
-    "ethAddress": "0x8315177ab297ba92a06054ce80a67ed4dbd7ed3a"
+    "isVerified": true
   }
 ]

packages/backend/test/initialize-registry.ts

@@ -11,13 +11,17 @@ const log = debug('snowball:initialize-registry');
 const DENOM = 'aphoton';
 const BOND_AMOUNT = '1000000000';
 
+// TODO: Get authority names from args
+const AUTHORITY_NAMES = ['snowballtools', 'cerc-io'];
+
 async function main () {
   const { registryConfig } = await getConfig<Config>(DEFAULT_CONFIG_FILE_PATH);
 
-  // TODO: Get authority names from args
-  const authorityNames = ['snowballtools', registryConfig.authority];
-
-  const registry = new Registry(registryConfig.gqlEndpoint, registryConfig.restEndpoint, registryConfig.chainId);
+  const registry = new Registry(
+    registryConfig.gqlEndpoint,
+    registryConfig.restEndpoint,
+    registryConfig.chainId
+  );
 
   const bondId = await registry.getNextBondId(registryConfig.privateKey);
   log('bondId:', bondId);
@@ -27,8 +31,12 @@ async function main () {
     registryConfig.fee
   );
 
-  for await (const name of authorityNames) {
-    await registry.reserveAuthority({ name }, registryConfig.privateKey, registryConfig.fee);
+  for await (const name of AUTHORITY_NAMES) {
+    await registry.reserveAuthority(
+      { name },
+      registryConfig.privateKey,
+      registryConfig.fee
+    );
     log('Reserved authority name:', name);
     await registry.setAuthorityBond(
       { name, bondId },

packages/backend/test/publish-deploy-records.ts

@@ -5,14 +5,16 @@ import path from 'path';
 import { Registry } from '@cerc-io/laconic-sdk';
 
 import { Config } from '../src/config';
-import { DEFAULT_CONFIG_FILE_PATH } from '../src/constants';
+import { DEFAULT_CONFIG_FILE_PATH, PROJECT_DOMAIN } from '../src/constants';
 import { getConfig } from '../src/utils';
 import { Deployment, DeploymentStatus } from '../src/entity/Deployment';
 
 const log = debug('snowball:publish-deploy-records');
 
 async function main () {
-  const { registryConfig, database, misc } = await getConfig<Config>(DEFAULT_CONFIG_FILE_PATH);
+  const { registryConfig, database } = await getConfig<Config>(
+    DEFAULT_CONFIG_FILE_PATH
+  );
 
   const registry = new Registry(
     registryConfig.gqlEndpoint,
@@ -40,7 +42,7 @@ async function main () {
   });
 
   for await (const deployment of deployments) {
-    const url = `${deployment.project.name}-${deployment.id}.${misc.projectDomain}`;
+    const url = `${deployment.project.name}-${deployment.id}.${PROJECT_DOMAIN}`;
 
     const applicationDeploymentRecord = {
       type: 'ApplicationDeploymentRecord',

packages/deployer/README.md

@@ -1,48 +0,0 @@
-# deployer
-
-- Install dependencies
-  ```bash
-  yarn
-  ```
-  ```bash
-  brew install jq # if you do not have jq installed already
-  ```
-
-- Run script to deploy app
-  ```
-  ./deploy-frontend.sh
-  ```
-
-- Commit the updated [ApplicationRecord](records/application-record.yml) and [ApplicationDeploymentRequest](records/application-deployment-request.yml) files to the repository
-
-## Notes
-
-- Any config env can be updated in [records/application-deployment-request.yml](records/application-deployment-request.yml)
-  ```yml
-  record:
-    ...
-    config:
-      env:
-        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
-
-- Check deployment status in [web-app deployer](https://console.laconic.com/deployer).
-- Check records in [registry console app](https://console.laconic.com/#/registry).
-
-- If deployment fails due to low bond balance
-  - Check balances
-    ```bash
-    # Account balance
-    yarn laconic cns account get
-
-    # 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.yml

@@ -1,9 +0,0 @@
-services:
-  cns:
-    restEndpoint: http://console.laconic.com:1317
-    gqlEndpoint: http://console.laconic.com:9473/api
-    userKey: 489c9dd3931c2a2d4dd77973302dc5eb01e2a49552f9d932c58d9da823512311
-    bondId: 99c0e9aec0ac1b8187faa579be3b54f93fafb6060ac1fd29170b860df605be32
-    chainId: laconic_9000-1
-    gas: 1200000
-    fees: 200000aphoton

packages/deployer/deploy-frontend.sh

@@ -1,95 +0,0 @@
-#!/bin/bash
-
-# Repository URL
-REPO_URL="https://git.vdb.to/cerc-io/snowballtools-base"
-
-# Get the latest commit hash from the repository
-LATEST_HASH=$(git ls-remote $REPO_URL HEAD | awk '{print $1}')
-
-# Extract version from ../frontend/package.json
-PACKAGE_VERSION=$(jq -r '.version' ../frontend/package.json)
-
-# Current date and time for note
-CURRENT_DATE_TIME=$(date -u)
-
-CONFIG_FILE=config.yml
-REGISTRY_BOND_ID="99c0e9aec0ac1b8187faa579be3b54f93fafb6060ac1fd29170b860df605be32"
-
-# Reference: https://git.vdb.to/cerc-io/test-progressive-web-app/src/branch/main/scripts
-
-# Get latest version from registry and increment application-record version
-NEW_APPLICATION_VERSION=$(yarn --silent laconic -c $CONFIG_FILE cns record list --type ApplicationRecord --all --name "snowballtools-base-frontend" 2>/dev/null | jq -r -s ".[] | sort_by(.createTime) | reverse | [ .[] | select(.bondId == \"$REGISTRY_BOND_ID\") ] | .[0].attributes.version" | awk -F. -v OFS=. '{$NF += 1 ; print}')
-
-if [ -z "$NEW_APPLICATION_VERSION" ] || [ "1" == "$NEW_APPLICATION_VERSION" ]; then
-  # Set application-record version if no previous records were found
-  NEW_APPLICATION_VERSION=0.0.1
-fi
-
-# Generate application-deployment-request.yml
-cat > ./records/application-deployment-request.yml <<EOF
-record:
-  type: ApplicationDeploymentRequest
-  version: '1.0.0'
-  name: snowballtools-base-frontend@$PACKAGE_VERSION
-  application: crn://snowballtools/applications/snowballtools-base-frontend@$PACKAGE_VERSION
-  dns: dashboard
-  config:
-    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-platform/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-platform/image-upload-pwa-example
-      LACONIC_HOSTED_CONFIG_app_wallet_connect_id: eda9ba18042a5ea500f358194611ece2
-  meta:
-    note: Added by Snowball @ $CURRENT_DATE_TIME
-    repository: "$REPO_URL"
-    repository_ref: $LATEST_HASH
-EOF
-
-# Generate application-record.yml with incremented version
-cat > ./records/application-record.yml <<EOF
-record:
-  type: ApplicationRecord
-  version: $NEW_APPLICATION_VERSION
-  repository_ref: $LATEST_HASH
-  repository: ["$REPO_URL"]
-  app_type: webapp
-  name: snowballtools-base-frontend
-  app_version: $PACKAGE_VERSION
-EOF
-
-echo "Files generated successfully."
-
-RECORD_FILE=records/application-record.yml
-
-# Publish ApplicationRecord
-RECORD_ID=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE | jq -r '.id')
-echo "ApplicationRecord published"
-echo $RECORD_ID
-
-# Set name to record
-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"
-sleep 2
-yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN@${LATEST_HASH}" "$RECORD_ID"
-sleep 2
-# Set name if latest release
-yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN" "$RECORD_ID"
-echo "$REGISTRY_APP_CRN set for ApplicationRecord"
-
-# Check if record found for REGISTRY_APP_CRN
-APP_RECORD=$(yarn --silent laconic -c $CONFIG_FILE cns name resolve "$REGISTRY_APP_CRN" | jq '.[0]')
-if [ -z "$APP_RECORD" ] || [ "null" == "$APP_RECORD" ]; then
-  echo "No record found for $REGISTRY_APP_CRN."
-  exit 1
-fi
-
-RECORD_FILE=records/application-deployment-request.yml
-
-sleep 2
-DEPLOYMENT_REQUEST_ID=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE | jq -r '.id')
-echo "ApplicationDeploymentRequest published"
-echo $DEPLOYMENT_REQUEST_ID

packages/deployer/package.json

@@ -1,9 +0,0 @@
-{
-  "name": "deployer",
-  "version": "1.0.0",
-  "main": "index.js",
-  "private": true,
-  "devDependencies": {
-    "@cerc-io/laconic-registry-cli": "^0.1.10"
-  }
-}

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

@@ -1,18 +0,0 @@
-record:
-  type: ApplicationDeploymentRequest
-  version: '1.0.0'
-  name: snowballtools-base-frontend@0.1.8
-  application: crn://snowballtools/applications/snowballtools-base-frontend@0.1.8
-  dns: dashboard
-  config:
-    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-platform/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-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
-    repository: "https://git.vdb.to/cerc-io/snowballtools-base"
-    repository_ref: 351db16336eacc3e1f9119ceb8d1282b8e27a27e

packages/deployer/records/application-record.yml

@@ -1,8 +0,0 @@
-record:
-  type: ApplicationRecord
-  version: 0.0.2
-  repository_ref: 351db16336eacc3e1f9119ceb8d1282b8e27a27e
-  repository: ["https://git.vdb.to/cerc-io/snowballtools-base"]
-  app_type: webapp
-  name: snowballtools-base-frontend
-  app_version: 0.1.8

packages/frontend/.env

@@ -0,0 +1,4 @@
+REACT_APP_GQL_SERVER_URL = 'http://localhost:8000/graphql'
+
+REACT_APP_GITHUB_CLIENT_ID =
+REACT_APP_GITHUB_TEMPLATE_REPO =

packages/frontend/.env.example

@@ -1,7 +0,0 @@
-REACT_APP_SERVER_URL = 'http://localhost:8000'
-
-REACT_APP_GITHUB_CLIENT_ID = 
-REACT_APP_GITHUB_PWA_TEMPLATE_REPO =
-REACT_APP_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO =
-
-REACT_APP_WALLET_CONNECT_ID = 

packages/frontend/.eslintrc.json

@@ -16,10 +16,5 @@
     "plugin:react/recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:prettier/recommended"
-  ],
-  "settings": {
-    "react": {
-      "version": "detect"
-    }
-  }
+  ]
 }

packages/frontend/.gitignore

@@ -13,7 +13,6 @@
 
 # misc
 .DS_Store
-.env
 .env.local
 .env.development.local
 .env.test.local

packages/frontend/.vscode/settings.json

@@ -0,0 +1,39 @@
+{
+  // eslint extension options
+  "eslint.enable": true,
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ],
+  "css.customData": [".vscode/tailwind.json"],
+  // prettier extension setting
+  "editor.formatOnSave": true,
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[javascriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "editor.rulers": [80],
+  "editor.codeActionsOnSave": [
+    "source.addMissingImports",
+    "source.fixAll",
+    "source.organizeImports"
+  ],
+  // Show in vscode "Problems" tab when there are errors
+  "typescript.tsserver.experimental.enableProjectDiagnostics": true,
+  // Use absolute import for typescript files
+  "typescript.preferences.importModuleSpecifier": "non-relative",
+  // IntelliSense for taiwind variants
+  "tailwindCSS.experimental.classRegex": [
+    ["tv\\((([^()]*|\\([^()]*\\))*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]
+  ]
+}

packages/frontend/logo.svg

@@ -1,7 +0,0 @@
-<svg width="500" height="500" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="500" height="500" fill="#0F86F5"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M191.873 125.126C224.893 126.765 250.458 150.121 274.042 172.995C297.925 196.158 323.089 221.108 324.868 254.114C326.718 288.42 308.902 321.108 283.281 344.355C258.67 366.687 225.288 373.859 191.873 374.788C157.228 375.752 119.038 374.394 95.1648 349.588C71.6207 325.125 74.6696 287.843 75.7341 254.114C76.7518 221.865 79.2961 188.525 101.009 164.41C123.845 139.047 157.543 123.423 191.873 125.126Z" fill="#4BA4F7"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M229.373 125.126C262.393 126.765 287.958 150.121 311.542 172.995C335.425 196.158 360.589 221.108 362.368 254.114C364.218 288.42 346.402 321.108 320.781 344.355C296.17 366.687 262.788 373.859 229.373 374.788C194.728 375.752 156.538 374.394 132.665 349.588C109.121 325.125 112.17 287.843 113.234 254.114C114.252 221.865 116.796 188.525 138.509 164.41C161.345 139.047 195.043 123.423 229.373 125.126Z" fill="#8AC4FA"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M266.873 125.126C299.893 126.765 325.458 150.121 349.042 172.995C372.925 196.158 398.089 221.108 399.868 254.114C401.718 288.42 383.902 321.108 358.281 344.355C333.67 366.687 300.288 373.859 266.873 374.788C232.228 375.752 194.038 374.394 170.165 349.588C146.621 325.125 149.67 287.843 150.734 254.114C151.752 221.865 154.296 188.525 176.009 164.41C198.845 139.047 232.543 123.423 266.873 125.126Z" fill="#CAE4FD"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M304.373 125.126C337.393 126.765 362.958 150.121 386.542 172.995C410.425 196.158 435.589 221.108 437.368 254.114C439.218 288.42 421.402 321.108 395.781 344.355C371.17 366.687 337.788 373.859 304.373 374.788C269.728 375.752 231.538 374.394 207.665 349.588C184.121 325.125 187.17 287.843 188.234 254.114C189.252 221.865 191.796 188.525 213.509 164.41C236.345 139.047 270.043 123.423 304.373 125.126Z" fill="white"/>
-</svg>

packages/frontend/package.json

@@ -1,21 +1,16 @@
 {
   "name": "frontend",
-  "version": "0.1.8",
+  "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@fontsource-variable/jetbrains-mono": "^5.0.19",
     "@fontsource/inter": "^5.0.16",
     "@material-tailwind/react": "^2.1.7",
     "@radix-ui/react-avatar": "^1.0.4",
     "@radix-ui/react-checkbox": "^1.0.4",
-    "@radix-ui/react-dialog": "^1.0.5",
-    "@radix-ui/react-popover": "^1.0.7",
-    "@radix-ui/react-radio-group": "^1.1.3",
     "@radix-ui/react-switch": "^1.0.3",
+    "@radix-ui/react-radio-group": "^1.1.3",
     "@radix-ui/react-tabs": "^1.0.4",
-    "@radix-ui/react-toast": "^1.1.5",
     "@radix-ui/react-tooltip": "^1.0.7",
-    "@tanstack/react-query": "^5.22.2",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
@@ -23,17 +18,12 @@
     "@types/node": "^16.18.68",
     "@types/react": "^18.2.42",
     "@types/react-dom": "^18.2.17",
-    "@web3modal/siwe": "^4.0.5",
-    "@web3modal/wagmi": "^4.0.5",
     "assert": "^2.1.0",
-    "axios": "^1.6.7",
     "clsx": "^2.1.0",
     "date-fns": "^3.3.1",
-    "downshift": "^8.3.2",
+    "downshift": "^8.2.3",
     "eslint-config-react-app": "^7.0.1",
-    "framer-motion": "^11.0.8",
     "gql-client": "^1.0.0",
-    "lottie-react": "^2.4.0",
     "luxon": "^3.4.4",
     "octokit": "^3.1.2",
     "react": "^18.2.0",
@@ -48,13 +38,10 @@
     "react-router-dom": "^6.20.1",
     "react-scripts": "5.0.1",
     "react-timer-hook": "^3.0.7",
-    "siwe": "^2.1.4",
     "tailwind-variants": "^0.2.0",
     "typescript": "^4.9.5",
-    "usehooks-ts": "^2.15.1",
+    "usehooks-ts": "^2.10.0",
     "vertical-stepper-nav": "^1.0.2",
-    "viem": "^2.7.11",
-    "wagmi": "^2.5.7",
     "web-vitals": "^2.1.4"
   },
   "scripts": {

packages/frontend/public/browserconfig.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-    <msapplication>
-        <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
-            <TileColor>#2d89ef</TileColor>
-        </tile>
-    </msapplication>
-</browserconfig>

packages/frontend/public/index.html

@@ -2,34 +2,42 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="description" content="snowball tools dashboard" />
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="Web site created using create-react-app"
+    />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <link
-      rel="apple-touch-icon"
-      sizes="180x180"
-      href="%PUBLIC_URL%/apple-touch-icon.png"
-    />
-    <link
-      rel="icon"
-      type="image/png"
-      sizes="32x32"
-      href="%PUBLIC_URL%/favicon-32x32.png"
-    />
-    <link
-      rel="icon"
-      type="image/png"
-      sizes="16x16"
-      href="%PUBLIC_URL%/favicon-16x16.png"
-    />
-    <link rel="manifest" href="%PUBLIC_URL%/site.webmanifest" />
-    <meta name="msapplication-TileColor" content="#2d89ef" />
-    <meta name="theme-color" content="#ffffff" />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
     <title>Snowball</title>
   </head>
   <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
   </body>
 </html>

packages/frontend/public/logo.svg

@@ -1 +0,0 @@
-<svg width="500" height="500" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg"><rect width="500" height="500" fill="#0F86F5"/><path fill-rule="evenodd" clip-rule="evenodd" d="M191.873 125.126C224.893 126.765 250.458 150.121 274.042 172.995C297.925 196.158 323.089 221.108 324.868 254.114C326.718 288.42 308.902 321.108 283.281 344.355C258.67 366.687 225.288 373.859 191.873 374.788C157.228 375.752 119.038 374.394 95.1648 349.588C71.6207 325.125 74.6696 287.843 75.7341 254.114C76.7518 221.865 79.2961 188.525 101.009 164.41C123.845 139.047 157.543 123.423 191.873 125.126Z" fill="#4BA4F7"/><path fill-rule="evenodd" clip-rule="evenodd" d="M229.373 125.126C262.393 126.765 287.958 150.121 311.542 172.995C335.425 196.158 360.589 221.108 362.368 254.114C364.218 288.42 346.402 321.108 320.781 344.355C296.17 366.687 262.788 373.859 229.373 374.788C194.728 375.752 156.538 374.394 132.665 349.588C109.121 325.125 112.17 287.843 113.234 254.114C114.252 221.865 116.796 188.525 138.509 164.41C161.345 139.047 195.043 123.423 229.373 125.126Z" fill="#8AC4FA"/><path fill-rule="evenodd" clip-rule="evenodd" d="M266.873 125.126C299.893 126.765 325.458 150.121 349.042 172.995C372.925 196.158 398.089 221.108 399.868 254.114C401.718 288.42 383.902 321.108 358.281 344.355C333.67 366.687 300.288 373.859 266.873 374.788C232.228 375.752 194.038 374.394 170.165 349.588C146.621 325.125 149.67 287.843 150.734 254.114C151.752 221.865 154.296 188.525 176.009 164.41C198.845 139.047 232.543 123.423 266.873 125.126Z" fill="#CAE4FD"/><path fill-rule="evenodd" clip-rule="evenodd" d="M304.373 125.126C337.393 126.765 362.958 150.121 386.542 172.995C410.425 196.158 435.589 221.108 437.368 254.114C439.218 288.42 421.402 321.108 395.781 344.355C371.17 366.687 337.788 373.859 304.373 374.788C269.728 375.752 231.538 374.394 207.665 349.588C184.121 325.125 187.17 287.843 188.234 254.114C189.252 221.865 191.796 188.525 213.509 164.41C236.345 139.047 270.043 123.423 304.373 125.126Z" fill="white"/></svg>

packages/frontend/public/site.webmanifest

@@ -1,19 +0,0 @@
-{
-  "name": "Snowball Tools Dashboard",
-  "short_name": "snowball tools",
-  "icons": [
-    {
-      "src": "/android-chrome-192x192.png",
-      "sizes": "192x192",
-      "type": "image/png"
-    },
-    {
-      "src": "/android-chrome-512x512.png",
-      "sizes": "512x512",
-      "type": "image/png"
-    }
-  ],
-  "theme_color": "#ffffff",
-  "background_color": "#ffffff",
-  "display": "standalone"
-}

packages/frontend/public/wavy-border-fill.svg

@@ -1,4 +0,0 @@
-<svg width="19" height="4" viewBox="0 0 19 4" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M-12.6045 1.27694L-19 3.9698H37.5L34.8955 2.66266L31.6045 1.27694C29.6192 0.441052 27.3808 0.441052 25.3955 1.27694L22.1045 2.66266C20.1192 3.49855 17.8808 3.49855 15.8955 2.66266L12.6045 1.27694C10.6192 0.441052 8.38078 0.441052 6.39555 1.27694L3.10446 2.66266C1.11922 3.49855 -1.11922 3.49855 -3.10445 2.66266L-6.39554 1.27694C-8.38078 0.441052 -10.6192 0.441052 -12.6045 1.27694Z" fill="currentColor"/>
-<path d="M25.7836 1.58773L22.4925 2.97346C20.3832 3.86159 18.0049 3.86159 15.8955 2.97346L12.6045 1.58774C10.7433 0.804089 8.64476 0.804088 6.7836 1.58773L3.49251 2.97346C1.3832 3.86159 -0.99514 3.86159 -3.10445 2.97346L-6.39554 1.58774C-8.2567 0.804089 -10.3552 0.804088 -12.2164 1.58773L-18.6119 4.2806L-19 3.35896L-12.6045 0.666099C-10.4951 -0.222033 -8.1168 -0.222033 -6.00749 0.6661L-2.7164 2.05182C-0.855238 2.83547 1.2433 2.83547 3.10446 2.05182L6.39555 0.666099C8.50486 -0.222033 10.8832 -0.222033 12.9925 0.6661L16.2836 2.05182C18.1448 2.83547 20.2433 2.83547 22.1045 2.05182L25.3955 0.666099L25.7836 1.58773Z" fill="currentColor"/>
-</svg>

packages/frontend/public/wavy-border-line-and-fill.svg

@@ -1,15 +0,0 @@
-<svg width="19" height="4" viewBox="0 0 19 4" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1177_19315)">
-<path d="M-12.6045 1.27694L-19 3.9698H37.5L34.8955 2.66266L31.6045 1.27694C29.6192 0.441052 27.3808 0.441052 25.3955 1.27694L22.1045 2.66266C20.1192 3.49855 17.8808 3.49855 15.8955 2.66266L12.6045 1.27694C10.6192 0.441052 8.38078 0.441052 6.39555 1.27694L3.10446 2.66266C1.11922 3.49855 -1.11922 3.49855 -3.10445 2.66266L-6.39554 1.27694C-8.38078 0.441052 -10.6192 0.441052 -12.6045 1.27694Z" fill="url(#paint0_linear_1177_19315)"/>
-<path d="M25.7836 1.58773L22.4925 2.97346C20.3832 3.86159 18.0049 3.86159 15.8955 2.97346L12.6045 1.58774C10.7433 0.804089 8.64476 0.804088 6.7836 1.58773L3.49251 2.97346C1.3832 3.86159 -0.99514 3.86159 -3.10445 2.97346L-6.39554 1.58774C-8.2567 0.804089 -10.3552 0.804088 -12.2164 1.58773L-18.6119 4.2806L-19 3.35896L-12.6045 0.666099C-10.4951 -0.222033 -8.1168 -0.222033 -6.00749 0.6661L-2.7164 2.05182C-0.855238 2.83547 1.2433 2.83547 3.10446 2.05182L6.39555 0.666099C8.50486 -0.222033 10.8832 -0.222033 12.9925 0.6661L16.2836 2.05182C18.1448 2.83547 20.2433 2.83547 22.1045 2.05182L25.3955 0.666099L25.7836 1.58773Z" fill="#DBEBF9"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_1177_19315" x1="9.25" y1="0.650024" x2="9.25" y2="3.9698" gradientUnits="userSpaceOnUse">
-<stop stop-color="#EBF6FF"/>
-<stop offset="1" stop-color="#F7FCFF" stop-opacity="0"/>
-</linearGradient>
-<clipPath id="clip0_1177_19315">
-<rect width="19" height="4" fill="white"/>
-</clipPath>
-</defs>
-</svg>

packages/frontend/public/wavy-border-line.svg

@@ -1,10 +0,0 @@
-<svg width="19" height="4" viewBox="0 0 19 4" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1175_19292)">
-<path d="M-9.5 0L-3.10445 2.69286C-1.11922 3.52875 1.11922 3.52875 3.10446 2.69286L6.39555 1.30714C8.38078 0.47125 10.6192 0.47125 12.6045 1.30714L15.8955 2.69286C17.8808 3.52875 20.1192 3.52875 22.1045 2.69286L28.5 0" stroke="#082F56" stroke-opacity="0.1"/>
-</g>
-<defs>
-<clipPath id="clip0_1175_19292">
-<rect width="19" height="4" fill="white"/>
-</clipPath>
-</defs>
-</svg>

packages/frontend/src/App.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { createBrowserRouter, RouterProvider } from 'react-router-dom';
 
+import OrgSlug from './pages/OrgSlug';
 import Projects from './pages/org-slug';
 import Settings from './pages/org-slug/Settings';
 import {
@@ -8,14 +9,13 @@ import {
   projectsRoutesWithoutSearch,
 } from './pages/org-slug/projects/routes';
 import ProjectSearchLayout from './layouts/ProjectSearch';
+import { OctokitProvider } from './context/OctokitContext';
 import Index from './pages';
-import Login from './pages/Login';
-import { DashboardLayout } from 'pages/org-slug/layout';
 
 const router = createBrowserRouter([
   {
     path: ':orgSlug',
-    element: <DashboardLayout />,
+    element: <OrgSlug />,
     children: [
       {
         element: <ProjectSearchLayout />,
@@ -44,14 +44,14 @@ const router = createBrowserRouter([
     path: '/',
     element: <Index />,
   },
-  {
-    path: '/login',
-    element: <Login />,
-  },
 ]);
 
 function App() {
-  return <RouterProvider router={router} />;
+  return (
+    <OctokitProvider>
+      <RouterProvider router={router} />
+    </OctokitProvider>
+  );
 }
 
 export default App;

packages/frontend/src/assets/templates.json

@@ -0,0 +1,27 @@
+[
+  {
+    "id": "1",
+    "name": "Progressive Web App (PWA)",
+    "icon": "^"
+  },
+  {
+    "id": "2",
+    "name": "Kotlin",
+    "icon": "^"
+  },
+  {
+    "id": "3",
+    "name": "React Native",
+    "icon": "^"
+  },
+  {
+    "id": "4",
+    "name": "Swift",
+    "icon": "^"
+  },
+  {
+    "id": "5",
+    "name": "Web app",
+    "icon": "^"
+  }
+]

packages/frontend/src/assets/templates.ts

@@ -1,37 +0,0 @@
-export default [
-  {
-    id: '1',
-    name: 'Progressive Web App (PWA)',
-    icon: 'pwa',
-    repoFullName: `${process.env.REACT_APP_GITHUB_PWA_TEMPLATE_REPO}`,
-    isComingSoon: false,
-  },
-  {
-    id: '2',
-    name: 'Image Upload PWA',
-    icon: 'pwa',
-    repoFullName: `${process.env.REACT_APP_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO}`,
-    isComingSoon: false,
-  },
-  {
-    id: '3',
-    name: 'Kotlin',
-    icon: 'kotlin',
-    repoFullName: '',
-    isComingSoon: true,
-  },
-  {
-    id: '4',
-    name: 'React Native',
-    icon: 'react-native',
-    repoFullName: '',
-    isComingSoon: true,
-  },
-  {
-    id: '5',
-    name: 'Swift',
-    icon: 'swift',
-    repoFullName: '',
-    isComingSoon: true,
-  },
-];

packages/frontend/src/components/DatePicker.tsx

@@ -126,8 +126,7 @@ const DatePicker = ({
           crossOrigin={undefined}
         />
       </PopoverHandler>
-      {/* TODO: Figure out what placeholder is for */}
-      <PopoverContent placeholder={''}>
+      <PopoverContent>
         {mode === 'single' && (
           <DayPicker
             mode="single"
@@ -146,23 +145,19 @@ const DatePicker = ({
             />
             <HorizontalLine />
             <div className="flex justify-end">
-              {/* TODO: Figure out what placeholder is for */}
               <Button
                 size="sm"
                 className="rounded-full mr-2"
                 variant="outlined"
                 onClick={() => setIsOpen(false)}
-                placeholder={''}
               >
                 Cancel
               </Button>
-              {/* TODO: Figure out what placeholder is for */}
               <Button
                 size="sm"
                 className="rounded-full"
                 color="gray"
                 onClick={() => handleRangeSelect()}
-                placeholder={''}
               >
                 Select
               </Button>

packages/frontend/src/components/FormatMilliSecond.tsx

@@ -1,22 +1,13 @@
 import { Duration } from 'luxon';
-import React, { ComponentPropsWithoutRef } from 'react';
-import { cn } from 'utils/classnames';
+import React from 'react';
 
-export interface FormatMilliSecondProps
-  extends ComponentPropsWithoutRef<'div'> {
-  time: number;
-}
-
-const FormatMillisecond = ({ time, ...props }: FormatMilliSecondProps) => {
+const FormatMillisecond = ({ time }: { time: number }) => {
   const formatTime = Duration.fromMillis(time)
     .shiftTo('days', 'hours', 'minutes', 'seconds')
     .toObject();
 
   return (
-    <div
-      {...props}
-      className={cn('text-sm text-elements-mid-em', props?.className)}
-    >
+    <div>
       {formatTime.days !== 0 && <span>{formatTime.days}d&nbsp;</span>}
       {formatTime.hours !== 0 && <span>{formatTime.hours}h&nbsp;</span>}
       {formatTime.minutes !== 0 && <span>{formatTime.minutes}m&nbsp;</span>}

packages/frontend/src/components/HorizontalLine.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
 const HorizontalLine = () => {
-  return <hr className="h-px bg-gray-100 border-0" />;
+  return <hr className="h-px bg-gray-300 border-0" />;
 };
 
 export default HorizontalLine;

packages/frontend/src/components/Logo.tsx

@@ -1,24 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router-dom';
-import { Heading } from './shared/Heading';
-
-interface LogoProps {
-  orgSlug?: string;
-}
-
-export const Logo = ({ orgSlug }: LogoProps) => {
-  return (
-    <Link to={`/${orgSlug}`}>
-      <div className="flex items-center gap-3 px-0 lg:px-2">
-        <img
-          src="/logo.svg"
-          alt="Snowball Logo"
-          className="lg:h-10 lg:w-10 h-8 w-8 rounded-lg"
-        />
-        <Heading className="lg:text-[24px] text-[19px] font-semibold">
-          Snowball
-        </Heading>
-      </div>
-    </Link>
-  );
-};

packages/frontend/src/components/SearchBar.tsx

@@ -1,24 +1,33 @@
 import React, { forwardRef, RefAttributes } from 'react';
 
-import { SearchIcon } from './shared/CustomIcon';
-import { Input, InputProps } from './shared/Input';
+import { Input, InputProps } from '@material-tailwind/react';
 
 const SearchBar: React.ForwardRefRenderFunction<
   HTMLInputElement,
   InputProps & RefAttributes<HTMLInputElement>
-> = ({ value, onChange, placeholder = 'Search', ...props }) => {
+> = ({ value, onChange, placeholder = 'Search', ...props }, ref) => {
   return (
-    <div className="relative flex w-full">
+    <div className="relative flex w-full gap-2">
       <Input
-        leftIcon={<SearchIcon />}
         onChange={onChange}
         value={value}
         type="search"
         placeholder={placeholder}
-        appearance="borderless"
-        className="w-full lg:w-[459px]"
+        containerProps={{
+          className: 'min-w-[288px]',
+        }}
+        className="!border-t-blue-gray-300 pl-9 placeholder:text-blue-gray-300 focus:!border-blue-gray-300"
+        labelProps={{
+          className: 'before:content-none after:content-none',
+        }}
+        // TODO: Debug issue: https://github.com/creativetimofficial/material-tailwind/issues/427
+        crossOrigin={undefined}
         {...props}
+        inputRef={ref}
       />
+      <div className="!absolute left-3 top-[13px]">
+        <i>^</i>
+      </div>
     </div>
   );
 };

packages/frontend/src/components/Sidebar.tsx

@@ -0,0 +1,86 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import { Link, NavLink, useNavigate, useParams } from 'react-router-dom';
+import { Organization } from 'gql-client';
+
+import { Typography, Option } from '@material-tailwind/react';
+
+import { useGQLClient } from '../context/GQLClientContext';
+import AsyncSelect from './shared/AsyncSelect';
+
+const Sidebar = () => {
+  const { orgSlug } = useParams();
+  const navigate = useNavigate();
+  const client = useGQLClient();
+
+  const [selectedOrgSlug, setSelectedOrgSlug] = useState(orgSlug);
+  const [organizations, setOrganizations] = useState<Organization[]>([]);
+
+  const fetchUserOrganizations = useCallback(async () => {
+    const { organizations } = await client.getOrganizations();
+    setOrganizations(organizations);
+  }, [orgSlug]);
+
+  useEffect(() => {
+    fetchUserOrganizations();
+    setSelectedOrgSlug(orgSlug);
+  }, [orgSlug]);
+
+  return (
+    <div className="flex flex-col h-full p-4">
+      <div className="grow">
+        <div>
+          <Link to={`/${orgSlug}`}>
+            <h3 className="text-black text-2xl">Snowball</h3>
+          </Link>
+        </div>
+        <AsyncSelect
+          className="bg-white py-2"
+          value={selectedOrgSlug}
+          onChange={(value) => {
+            setSelectedOrgSlug(value!);
+            navigate(`/${value}`);
+          }}
+          selected={(_, index) => (
+            <div className="flex gap-2">
+              <div>^</div>
+              <div>
+                <span>{organizations[index!]?.name}</span>
+                <Typography>Organization</Typography>
+              </div>
+            </div>
+          )}
+        >
+          {/* TODO: Show label organization and manage in option */}
+          {organizations.map((org) => (
+            <Option key={org.id} value={org.slug}>
+              ^ {org.name}
+              {org.slug === selectedOrgSlug && <p className="float-right">^</p>}
+            </Option>
+          ))}
+        </AsyncSelect>
+        <div>
+          <NavLink
+            to={`/${orgSlug}`}
+            className={({ isActive }) => (isActive ? 'text-blue-500' : '')}
+          >
+            <Typography>Projects</Typography>
+          </NavLink>
+        </div>
+        <div>
+          <NavLink
+            to={`/${orgSlug}/settings`}
+            className={({ isActive }) => (isActive ? 'text-blue-500' : '')}
+          >
+            <Typography>Settings</Typography>
+          </NavLink>
+        </div>
+      </div>
+      <div className="grow flex flex-col justify-end">
+        <div>Documentation</div>
+        <div>Support</div>
+      </div>
+    </div>
+  );
+};
+
+export default Sidebar;

packages/frontend/src/components/StopWatch.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useStopwatch } from 'react-timer-hook';
 
-import FormatMillisecond, { FormatMilliSecondProps } from './FormatMilliSecond';
+import FormatMillisecond from './FormatMilliSecond';
 
 const setStopWatchOffset = (time: string) => {
   const providedTime = new Date(time);
@@ -11,17 +11,13 @@ const setStopWatchOffset = (time: string) => {
   return currentTime;
 };
 
-interface StopwatchProps extends Omit<FormatMilliSecondProps, 'time'> {
-  offsetTimestamp: Date;
-}
-
-const Stopwatch = ({ offsetTimestamp, ...props }: StopwatchProps) => {
+const Stopwatch = ({ offsetTimestamp }: { offsetTimestamp: Date }) => {
   const { totalSeconds } = useStopwatch({
     autoStart: true,
     offsetTimestamp: offsetTimestamp,
   });
 
-  return <FormatMillisecond time={totalSeconds * 1000} {...props} />;
+  return <FormatMillisecond time={totalSeconds * 1000} />;
 };
 
 export { Stopwatch, setStopWatchOffset };

packages/frontend/src/components/projects/Dialog/CancelDeploymentDialog.tsx

@@ -1,30 +0,0 @@
-import ConfirmDialog, {
-  ConfirmDialogProps,
-} from 'components/shared/ConfirmDialog';
-import React from 'react';
-
-interface CancelDeploymentDialogProps extends ConfirmDialogProps {}
-
-export const CancelDeploymentDialog = ({
-  open,
-  handleCancel,
-  handleConfirm,
-  ...props
-}: CancelDeploymentDialogProps) => {
-  return (
-    <ConfirmDialog
-      {...props}
-      dialogTitle="Cancel deployment?"
-      handleCancel={handleCancel}
-      open={open}
-      confirmButtonTitle="Yes, cancel deployment"
-      handleConfirm={handleConfirm}
-      confirmButtonProps={{ variant: 'danger' }}
-    >
-      <p className="text-sm text-elements-high-em tracking-[-0.006em]">
-        This will halt the deployment and you&apos;ll have to start the process
-        from scratch.
-      </p>
-    </ConfirmDialog>
-  );
-};

packages/frontend/src/components/projects/Dialog/ChangeStateToProductionDialog.tsx

@@ -1,90 +0,0 @@
-import ConfirmDialog, {
-  ConfirmDialogProps,
-} from 'components/shared/ConfirmDialog';
-import { Deployment, Domain } from 'gql-client';
-import React from 'react';
-import DeploymentDialogBodyCard from 'components/projects/project/deployments/DeploymentDialogBodyCard';
-import { Button } from 'components/shared/Button';
-import {
-  ChevronDoubleDownIcon,
-  LinkChainIcon,
-} from 'components/shared/CustomIcon';
-import { TagProps } from 'components/shared/Tag';
-
-interface ChangeStateToProductionDialogProps extends ConfirmDialogProps {
-  deployment: Deployment;
-  newDeployment?: Deployment;
-  domains: Domain[];
-}
-
-export const ChangeStateToProductionDialog = ({
-  deployment,
-  newDeployment,
-  domains,
-  open,
-  handleCancel,
-  handleConfirm,
-  ...props
-}: ChangeStateToProductionDialogProps) => {
-  const currentChip = {
-    value: 'Live Deployment',
-    type: 'positive' as TagProps['type'],
-  };
-  const newChip = {
-    value: 'New Deployment',
-    type: 'attention' as TagProps['type'],
-  };
-
-  return (
-    <ConfirmDialog
-      {...props}
-      handleCancel={handleCancel}
-      open={open}
-      handleConfirm={handleConfirm}
-    >
-      <div className="flex flex-col gap-7">
-        <div className="flex flex-col gap-3">
-          <p className="text-sm text-elements-high-em tracking-[-0.006em]">
-            Upon confirmation, this deployment will be changed to production.
-          </p>
-          <DeploymentDialogBodyCard
-            deployment={deployment}
-            chip={newDeployment ? currentChip : undefined}
-          />
-          {newDeployment && (
-            <>
-              <div className="flex items-center justify-between w-full text-elements-info">
-                {Array.from({ length: 7 }).map((_, index) => (
-                  <ChevronDoubleDownIcon key={index} />
-                ))}
-              </div>
-              <DeploymentDialogBodyCard
-                deployment={newDeployment}
-                chip={newChip}
-              />
-            </>
-          )}
-        </div>
-        <div className="flex flex-col items-start gap-3">
-          <p className="text-sm text-elements-high-em tracking-[-0.006em]">
-            The new deployment will be associated with these domains:
-          </p>
-          {domains.length > 0 &&
-            domains.map((value) => {
-              return (
-                <Button
-                  as="a"
-                  href={value.name}
-                  leftIcon={<LinkChainIcon size={18} />}
-                  variant="link"
-                  key={value.id}
-                >
-                  {value.name}
-                </Button>
-              );
-            })}
-        </div>
-      </div>
-    </ConfirmDialog>
-  );
-};

packages/frontend/src/components/projects/Dialog/DeleteDomainDialog.tsx

@@ -1,42 +0,0 @@
-import ConfirmDialog, {
-  ConfirmDialogProps,
-} from 'components/shared/ConfirmDialog';
-import React from 'react';
-
-interface DeleteDomainDialogProps extends ConfirmDialogProps {
-  projectName: string;
-  domainName: string;
-}
-
-export const DeleteDomainDialog = ({
-  projectName,
-  domainName,
-  open,
-  handleCancel,
-  handleConfirm,
-  ...props
-}: DeleteDomainDialogProps) => {
-  return (
-    <ConfirmDialog
-      {...props}
-      dialogTitle="Delete domain?"
-      handleCancel={handleCancel}
-      open={open}
-      confirmButtonTitle="Yes, delete domain"
-      handleConfirm={handleConfirm}
-      confirmButtonProps={{ variant: 'danger' }}
-    >
-      <p className="text-sm text-elements-high-em">
-        Once deleted, the project{' '}
-        <span className="text-sm font-mono text-elements-on-secondary bg-controls-secondary rounded px-0.5">
-          {projectName}
-        </span>{' '}
-        will not be accessible from the domain{' '}
-        <span className="text-sm font-mono text-elements-on-secondary bg-controls-secondary rounded px-0.5">
-          {domainName}
-        </span>
-        .
-      </p>
-    </ConfirmDialog>
-  );
-};

packages/frontend/src/components/projects/Dialog/DeleteVariableDialog.tsx

@@ -1,36 +0,0 @@
-import ConfirmDialog, {
-  ConfirmDialogProps,
-} from 'components/shared/ConfirmDialog';
-import React from 'react';
-
-interface DeleteVariableDialogProps extends ConfirmDialogProps {
-  variableKey: string;
-}
-
-export const DeleteVariableDialog = ({
-  variableKey,
-  open,
-  handleCancel,
-  handleConfirm,
-  ...props
-}: DeleteVariableDialogProps) => {
-  return (
-    <ConfirmDialog
-      {...props}
-      dialogTitle="Delete variable"
-      handleCancel={handleCancel}
-      open={open}
-      confirmButtonTitle="Yes, confirm delete"
-      handleConfirm={handleConfirm}
-      confirmButtonProps={{ variant: 'danger' }}
-    >
-      <p className="text-sm text-elements-mid-em">
-        Are you sure you want to delete the variable{' '}
-        <span className="text-sm font-mono text-elements-on-secondary bg-controls-secondary rounded px-0.5">
-          {variableKey}
-        </span>
-        ?
-      </p>
-    </ConfirmDialog>
-  );
-};

packages/frontend/src/components/projects/Dialog/DeleteWebhookDialog.tsx

@@ -1,36 +0,0 @@
-import ConfirmDialog, {
-  ConfirmDialogProps,
-} from 'components/shared/ConfirmDialog';
-import React from 'react';
-
-interface DeleteWebhookDialogProps extends ConfirmDialogProps {
-  webhookUrl: string;
-}
-
-export const DeleteWebhookDialog = ({
-  webhookUrl,
-  open,
-  handleCancel,
-  handleConfirm,
-  ...props
-}: DeleteWebhookDialogProps) => {
-  return (
-    <ConfirmDialog
-      {...props}
-      dialogTitle="Delete webhook?"
-      handleCancel={handleCancel}
-      open={open}
-      confirmButtonTitle="Yes, confirm delete"
-      handleConfirm={handleConfirm}
-      confirmButtonProps={{ variant: 'danger' }}
-    >
-      <p className="text-sm text-elements-mid-em">
-        Are you sure you want to delete{' '}
-        <span className="text-sm font-mono text-elements-high-em px-0.5">
-          {webhookUrl}
-        </span>
-        ?
-      </p>
-    </ConfirmDialog>
-  );
-};

packages/frontend/src/components/projects/Dialog/DisconnectRepositoryDialog.tsx

@@ -1,30 +0,0 @@
-import ConfirmDialog, {
-  ConfirmDialogProps,
-} from 'components/shared/ConfirmDialog';
-import React from 'react';
-
-interface DisconnectRepositoryDialogProps extends ConfirmDialogProps {}
-
-export const DisconnectRepositoryDialog = ({
-  open,
-  handleCancel,
-  handleConfirm,
-  ...props
-}: DisconnectRepositoryDialogProps) => {
-  return (
-    <ConfirmDialog
-      {...props}
-      dialogTitle="Disconnect repository?"
-      handleCancel={handleCancel}
-      open={open}
-      confirmButtonTitle="Yes, confirm disconnect"
-      handleConfirm={handleConfirm}
-      confirmButtonProps={{ variant: 'danger' }}
-    >
-      <p className="text-sm text-elements-high-em">
-        Any data tied to your Git project may become misconfigured. Are you sure
-        you want to continue?
-      </p>
-    </ConfirmDialog>
-  );
-};

packages/frontend/src/components/projects/Dialog/RemoveMemberDialog.tsx

@@ -1,38 +0,0 @@
-import ConfirmDialog, {
-  ConfirmDialogProps,
-} from 'components/shared/ConfirmDialog';
-import React from 'react';
-import { formatAddress } from 'utils/format';
-
-interface RemoveMemberDialogProps extends ConfirmDialogProps {
-  memberName: string;
-  ethAddress: string;
-  emailDomain: string;
-}
-
-export const RemoveMemberDialog = ({
-  memberName,
-  ethAddress,
-  emailDomain,
-  open,
-  handleCancel,
-  handleConfirm,
-  ...props
-}: RemoveMemberDialogProps) => {
-  return (
-    <ConfirmDialog
-      {...props}
-      dialogTitle="Remove member?"
-      handleCancel={handleCancel}
-      open={open}
-      confirmButtonTitle="Yes, remove member"
-      handleConfirm={handleConfirm}
-      confirmButtonProps={{ variant: 'danger' }}
-    >
-      <p className="text-sm text-elements-high-em">
-        Once removed, {formatAddress(memberName)} ({formatAddress(ethAddress)}@
-        {emailDomain}) will not be able to access this project.
-      </p>
-    </ConfirmDialog>
-  );
-};

packages/frontend/src/components/projects/Dialog/TransferProjectDialog.tsx

@@ -1,47 +0,0 @@
-import ConfirmDialog, {
-  ConfirmDialogProps,
-} from 'components/shared/ConfirmDialog';
-import React from 'react';
-
-interface TransferProjectDialogProps extends ConfirmDialogProps {
-  projectName: string;
-  from: string;
-  to: string;
-}
-
-export const TransferProjectDialog = ({
-  projectName,
-  from,
-  to,
-  open,
-  handleCancel,
-  handleConfirm,
-  ...props
-}: TransferProjectDialogProps) => {
-  return (
-    <ConfirmDialog
-      {...props}
-      dialogTitle="Transfer project?"
-      handleCancel={handleCancel}
-      open={open}
-      confirmButtonTitle="Yes, confirm transfer"
-      handleConfirm={handleConfirm}
-    >
-      <p className="text-sm text-elements-high-em">
-        Upon confirmation, your project{' '}
-        <span className="text-sm font-mono text-elements-on-secondary bg-controls-secondary rounded px-0.5">
-          {projectName}
-        </span>{' '}
-        will be transferred from{' '}
-        <span className="text-sm font-mono text-elements-on-secondary bg-controls-secondary rounded px-0.5">
-          {from}
-        </span>{' '}
-        to{' '}
-        <span className="text-sm font-mono text-elements-on-secondary bg-controls-secondary rounded px-0.5">
-          {to}
-        </span>
-        .
-      </p>
-    </ConfirmDialog>
-  );
-};

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

@@ -0,0 +1,65 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { Project } from 'gql-client';
+
+import {
+  Menu,
+  MenuHandler,
+  MenuList,
+  MenuItem,
+  Typography,
+  Avatar,
+} from '@material-tailwind/react';
+
+import { relativeTimeMs } from '../../utils/time';
+
+interface ProjectCardProps {
+  project: Project;
+}
+
+const ProjectCard: React.FC<ProjectCardProps> = ({ project }) => {
+  return (
+    <div className="bg-white border border-gray-200 rounded-lg shadow">
+      <div className="flex gap-2 p-2 items-center">
+        <Avatar variant="rounded" src={project.icon || '/gray.png'} />
+        <div className="grow">
+          <Link to={`projects/${project.id}`}>
+            <Typography>{project.name}</Typography>
+            <Typography color="gray" variant="small">
+              {project.deployments[0]?.domain?.name ??
+                'No Production Deployment'}
+            </Typography>
+          </Link>
+        </div>
+        <Menu placement="bottom-end">
+          <MenuHandler>
+            <button>...</button>
+          </MenuHandler>
+          <MenuList>
+            <MenuItem>^ Project settings</MenuItem>
+            <MenuItem className="text-red-500">^ Delete project</MenuItem>
+          </MenuList>
+        </Menu>
+      </div>
+      <div className="border-t-2 border-solid p-4 bg-gray-50">
+        {project.deployments.length > 0 ? (
+          <>
+            <Typography variant="small" color="gray">
+              ^ {project.deployments[0].commitMessage}
+            </Typography>
+            <Typography variant="small" color="gray">
+              {relativeTimeMs(project.deployments[0].createdAt)} on ^&nbsp;
+              {project.deployments[0].branch}
+            </Typography>
+          </>
+        ) : (
+          <Typography variant="small" color="gray">
+            No Production deployment
+          </Typography>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default ProjectCard;

packages/frontend/src/components/projects/ProjectCard/ProjectCard.theme.ts

@@ -1,82 +0,0 @@
-import { VariantProps, tv } from 'tailwind-variants';
-
-export const projectCardTheme = tv({
-  slots: {
-    wrapper: [
-      'bg-surface-card',
-      'shadow-card',
-      'rounded-2xl',
-      'flex',
-      'flex-col',
-      'group',
-      'cursor-pointer',
-    ],
-    upperContent: ['px-4', 'py-4', 'flex', 'items-start', 'gap-3', 'relative'],
-    content: ['flex', 'flex-col', 'gap-1', 'flex-1', 'overflow-hidden'],
-    title: [
-      'text-sm',
-      'font-medium',
-      'text-elements-high-em',
-      'tracking-[-0.006em]',
-      'truncate',
-    ],
-    description: ['text-xs', 'text-elements-low-em', 'truncate'],
-    icons: ['flex', 'items-center', 'gap-1'],
-    lowerContent: [
-      'transition-colors',
-      'duration-150',
-      'px-4',
-      'py-4',
-      'flex',
-      'flex-col',
-      'gap-2',
-      'rounded-b-2xl',
-      'group-hover:bg-surface-card-hovered',
-    ],
-    latestDeployment: ['flex', 'items-center', 'gap-2'],
-    deploymentStatusContainer: [
-      'h-3',
-      'w-3',
-      'flex',
-      'items-center',
-      'justify-center',
-    ],
-    deploymentStatus: ['w-1', 'h-1', 'rounded-full'],
-    deploymentName: ['text-xs', 'text-elements-low-em'],
-    deploymentText: [
-      'text-xs',
-      'text-elements-low-em',
-      'font-mono',
-      'flex',
-      'items-center',
-      'gap-2',
-    ],
-    wavyBorder: [
-      'bg-surface-card',
-      'transition-colors',
-      'duration-150',
-      'group-hover:bg-surface-card-hovered',
-    ],
-  },
-  variants: {
-    status: {
-      success: {
-        deploymentStatus: ['bg-emerald-500'],
-      },
-      'in-progress': {
-        deploymentStatus: ['bg-orange-400'],
-      },
-      failure: {
-        deploymentStatus: ['bg-rose-500'],
-      },
-      pending: {
-        deploymentStatus: ['bg-gray-500'],
-      },
-    },
-  },
-  defaultVariants: {
-    status: 'pending',
-  },
-});
-
-export type ProjectCardTheme = VariantProps<typeof projectCardTheme>;

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

@@ -1,142 +0,0 @@
-import {
-  Menu,
-  MenuHandler,
-  MenuItem,
-  MenuList,
-} from '@material-tailwind/react';
-import React, {
-  ComponentPropsWithoutRef,
-  MouseEvent,
-  useCallback,
-} from 'react';
-import { useNavigate } from 'react-router-dom';
-import { Project } from 'gql-client';
-import { Avatar } from 'components/shared/Avatar';
-import { Button } from 'components/shared/Button';
-import {
-  BranchIcon,
-  ClockIcon,
-  GitHubLogo,
-  HorizontalDotIcon,
-  WarningDiamondIcon,
-} from 'components/shared/CustomIcon';
-import { Tooltip } from 'components/shared/Tooltip';
-import { WavyBorder } from 'components/shared/WavyBorder';
-import { relativeTimeMs } from 'utils/time';
-import { getInitials } from 'utils/geInitials';
-import { ProjectCardTheme, projectCardTheme } from './ProjectCard.theme';
-
-export interface ProjectCardProps
-  extends ComponentPropsWithoutRef<'div'>,
-    ProjectCardTheme {
-  project: Project;
-}
-
-// TODO: Update the whole component to use `Link` from `react-router-dom` and remove the `useNavigate` hook,
-// currently it's not possible to use `Link` because the dot menu is not a direct child of the `Link` component
-export const ProjectCard = ({
-  className,
-  project,
-  status = 'failure',
-  ...props
-}: ProjectCardProps) => {
-  const theme = projectCardTheme();
-  const hasDeployment = project.deployments.length > 0;
-  // TODO: Update this to use the actual status from the API
-  const hasError = status === 'failure';
-
-  const navigate = useNavigate();
-
-  const handleOptionsClick = (
-    e: MouseEvent<HTMLButtonElement, globalThis.MouseEvent>,
-  ) => {
-    e.stopPropagation();
-  };
-
-  const handleClick = useCallback(() => {
-    navigate(`projects/${project.id}`);
-  }, [project.id, navigate]);
-
-  return (
-    <div
-      {...props}
-      className={theme.wrapper({ className })}
-      onClick={handleClick}
-    >
-      {/* Upper content */}
-      <div className={theme.upperContent()}>
-        {/* Icon container */}
-        <Avatar
-          size={48}
-          imageSrc={project.icon}
-          initials={getInitials(project.name)}
-        />
-        {/* Title and website */}
-        <div className={theme.content()}>
-          <Tooltip content={project.name}>
-            <p className={theme.title()}>{project.name}</p>
-          </Tooltip>
-          <p className={theme.description()}>
-            {project.deployments[0]?.domain?.name ?? 'No domain'}
-          </p>
-        </div>
-        {/* Icons */}
-        <div className={theme.icons()}>
-          {hasError && <WarningDiamondIcon className="text-elements-danger" />}
-          <Menu placement="bottom-end">
-            <MenuHandler>
-              <Button
-                shape="default"
-                size="xs"
-                variant="ghost"
-                iconOnly
-                onClick={handleOptionsClick}
-              >
-                <HorizontalDotIcon />
-              </Button>
-            </MenuHandler>
-            <MenuList placeholder={''}>
-              <MenuItem placeholder={''}>Project settings</MenuItem>
-              <MenuItem className="text-red-500" placeholder={''}>
-                Delete project
-              </MenuItem>
-            </MenuList>
-          </Menu>
-        </div>
-      </div>
-      {/* Wave */}
-      <WavyBorder variant="stroke-and-fill" className={theme.wavyBorder()} />
-      {/* Lower content */}
-      <div className={theme.lowerContent()}>
-        {/* Latest deployment */}
-        <div className={theme.latestDeployment()}>
-          {/* Dot icon */}
-          <div className={theme.deploymentStatusContainer()}>
-            <div className={theme.deploymentStatus({ status })} />
-          </div>
-          <p className={theme.deploymentText()}>
-            {hasDeployment
-              ? project.deployments[0]?.commitMessage
-              : 'No production deployment'}
-          </p>
-        </div>
-        {/* Deployment and branch name */}
-        <div className={theme.deploymentText()}>
-          {hasDeployment ? (
-            <>
-              <GitHubLogo />
-              <span>{relativeTimeMs(project.deployments[0].createdAt)} on</span>
-              <BranchIcon />
-              <span>{project.deployments[0].branch}</span>
-            </>
-          ) : (
-            <>
-              <ClockIcon />
-              <span>Created {relativeTimeMs(project.createdAt)}</span>
-            </>
-          )}
-        </div>
-      </div>
-    </div>
-  );
-};

packages/frontend/src/components/projects/ProjectCard/index.ts

@@ -1 +0,0 @@
-export * from './ProjectCard';

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

@@ -0,0 +1,118 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import { useCombobox } from 'downshift';
+import { Project } from 'gql-client';
+import { useDebounce } from 'usehooks-ts';
+
+import {
+  List,
+  ListItem,
+  ListItemPrefix,
+  Card,
+  Typography,
+  Avatar,
+} from '@material-tailwind/react';
+
+import SearchBar from '../SearchBar';
+import { useGQLClient } from '../../context/GQLClientContext';
+
+interface ProjectsSearchProps {
+  onChange?: (data: Project) => void;
+}
+
+const ProjectSearchBar = ({ onChange }: ProjectsSearchProps) => {
+  const [items, setItems] = useState<Project[]>([]);
+  const [selectedItem, setSelectedItem] = useState<Project | null>(null);
+  const client = useGQLClient();
+
+  const {
+    isOpen,
+    getMenuProps,
+    getInputProps,
+    getItemProps,
+    highlightedIndex,
+    inputValue,
+  } = useCombobox({
+    items,
+    itemToString(item) {
+      return item ? item.name : '';
+    },
+    selectedItem,
+    onSelectedItemChange: ({ selectedItem: newSelectedItem }) => {
+      if (newSelectedItem) {
+        setSelectedItem(newSelectedItem);
+
+        if (onChange) {
+          onChange(newSelectedItem);
+        }
+      }
+    },
+  });
+
+  const debouncedInputValue = useDebounce<string>(inputValue, 500);
+
+  const fetchProjects = useCallback(
+    async (inputValue: string) => {
+      const { searchProjects } = await client.searchProjects(inputValue);
+      setItems(searchProjects);
+    },
+    [client],
+  );
+
+  useEffect(() => {
+    if (debouncedInputValue) {
+      fetchProjects(debouncedInputValue);
+    }
+  }, [fetchProjects, debouncedInputValue]);
+
+  return (
+    <div className="relative">
+      <SearchBar {...getInputProps()} />
+      <Card
+        className={`absolute w-1/2 max-h-52 -mt-1 overflow-y-auto ${
+          (!inputValue || !isOpen) && 'hidden'
+        }`}
+      >
+        <List {...getMenuProps()}>
+          {items.length ? (
+            <>
+              <div className="p-3">
+                <Typography variant="small" color="gray">
+                  Suggestions
+                </Typography>
+              </div>
+              {items.map((item, index) => (
+                <ListItem
+                  selected={highlightedIndex === index || selectedItem === item}
+                  key={item.id}
+                  {...getItemProps({ item, index })}
+                >
+                  <ListItemPrefix>
+                    <Avatar src={item.icon || '/gray.png'} variant="rounded" />
+                  </ListItemPrefix>
+                  <div>
+                    <Typography variant="h6" color="blue-gray">
+                      {item.name}
+                    </Typography>
+                    <Typography
+                      variant="small"
+                      color="gray"
+                      className="font-normal"
+                    >
+                      {item.organization.name}
+                    </Typography>
+                  </div>
+                </ListItem>
+              ))}
+            </>
+          ) : (
+            <div className="p-3">
+              <Typography>^ No projects matching this name</Typography>
+            </div>
+          )}
+        </List>
+      </Card>
+    </div>
+  );
+};
+
+export default ProjectSearchBar;

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

@@ -1,93 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react';
-import { useCombobox } from 'downshift';
-import { Project } from 'gql-client';
-import { useDebounce } from 'usehooks-ts';
-
-import SearchBar from 'components/SearchBar';
-import { useGQLClient } from 'context/GQLClientContext';
-import { cn } from 'utils/classnames';
-import { ProjectSearchBarItem } from './ProjectSearchBarItem';
-import { ProjectSearchBarEmpty } from './ProjectSearchBarEmpty';
-
-interface ProjectSearchBarProps {
-  onChange?: (data: Project) => void;
-}
-
-export const ProjectSearchBar = ({ onChange }: ProjectSearchBarProps) => {
-  const [items, setItems] = useState<Project[]>([]);
-  const [selectedItem, setSelectedItem] = useState<Project | null>(null);
-  const client = useGQLClient();
-
-  const {
-    isOpen,
-    getMenuProps,
-    getInputProps,
-    getItemProps,
-    highlightedIndex,
-    inputValue,
-  } = useCombobox({
-    items,
-    itemToString(item) {
-      return item ? item.name : '';
-    },
-    selectedItem,
-    onSelectedItemChange: ({ selectedItem: newSelectedItem }) => {
-      if (newSelectedItem) {
-        setSelectedItem(newSelectedItem);
-
-        if (onChange) {
-          onChange(newSelectedItem);
-        }
-      }
-    },
-  });
-
-  const debouncedInputValue = useDebounce<string>(inputValue, 300);
-
-  const fetchProjects = useCallback(
-    async (inputValue: string) => {
-      const { searchProjects } = await client.searchProjects(inputValue);
-      setItems(searchProjects);
-    },
-    [client],
-  );
-
-  useEffect(() => {
-    if (debouncedInputValue) {
-      fetchProjects(debouncedInputValue);
-    }
-  }, [fetchProjects, debouncedInputValue]);
-
-  return (
-    <div className="relative w-full lg:w-fit">
-      <SearchBar {...getInputProps()} />
-      <div
-        {...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 },
-        )}
-      >
-        {items.length ? (
-          <>
-            <div className="px-2 py-2">
-              <p className="text-elements-mid-em text-xs font-medium">
-                Suggestions
-              </p>
-            </div>
-            {items.map((item, index) => (
-              <ProjectSearchBarItem
-                {...getItemProps({ item, index })}
-                key={item.id}
-                item={item}
-                active={highlightedIndex === index || selectedItem === item}
-              />
-            ))}
-          </>
-        ) : (
-          <ProjectSearchBarEmpty />
-        )}
-      </div>
-    </div>
-  );
-};