chore(deployment): 0.1.8

2024-02-29 00:47:19 -07:00
518 changed files with 12060 additions and 26259 deletions
@@ -19,7 +19,5 @@ jobs:
        with:
          node-version: ${{ matrix.node-version }}
      - run: yarn
-      - name: Build libs
-        run: yarn workspace gql-client run build
      - name: Linter check
        run: yarn lint
@@ -1,39 +0,0 @@
-name: Test webapp deployment
-
-on:
-  schedule:
-    - cron: '0 3 * * *'
-  workflow_dispatch:
-
-jobs:
-  test_app_deployment:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [20.x]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: Install dependencies
-        run: yarn
-      - name: Test webapp deployment
-        run: ./packages/deployer/test/test-webapp-deployment-undeployment.sh
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS_WEBHOOK }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS_WEBHOOK }}
@@ -5,8 +5,3 @@ yarn-error.log
 .yarnrc

 packages/backend/environments/local.toml
-packages/backend/dev/
-packages/frontend/dist/
-
-# ignore all .DS_Store files
-**/.DS_Store
@@ -1 +0,0 @@
-v20.12.1
@@ -1,7 +1,6 @@
 {
  // IntelliSense for taiwind variants
  "tailwindCSS.experimental.classRegex": [
-    "tv\\('([^)]*)\\')",
-    "(?:'|\"|`)([^\"'`]*)(?:'|\"|`)"
+    ["tv\\((([^()]*|\\([^()]*\\))*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]
  ]
 }
@@ -1,23 +1,269 @@
 # snowballtools-base

-This is a [yarn workspace](https://yarnpkg.com/features/workspaces) monorepo for the dashboard.
+## Setup

-## Getting Started
+- Clone the `snowballtools-base` repo

-### Install dependencies
+  ```bash
+  git clone git@github.com:snowball-tools/snowballtools-base.git
+  ```

-In the root of the project, run:
+- In root of the repo, install depedencies

-```zsh
-yarn
-```
+  ```bash
+  yarn
+  ```

-### Build backend
+- Build packages

-```zsh
-yarn build --ignore frontend
-```
+  ```bash
+  yarn build --ignore frontend
+  ```

-### Environment variables, running the development server, and deployment
+## Backend

-Follow the instructions in the README.md files of the [backend](packages/backend/README.md) and [frontend](packages/frontend/README.md) packages.
+- Change directory to `packages/backend`
+
+  ```bash
+  cd packages/backend
+  ```
+
+- Rename backend config file from [environments/local.toml.example](packages/backend/environments/local.toml.example) to `local.toml`
+
+  ```bash
+  mv environments/local.toml.example environments/local.toml
+  ```
+
+- 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 an 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
+
+### Backend Production
+
+- Let us assume the following domains for backend and frontend
+  - Backend server: `api.snowballtools.com`
+  - Frontend app: `dashboard.snowballtools.com`
+
+- 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)
+  - Client ID and secret will be available after [creating an OAuth app](https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/creating-an-oauth-app)
+    - In "Homepage URL", type `https://dashboard.snowballtools.com`
+    - In "Authorization callback URL", type `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"
+  ...
+  ```
+
+- Start the server in `packages/backend`
+
+  ```bash
+  yarn start
+  ```
+
+### Backend Development
+
+- 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 an 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
+
+- 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"
+    ...
+    ```
+
+- Start the server in `packages/backend`
+
+  ```bash
+  yarn start:dev
+  ```
+
+## Frontend
+
+- Change directory to `packages/frontend` in a new terminal
+
+  ```bash
+  cd packages/frontend
+  ```
+
+- Rename [.env.example](packages/frontend/.env.example) to `.env`
+
+  ```bash
+  mv .env.example .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
+  # Set actual owner/name of the template repo that will be used for creating new repo
+  REACT_APP_GITHUB_PWA_TEMPLATE_REPO = cerc-io/test-progressive-web-app
+  REACT_APP_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO = cerc-io/image-upload-pwa-example
+  ```
+
+### Frontend Production
+
+- Let us assume the following domains for backend and frontend
+  - Backend server: `api.snowballtools.com`
+  - Frontend app: `dashboard.snowballtools.com`
+
+- Set the following values in [.env](packages/frontend/.env) file
+
+  ```env
+  # Backend server endpoint
+  REACT_APP_SERVER_URL = 'https://api.snowballtools.com'
+  ```
+
+- 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
+  ```
+
+### Frontend 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>
+  ```
+
+- Start the React application
+
+  ```bash
+  yarn start
+  ```
+
+- The React application will be running in `http://localhost:3000/`
@@ -1,7 +1,7 @@
 #!/bin/bash

 PKG_DIR="./packages/frontend"
-OUTPUT_DIR="${PKG_DIR}/dist"
+OUTPUT_DIR="${PKG_DIR}/build"
 DEST_DIR=${1:-/data}

 if [[ -d "$DEST_DIR" ]]; then
@@ -10,17 +10,11 @@ if [[ -d "$DEST_DIR" ]]; then
 fi

 cat > $PKG_DIR/.env <<EOF
-VITE_SERVER_URL = 'LACONIC_HOSTED_CONFIG_server_url'
-VITE_GITHUB_CLIENT_ID = 'LACONIC_HOSTED_CONFIG_github_clientid'
-VITE_GITHUB_PWA_TEMPLATE_REPO = 'LACONIC_HOSTED_CONFIG_github_pwa_templaterepo'
-VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO = 'LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo'
-VITE_WALLET_CONNECT_ID = 'LACONIC_HOSTED_CONFIG_wallet_connect_id'
-VITE_LIT_RELAY_API_KEY = 'LACONIC_HOSTED_CONFIG_lit_relay_api_key'
-VITE_ALCHEMY_API_KEY = 'LACONIC_HOSTED_CONFIG_aplchemy_api_key'
-VITE_BUGSNAG_API_KEY = 'LACONIC_HOSTED_CONFIG_bugsnag_api_key'
-VITE_PASSKEY_WALLET_RPID = 'LACONIC_HOSTED_CONFIG_passkey_wallet_rpid'
-VITE_TURNKEY_API_BASE_URL = 'LACONIC_HOSTED_CONFIG_turnkey_api_base_url'
-VITE_TURNKEY_ORGANIZATION_ID = 'LACONIC_HOSTED_CONFIG_turnkey_organization_id'
+REACT_APP_SERVER_URL = 'LACONIC_HOSTED_CONFIG_app_server_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'
 EOF

 yarn || exit 1
@@ -4,15 +4,15 @@
  "workspaces": [
    "packages/*"
  ],
+  "dependencies": {},
  "devDependencies": {
-    "depcheck": "^1.4.2",
    "husky": "^8.0.3",
    "lerna": "^8.0.0",
-    "patch-package": "^8.0.0"
+    "depcheck": "^1.4.2"
  },
  "scripts": {
    "prepare": "husky install",
    "build": "lerna run build --stream",
-    "lint": "lerna run lint --stream"
+    "lint": "lerna run lint --stream -- --max-warnings=0"
  }
-}
+}
@@ -1 +0,0 @@
-v20.12.1
@@ -1,76 +1 @@
-# backend
-
-This backend is a [node.js](https://nodejs.org/) [express.js](https://expressjs.com/) [apollo server](https://www.apollographql.com/docs/apollo-server/) project in a [yarn workspace](https://yarnpkg.com/features/workspaces).
-
-## Getting Started
-
-### Install dependencies
-
-In the root of the project, run:
-
-```zsh
-yarn
-```
-
-### Build backend
-
-```zsh
-yarn build --ignore frontend
-```
-
-### Environment variables
-
-#### Local
-
-Copy the `envionments/local.toml.example` file to `envionments/local.toml`:
-
-```zsh
-cp envionments/local.toml.example envionments/local.toml
-```
-
-#### Staging environment variables
-
-In the deployment repository, update staging [staging/configmaps/config/prod.toml](https://git.vdb.to/cerc-io/snowballtools-base-api-deployments/src/commit/318c2bc09f334dca79c3501838512749f9431bf1/deployments/staging/configmaps/config/prod.toml)
-
-#### Production environment variables
-
-In the deployment repository, update production [production/configmaps/config/prod.toml](https://git.vdb.to/cerc-io/snowballtools-base-api-deployments/src/commit/318c2bc09f334dca79c3501838512749f9431bf1/deployments/production/configmaps/config/prod.toml)
-
-### Run development server
-
-```zsh
-yarn start
-```
-
-## Deployment
-
-Clone the deployer repository:
-
-```zsh
-git clone git@git.vdb.to:cerc-io/snowballtools-base-api-deployments.git
-```
-
-### Staging
-
-```zsh
-echo trigger >> .gitea/workflows/triggers/staging-deploy
-git commit -a -m "Deploy v0.0.8"  # replace with version number
-git push
-```
-
-### Production
-
-```zsh
-echo trigger >> .gitea/workflows/triggers/production-deploy
-git commit -a -m "Deploy v0.0.8" # replace with version number
-git push
-```
-
-### Deployment status
-
-Dumb for now
-
- [Staging](https://snowballtools-base-api.staging.apps.snowballtools.com/staging/version)
- [Production](https://snowballtools-base-api.apps.snowballtools.com/staging/version)
-
-Update version number manually in [routes/staging.ts](/packages/backend/src/routes/staging.ts)
+# Backend for Snowball Tools
@@ -1,25 +1,20 @@
 {
  "name": "backend",
-  "license": "UNLICENSED",
  "version": "1.0.0",
  "main": "index.js",
  "dependencies": {
+    "@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",
-    "@snowballtools/laconic-sdk": "^0.1.17",
-    "@turnkey/sdk-server": "^0.1.0",
    "@types/debug": "^4.1.5",
    "@types/express": "^4.17.21",
    "@types/node": "^20.11.0",
-    "@types/semver": "^7.5.8",
    "apollo-server-core": "^3.13.0",
    "apollo-server-express": "^3.13.0",
-    "cookie-session": "^2.1.0",
    "cors": "^2.8.5",
    "debug": "^4.3.1",
    "express": "^4.18.2",
-    "express-async-errors": "^3.1.1",
    "express-session": "^1.18.0",
    "fs-extra": "^11.2.0",
    "graphql": "^16.8.1",
@@ -40,21 +35,30 @@
    "copy-assets": "copyfiles -u 1 src/**/*.gql dist/",
    "clean": "rm -rf ./dist",
    "build": "yarn clean && tsc && yarn copy-assets",
+    "lint": "eslint .",
    "format": "prettier --write .",
    "format:check": "prettier --check .",
-    "lint": "tsc --noEmit",
    "test:registry:init": "DEBUG=snowball:* ts-node ./test/initialize-registry.ts",
    "test:registry:publish-deploy-records": "DEBUG=snowball:* ts-node ./test/publish-deploy-records.ts",
-    "test:registry:publish-deployment-removal-records": "DEBUG=snowball:* ts-node ./test/publish-deployment-removal-records.ts",
    "test:db:load:fixtures": "DEBUG=snowball:* ts-node ./test/initialize-db.ts",
    "test:db:delete": "DEBUG=snowball:* ts-node ./test/delete-db.ts"
  },
  "devDependencies": {
-    "@types/cookie-session": "^2.0.49",
    "@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",
    "better-sqlite3": "^9.2.2",
    "copyfiles": "^2.4.1",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-semistandard": "^15.0.1",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-standard": "^5.0.0",
    "prettier": "^3.1.1",
    "workspace": "^0.0.1-preview.1"
  }
@@ -52,10 +52,4 @@ export interface Config {
  gitHub: GitHubConfig;
  registryConfig: RegistryConfig;
  misc: MiscConfig;
-  turnkey: {
-    apiBaseUrl: string;
-    apiPublicKey: string;
-    apiPrivateKey: string;
-    defaultOrganizationId: string;
-  };
 }
@@ -436,19 +436,6 @@ export class Database {
    return Boolean(updateResult.affected);
  }

-  async deleteDeploymentById (deploymentId: string): Promise<boolean> {
-    const deploymentRepository = this.dataSource.getRepository(Deployment);
-    const deployment = await deploymentRepository.findOneOrFail({
-      where: {
-        id: deploymentId
-      }
-    });
-
-    const deleteResult = await deploymentRepository.softRemove(deployment);
-
-    return Boolean(deleteResult);
-  }
-
  async addProject (user: User, organizationId: string, data: DeepPartial<Project>): Promise<Project> {
    const projectRepository = this.dataSource.getRepository(Project);

@@ -6,14 +6,13 @@ import {
  UpdateDateColumn,
  ManyToOne,
  OneToOne,
-  JoinColumn,
-  DeleteDateColumn
+  JoinColumn
 } from 'typeorm';

 import { Project } from './Project';
 import { Domain } from './Domain';
 import { User } from './User';
-import { AppDeploymentRecordAttributes, AppDeploymentRemovalRecordAttributes } from '../types';
+import { AppDeploymentRecordAttributes } from '../types';

 export enum Environment {
  Production = 'Production',
@@ -25,7 +24,6 @@ export enum DeploymentStatus {
  Building = 'Building',
  Ready = 'Ready',
  Error = 'Error',
-  Deleting = 'Deleting',
 }

 export interface ApplicationDeploymentRequest {
@@ -37,18 +35,6 @@ export interface ApplicationDeploymentRequest {
  meta: string;
 }

-export interface ApplicationDeploymentRemovalRequest {
-  type: string;
-  version: string;
-  deployment: string;
-}
-
-export interface ApplicationDeploymentRemovalRequest {
-  type: string;
-  version: string;
-  deployment: string;
-}
-
 export interface ApplicationRecord {
  type: string;
  version: string;
@@ -112,18 +98,6 @@ export class Deployment {

  @Column('simple-json', { nullable: true })
    applicationDeploymentRecordData!: AppDeploymentRecordAttributes | null;
-  
-  @Column('varchar', { nullable: true })
-    applicationDeploymentRemovalRequestId!: string | null;
-
-  @Column('simple-json', { nullable: true })
-    applicationDeploymentRemovalRequestData!: ApplicationDeploymentRemovalRequest | null;
-  
-  @Column('varchar', { nullable: true })
-    applicationDeploymentRemovalRecordId!: string | null;
-
-  @Column('simple-json', { nullable: true })
-    applicationDeploymentRemovalRecordData!: AppDeploymentRemovalRecordAttributes | null;

  @Column({
    enum: Environment
@@ -147,7 +121,4 @@ export class Deployment {

  @UpdateDateColumn()
    updatedAt!: Date;
-  
-  @DeleteDateColumn()
-    deletedAt!: Date | null;
 }
@@ -39,12 +39,6 @@ export class User {
  @CreateDateColumn()
    updatedAt!: Date;

-  @Column()
-    subOrgId!: string;
-
-  @Column()
-    turnkeyWalletId!: string;
-
  @OneToMany(() => ProjectMember, (projectMember) => projectMember.project, {
    cascade: ['soft-remove']
  })
@@ -1,4 +1,3 @@
-import 'express-async-errors';
 import 'reflect-metadata';
 import debug from 'debug';
 import fs from 'fs';
@@ -10,6 +9,8 @@ import { Database } from './database';
 import { createAndStartServer } from './server';
 import { createResolvers } from './resolvers';
 import { getConfig } from './utils';
+import { Config } from './config';
+import { DEFAULT_CONFIG_FILE_PATH } from './constants';
 import { Service } from './service';
 import { Registry } from './registry';

@@ -17,12 +18,13 @@ const log = debug('snowball:server');
 const OAUTH_CLIENT_TYPE = 'oauth-app';

 export const main = async (): Promise<void> => {
-  const { server, database, gitHub, registryConfig, misc } = await getConfig();
+  // TODO: get config path using cli
+  const { server, database, gitHub, registryConfig, misc } = await getConfig<Config>(DEFAULT_CONFIG_FILE_PATH);

  const app = new OAuthApp({
    clientType: OAUTH_CLIENT_TYPE,
    clientId: gitHub.oAuth.clientId,
-    clientSecret: gitHub.oAuth.clientSecret,
+    clientSecret: gitHub.oAuth.clientSecret
  });

  const db = new Database(database, misc);
@@ -33,7 +35,7 @@ export const main = async (): Promise<void> => {
    { gitHubConfig: gitHub, registryConfig },
    db,
    app,
-    registry,
+    registry
  );

  const typeDefs = fs
@@ -3,26 +3,21 @@ import assert from 'assert';
 import { inc as semverInc } from 'semver';
 import { DateTime } from 'luxon';

-import { Registry as LaconicRegistry } from '@snowballtools/laconic-sdk';
+import { Registry as LaconicRegistry } from '@cerc-io/laconic-sdk';

 import { RegistryConfig } from './config';
 import {
  ApplicationRecord,
  Deployment,
-  ApplicationDeploymentRequest,
-  ApplicationDeploymentRemovalRequest
+  ApplicationDeploymentRequest
 } from './entity/Deployment';
-import { AppDeploymentRecord, AppDeploymentRemovalRecord, PackageJSON } from './types';
-import { sleep } from './utils';
+import { AppDeploymentRecord, PackageJSON } from './types';

 const log = debug('snowball:registry');

 const APP_RECORD_TYPE = 'ApplicationRecord';
 const APP_DEPLOYMENT_REQUEST_TYPE = 'ApplicationDeploymentRequest';
-const APP_DEPLOYMENT_REMOVAL_REQUEST_TYPE = 'ApplicationDeploymentRemovalRequest';
 const APP_DEPLOYMENT_RECORD_TYPE = 'ApplicationDeploymentRecord';
-const APP_DEPLOYMENT_REMOVAL_RECORD_TYPE = 'ApplicationDeploymentRemovalRecord';
-const SLEEP_DURATION = 1000;

 // TODO: Move registry code to laconic-sdk/watcher-ts
 export class Registry {
@@ -116,21 +111,16 @@ export class Registry {
    const crn = this.getCrn(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,
@@ -149,9 +139,9 @@ export class Registry {
  async createApplicationDeploymentRequest (data: {
    deployment: Deployment,
    appName: string,
+    packageJsonName: string,
    repository: string,
-    environmentVariables: { [key: string]: string },
-    dns: string,
+    environmentVariables: { [key: string]: string }
  }): Promise<{
    applicationDeploymentRequestId: string;
    applicationDeploymentRequestData: ApplicationDeploymentRequest;
@@ -170,7 +160,7 @@ export class Registry {
      version: '1.0.0',
      name: `${applicationRecord.attributes.name}@${applicationRecord.attributes.app_version}`,
      application: `${crn}@${applicationRecord.attributes.app_version}`,
-      dns: data.dns,
+      dns: `${data.deployment.project.name}-${data.deployment.id}`,

      // TODO: Not set in test-progressive-web-app CI
      // deployment: '$CERC_REGISTRY_DEPLOYMENT_CRN',
@@ -188,7 +178,6 @@ export class Registry {
      })
    };

-    await sleep(SLEEP_DURATION);
    const result = await this.registry.setRecord(
      {
        privateKey: this.registryConfig.privateKey,
@@ -222,84 +211,15 @@ 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
      )
    );
  }

-  /**
-   * Fetch ApplicationDeploymentRecords by filter
-   */
-  async getDeploymentRecordsByFilter (filter: { [key: string]: any }): Promise<AppDeploymentRecord[]> {
-    return this.registry.queryRecords(
-      {
-        type: APP_DEPLOYMENT_RECORD_TYPE,
-        ...filter
-      },
-      true
-    );
-  }
-
-  /**
-   * Fetch ApplicationDeploymentRemovalRecords for deployments
-   */
-  async getDeploymentRemovalRecords (
-    deployments: Deployment[]
-  ): Promise<AppDeploymentRemovalRecord[]> {
-    // Fetch ApplicationDeploymentRemovalRecords for corresponding ApplicationDeploymentRecord set in deployments
-    const records = await this.registry.queryRecords(
-      {
-        type: APP_DEPLOYMENT_REMOVAL_RECORD_TYPE
-      },
-      true
-    );
-
-    // Filter records with ApplicationDeploymentRecord and ApplicationDeploymentRemovalRequest IDs
-    return records.filter((record: AppDeploymentRemovalRecord) =>
-      deployments.some(
-        (deployment) =>
-          deployment.applicationDeploymentRemovalRequestId === record.attributes.request &&
-          deployment.applicationDeploymentRecordId === record.attributes.deployment
-      )
-    );
-  }
-
-  async createApplicationDeploymentRemovalRequest (data: {
-    deploymentId: string;
-  }): Promise<{
-    applicationDeploymentRemovalRequestId: string;
-    applicationDeploymentRemovalRequestData: ApplicationDeploymentRemovalRequest;
-  }> {
-    const applicationDeploymentRemovalRequest = {
-      type: APP_DEPLOYMENT_REMOVAL_REQUEST_TYPE,
-      version: '1.0.0',
-      deployment: data.deploymentId
-    };
-
-    const result = await this.registry.setRecord(
-      {
-        privateKey: this.registryConfig.privateKey,
-        record: applicationDeploymentRemovalRequest,
-        bondId: this.registryConfig.bondId
-      },
-      '',
-      this.registryConfig.fee
-    );
-
-    log(`Application deployment removal request record published: ${result.data.id}`);
-    log('Application deployment removal request data:', applicationDeploymentRemovalRequest);
-
-    return {
-      applicationDeploymentRemovalRequestId: result.data.id,
-      applicationDeploymentRemovalRequestData: applicationDeploymentRemovalRequest
-    };
-  }
-
  getCrn (appName: string): string {
    assert(this.registryConfig.authority, "Authority doesn't exist");
    return `crn://${this.registryConfig.authority}/applications/${appName}`;
@@ -6,7 +6,6 @@ import { Permission } from './entity/ProjectMember';
 import { Domain } from './entity/Domain';
 import { Project } from './entity/Project';
 import { EnvironmentVariable } from './entity/EnvironmentVariable';
-import { AddProjectFromTemplateInput } from './types';

 const log = debug('snowball:resolver');

@@ -18,7 +17,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
        return context.user;
      },

-      organizations: async (_: any, __: any, context: any) => {
+      organizations: async (_:any, __: any, context: any) => {
        return service.getOrganizationsByUserId(context.user);
      },

@@ -26,15 +25,8 @@ export const createResolvers = async (service: Service): Promise<any> => {
        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.user, organizationSlug);
      },

      deployments: async (_: any, { projectId }: { projectId: string }) => {
@@ -43,7 +35,7 @@ export const createResolvers = async (service: Service): Promise<any> => {

      environmentVariables: async (
        _: any,
-        { projectId }: { projectId: string },
+        { projectId }: { projectId: string }
      ) => {
        return service.getEnvironmentVariablesByProjectId(projectId);
      },
@@ -52,11 +44,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
        return service.getProjectMembersByProjectId(projectId);
      },

-      searchProjects: async (
-        _: any,
-        { searchText }: { searchText: string },
-        context: any,
-      ) => {
+      searchProjects: async (_: any, { searchText }: { searchText: string }, context: any) => {
        return service.searchProjects(context.user, searchText);
      },

@@ -64,11 +52,11 @@ export const createResolvers = async (service: Service): Promise<any> => {
        _: any,
        {
          projectId,
-          filter,
-        }: { projectId: string; filter?: FindOptionsWhere<Domain> },
+          filter
+        }: { projectId: string; filter?: FindOptionsWhere<Domain> }
      ) => {
        return service.getDomainsByProjectId(projectId, filter);
-      },
+      }
    },

    // TODO: Return error in GQL response
@@ -76,13 +64,10 @@ export const createResolvers = async (service: Service): Promise<any> => {
      removeProjectMember: async (
        _: any,
        { projectMemberId }: { projectMemberId: string },
-        context: any,
+        context: any
      ) => {
        try {
-          return await service.removeProjectMember(
-            context.user,
-            projectMemberId,
-          );
+          return await service.removeProjectMember(context.user, projectMemberId);
        } catch (err) {
          log(err);
          return false;
@@ -93,13 +78,13 @@ export const createResolvers = async (service: Service): Promise<any> => {
        _: any,
        {
          projectMemberId,
-          data,
+          data
        }: {
          projectMemberId: string;
          data: {
            permissions: Permission[];
          };
-        },
+        }
      ) => {
        try {
          return await service.updateProjectMember(projectMemberId, data);
@@ -113,14 +98,14 @@ export const createResolvers = async (service: Service): Promise<any> => {
        _: any,
        {
          projectId,
-          data,
+          data
        }: {
          projectId: string;
          data: {
            email: string;
            permissions: Permission[];
          };
-        },
+        }
      ) => {
        try {
          return Boolean(await service.addProjectMember(projectId, data));
@@ -134,15 +119,15 @@ export const createResolvers = async (service: Service): Promise<any> => {
        _: any,
        {
          projectId,
-          data,
+          data
        }: {
          projectId: string;
          data: { environments: string[]; key: string; value: string }[];
-        },
+        }
      ) => {
        try {
          return Boolean(
-            await service.addEnvironmentVariables(projectId, data),
+            await service.addEnvironmentVariables(projectId, data)
          );
        } catch (err) {
          log(err);
@@ -154,16 +139,16 @@ export const createResolvers = async (service: Service): Promise<any> => {
        _: any,
        {
          environmentVariableId,
-          data,
+          data
        }: {
          environmentVariableId: string;
          data: DeepPartial<EnvironmentVariable>;
-        },
+        }
      ) => {
        try {
          return await service.updateEnvironmentVariable(
            environmentVariableId,
-            data,
+            data
          );
        } catch (err) {
          log(err);
@@ -173,7 +158,7 @@ export const createResolvers = async (service: Service): Promise<any> => {

      removeEnvironmentVariable: async (
        _: any,
-        { environmentVariableId }: { environmentVariableId: string },
+        { environmentVariableId }: { environmentVariableId: string }
      ) => {
        try {
          return await service.removeEnvironmentVariable(environmentVariableId);
@@ -186,45 +171,23 @@ export const createResolvers = async (service: Service): Promise<any> => {
      updateDeploymentToProd: async (
        _: any,
        { deploymentId }: { deploymentId: string },
-        context: any,
+        context: any
      ) => {
        try {
-          return Boolean(
-            await service.updateDeploymentToProd(context.user, deploymentId),
-          );
+          return Boolean(await service.updateDeploymentToProd(context.user, deploymentId));
        } catch (err) {
          log(err);
          return false;
        }
      },

-      addProjectFromTemplate: async (
-        _: any,
-        {
-          organizationSlug,
-          data,
-        }: { organizationSlug: string; data: AddProjectFromTemplateInput },
-        context: any,
-      ) => {
-        try {
-          return await service.addProjectFromTemplate(
-            context.user,
-            organizationSlug,
-            data,
-          );
-        } catch (err) {
-          log(err);
-          throw err;
-        }
-      },
-
      addProject: async (
        _: any,
        {
          organizationSlug,
-          data,
+          data
        }: { organizationSlug: string; data: DeepPartial<Project> },
-        context: any,
+        context: any
      ) => {
        try {
          return await service.addProject(context.user, organizationSlug, data);
@@ -236,7 +199,7 @@ export const createResolvers = async (service: Service): Promise<any> => {

      updateProject: async (
        _: any,
-        { projectId, data }: { projectId: string; data: DeepPartial<Project> },
+        { projectId, data }: { projectId: string; data: DeepPartial<Project> }
      ) => {
        try {
          return await service.updateProject(projectId, data);
@@ -249,12 +212,10 @@ export const createResolvers = async (service: Service): Promise<any> => {
      redeployToProd: async (
        _: any,
        { deploymentId }: { deploymentId: string },
-        context: any,
+        context: any
      ) => {
        try {
-          return Boolean(
-            await service.redeployToProd(context.user, deploymentId),
-          );
+          return Boolean(await service.redeployToProd(context.user, deploymentId));
        } catch (err) {
          log(err);
          return false;
@@ -283,8 +244,8 @@ export const createResolvers = async (service: Service): Promise<any> => {
        _: any,
        {
          projectId,
-          deploymentId,
-        }: { deploymentId: string; projectId: string },
+          deploymentId
+        }: { deploymentId: string; projectId: string }
      ) => {
        try {
          return await service.rollbackDeployment(projectId, deploymentId);
@@ -294,21 +255,9 @@ export const createResolvers = async (service: Service): Promise<any> => {
        }
      },

-      deleteDeployment: async (
-        _: any,
-        { deploymentId }: { deploymentId: string },
-      ) => {
-        try {
-          return await service.deleteDeployment(deploymentId);
-        } catch (err) {
-          log(err);
-          return false;
-        }
-      },
-
      addDomain: async (
        _: any,
-        { projectId, data }: { projectId: string; data: { name: string } },
+        { projectId, data }: { projectId: string; data: { name: string } }
      ) => {
        try {
          return Boolean(await service.addDomain(projectId, data));
@@ -320,7 +269,7 @@ export const createResolvers = async (service: Service): Promise<any> => {

      updateDomain: async (
        _: any,
-        { domainId, data }: { domainId: string; data: DeepPartial<Domain> },
+        { domainId, data }: { domainId: string; data: DeepPartial<Domain> }
      ) => {
        try {
          return await service.updateDomain(domainId, data);
@@ -333,7 +282,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
      authenticateGitHub: async (
        _: any,
        { code }: { code: string },
-        context: any,
+        context: any
      ) => {
        try {
          return await service.authenticateGitHub(code, context.user);
@@ -345,14 +294,12 @@ 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.user, { gitHubToken: null });
        } catch (err) {
          log(err);
          return false;
        }
-      },
-    },
+      }
+    }
  };
 };
@@ -1,119 +1,41 @@
 import { Router } from 'express';
-import { SiweMessage } from 'siwe';
-import { Service } from '../service';
-import { authenticateUser, createUser } from '../turnkey-backend';
+import { SiweMessage, generateNonce } from 'siwe';

 const router = Router();

-//
-// Access Code
-//
-router.post('/accesscode', async (req, res) => {
-  console.log('Access Code', req.body);
-  const { accesscode } = req.body;
-  if (accesscode === '44444') {
-    return res.send({ isValid: true });
-  } else {
-    return res.sendStatus(204);
-  }
+router.get('/nonce', async (_, res) => {
+  res.send(generateNonce());
 });

-//
-// Turnkey
-//
-router.get('/registration/:email', async (req, res) => {
-  const service: Service = req.app.get('service');
-  const user = await service.getUserByEmail(req.params.email);
-  if (user) {
-    return res.send({ subOrganizationId: user?.subOrgId });
-  } else {
-    return res.sendStatus(204);
-  }
-});
-
-router.post('/register', async (req, res) => {
-  console.log('Register', req.body);
-  const { email, challenge, attestation } = req.body;
-  const user = await createUser(req.app.get('service'), {
-    challenge,
-    attestation,
-    userEmail: email,
-    userName: email.split('@')[0],
-  });
-  req.session.userId = user.id;
-  res.sendStatus(200);
-});
-
-router.post('/authenticate', async (req, res) => {
-  console.log('Authenticate', req.body);
-  const { signedWhoamiRequest } = req.body;
-  const user = await authenticateUser(
-    req.app.get('service'),
-    signedWhoamiRequest,
-  );
-  if (user) {
-    req.session.userId = user.id;
-    res.sendStatus(200);
-  } else {
-    res.sendStatus(401);
-  }
-});
-
-//
-// Lit
-//
-
 router.post('/validate', async (req, res) => {
-  const { message, signature, action } = req.body;
+  const { message, signature } = req.body;
  const { success, data } = await new SiweMessage(message).verify({
-    signature,
+    signature
  });

-  if (!success) {
-    return res.send({ success });
-  }
-  const service: Service = req.app.get('service');
-  const user = await service.getUserByEthAddress(data.address);
-
-  if (action === 'signup') {
-    if (user) {
-      return res.send({ success: false, error: 'user_already_exists' });
-    }
-    const newUser = await service.createUser({
-      ethAddress: data.address,
-      email: '',
-      name: '',
-      subOrgId: '',
-      turnkeyWalletId: '',
-    });
-    req.session.userId = newUser.id;
-  } else if (action === 'login') {
-    if (!user) {
-      return res.send({ success: false, error: 'user_not_found' });
-    }
-    req.session.userId = user.id;
+  if (success) {
+    req.session.address = data.address;
+    req.session.chainId = data.chainId;
  }

  res.send({ success });
 });

-//
-// General
-//
 router.get('/session', (req, res) => {
-  if (req.session.userId) {
-    res.send({
-      userId: req.session.userId,
-    });
+  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) => {
-  // This is how you clear cookie-session
-  (req as any).session = null;
-  res.send({ success: true });
+  req.session.destroy((err) => {
+    if (err) {
+      return res.send({ success: false });
+    }
+    res.send({ success: true });
+  });
 });

 export default router;
@@ -1,9 +0,0 @@
-import { Router } from 'express';
-
-const router = Router();
-
-router.get('/version', async (req, res) => {
-  return res.send({ version: '0.0.8' });
-});
-
-export default router;
@@ -19,7 +19,6 @@ enum DeploymentStatus {
  Building
  Ready
  Error
-  Deleting
 }

 enum DomainStatus {
@@ -130,14 +129,6 @@ input AddEnvironmentVariableInput {
  value: String!
 }

-input AddProjectFromTemplateInput {
-  templateOwner: String!
-  templateRepo: String!
-  owner: String!
-  name: String!
-  isPrivate: Boolean!
-}
-
 input AddProjectInput {
  name: String!
  repository: String!
@@ -212,17 +203,12 @@ type Mutation {
  ): Boolean!
  removeEnvironmentVariable(environmentVariableId: String!): Boolean!
  updateDeploymentToProd(deploymentId: String!): Boolean!
-  addProjectFromTemplate(
-    organizationSlug: String!
-    data: AddProjectFromTemplateInput
-  ): Project!
  addProject(organizationSlug: String!, data: AddProjectInput): Project!
  updateProject(projectId: String!, data: UpdateProjectInput): Boolean!
  redeployToProd(deploymentId: String!): Boolean!
  deleteProject(projectId: String!): Boolean!
  deleteDomain(domainId: String!): Boolean!
  rollbackDeployment(projectId: String!, deploymentId: String!): Boolean!
-  deleteDeployment(deploymentId: String!): Boolean!
  addDomain(projectId: String!, data: AddDomainInput!): Boolean!
  updateDomain(domainId: String!, data: UpdateDomainInput!): Boolean!
  authenticateGitHub(code: String!): AuthResult!
@@ -6,9 +6,9 @@ import { createServer } from 'http';
 import {
  ApolloServerPluginDrainHttpServer,
  ApolloServerPluginLandingPageLocalDefault,
-  AuthenticationError,
+  AuthenticationError
 } from 'apollo-server-core';
-import cookieSession from 'cookie-session';
+import session from 'express-session';

 import { TypeSource } from '@graphql-tools/utils';
 import { makeExecutableSchema } from '@graphql-tools/schema';
@@ -17,14 +17,14 @@ import { ServerConfig } from './config';
 import { DEFAULT_GQL_PATH } from './constants';
 import githubRouter from './routes/github';
 import authRouter from './routes/auth';
-import stagingRouter from './routes/staging';
 import { Service } from './service';

 const log = debug('snowball:server');

 declare module 'express-session' {
  interface SessionData {
-    userId: string;
+    address: string;
+    chainId: number;
  }
 }

@@ -32,7 +32,7 @@ export const createAndStartServer = async (
  serverConfig: ServerConfig,
  typeDefs: TypeSource,
  resolvers: any,
-  service: Service,
+  service: Service
 ): Promise<ApolloServer> => {
  const { host, port, gqlPath = DEFAULT_GQL_PATH } = serverConfig;
  const { appOriginUrl, secret, domain, trustProxy } = serverConfig.session;
@@ -45,7 +45,7 @@ export const createAndStartServer = async (
  // Create the schema
  const schema = makeExecutableSchema({
    typeDefs,
-    resolvers,
+    resolvers
  });

  const server = new ApolloServer({
@@ -54,31 +54,46 @@ export const createAndStartServer = async (
    context: async ({ req }) => {
      // https://www.apollographql.com/docs/apollo-server/v3/security/authentication#api-wide-authorization

-      const { userId } = req.session;
+      const { address } = req.session;

-      if (!userId) {
+      if (!address) {
        throw new AuthenticationError('Unauthorized: No active session');
      }

-      const user = await service.getUser(userId);
+      // Find/create user from ETH address in request session
+      const user = await service.loadOrCreateUser(address);

      return { user };
    },
    plugins: [
      // Proper shutdown for the HTTP server
      ApolloServerPluginDrainHttpServer({ httpServer }),
-      ApolloServerPluginLandingPageLocalDefault({ embed: true }),
-    ],
+      ApolloServerPluginLandingPageLocalDefault({ embed: true })
+    ]
  });

  await server.start();

-  app.use(
-    cors({
-      origin: appOriginUrl,
-      credentials: true,
-    }),
-  );
+  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
@@ -86,14 +101,7 @@ export const createAndStartServer = async (
  }

  app.use(
-    cookieSession({
-      secret: secret,
-      secure: new URL(appOriginUrl).protocol === 'https:',
-      // 23 hours (less than 24 hours to avoid sessionSigs expiration issues)
-      maxAge: 23 * 60 * 60 * 1000,
-      sameSite: new URL(appOriginUrl).protocol === 'https:' ? 'none' : 'lax',
-      domain: domain || undefined,
-    }),
+    session(sessionOptions)
  );

  server.applyMiddleware({
@@ -101,8 +109,8 @@ export const createAndStartServer = async (
    path: gqlPath,
    cors: {
      origin: [appOriginUrl],
-      credentials: true,
-    },
+      credentials: true
+    }
  });

  app.use(express.json());
@@ -110,12 +118,6 @@ export const createAndStartServer = async (
  app.set('service', service);
  app.use('/auth', authRouter);
  app.use('/api/github', githubRouter);
-  app.use('/staging', stagingRouter);
-
-  app.use((err: any, req: any, res: any, next: any) => {
-    console.error(err);
-    res.status(500).json({ error: err.message });
-  });

  httpServer.listen(port, host, () => {
    log(`Server is listening on ${host}:${port}${server.graphqlPath}`);
@@ -1,130 +0,0 @@
-import { Turnkey, TurnkeyApiTypes } from '@turnkey/sdk-server';
-
-// Default path for the first Ethereum address in a new HD wallet.
-// See https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki, paths are in the form:
-//     m / purpose' / coin_type' / account' / change / address_index
-// - Purpose is a constant set to 44' following the BIP43 recommendation.
-// - Coin type is set to 60 (ETH) -- see https://github.com/satoshilabs/slips/blob/master/slip-0044.md
-// - Account, Change, and Address Index are set to 0
-import { DEFAULT_ETHEREUM_ACCOUNTS } from '@turnkey/sdk-server';
-import { getConfig } from './utils';
-import { Service } from './service';
-
-type TAttestation = TurnkeyApiTypes['v1Attestation'];
-
-type CreateUserParams = {
-  userName: string;
-  userEmail: string;
-  challenge: string;
-  attestation: TAttestation;
-};
-
-export async function createUser(
-  service: Service,
-  { userName, userEmail, challenge, attestation }: CreateUserParams,
-) {
-  try {
-    if (await service.getUserByEmail(userEmail)) {
-      throw new Error(`User already exists: ${userEmail}`);
-    }
-
-    const config = await getConfig();
-    const turnkey = new Turnkey(config.turnkey);
-
-    const apiClient = turnkey.api();
-
-    const walletName = `Default ETH Wallet`;
-
-    const createSubOrgResponse = await apiClient.createSubOrganization({
-      subOrganizationName: `Default SubOrg for ${userEmail}`,
-      rootQuorumThreshold: 1,
-      rootUsers: [
-        {
-          userName,
-          userEmail,
-          apiKeys: [],
-          authenticators: [
-            {
-              authenticatorName: 'Passkey',
-              challenge,
-              attestation,
-            },
-          ],
-        },
-      ],
-      wallet: {
-        walletName: walletName,
-        accounts: DEFAULT_ETHEREUM_ACCOUNTS,
-      },
-    });
-
-    const subOrgId = refineNonNull(createSubOrgResponse.subOrganizationId);
-    const wallet = refineNonNull(createSubOrgResponse.wallet);
-
-    const result = {
-      id: wallet.walletId,
-      address: wallet.addresses[0],
-      subOrgId: subOrgId,
-    };
-    console.log('Turnkey success', result);
-
-    const user = await service.createUser({
-      name: userName,
-      email: userEmail,
-      subOrgId,
-      ethAddress: wallet.addresses[0],
-      turnkeyWalletId: wallet.walletId,
-    });
-    console.log('New user', user);
-
-    return user;
-  } catch (e) {
-    console.error('Failed to create user:', e);
-    throw e;
-  }
-}
-
-export async function authenticateUser(
-  service: Service,
-  signedWhoamiRequest: {
-    url: string;
-    body: any;
-    stamp: {
-      stampHeaderName: string;
-      stampHeaderValue: string;
-    };
-  },
-) {
-  try {
-    const tkRes = await fetch(signedWhoamiRequest.url, {
-      method: 'POST',
-      body: signedWhoamiRequest.body,
-      headers: {
-        [signedWhoamiRequest.stamp.stampHeaderName]:
-          signedWhoamiRequest.stamp.stampHeaderValue,
-      },
-    });
-    console.log('AUTH RESULT', tkRes.status);
-    if (tkRes.status !== 200) {
-      console.log(await tkRes.text());
-      return null;
-    }
-    const orgId = (await tkRes.json()).organizationId;
-    const user = await service.getUserBySubOrgId(orgId);
-    return user;
-  } catch (e) {
-    console.error('Failed to authenticate:', e);
-    throw e;
-  }
-}
-
-function refineNonNull<T>(
-  input: T | null | undefined,
-  errorMessage?: string,
-): T {
-  if (input == null) {
-    throw new Error(errorMessage ?? `Unexpected ${JSON.stringify(input)}`);
-  }
-
-  return input;
-}
@@ -24,7 +24,6 @@ export interface GitPushEventPayload {
    id: string;
    message: string;
  };
-  deleted: boolean;
 }

 export interface AppDeploymentRecordAttributes {
@@ -38,13 +37,6 @@ export interface AppDeploymentRecordAttributes {
  version: string;
 }

-export interface AppDeploymentRemovalRecordAttributes {
-  deployment: string;
-  request: string;
-  type: 'ApplicationDeploymentRemovalRecord';
-  version: string;
-}
-
 interface RegistryRecord {
  id: string;
  names: string[] | null;
@@ -57,15 +49,3 @@ interface RegistryRecord {
 export interface AppDeploymentRecord extends RegistryRecord {
  attributes: AppDeploymentRecordAttributes;
 }
-
-export interface AppDeploymentRemovalRecord extends RegistryRecord {
-  attributes: AppDeploymentRemovalRecordAttributes;
-}
-
-export interface AddProjectFromTemplateInput {
-  templateOwner: string;
-  templateRepo: string;
-  owner: string;
-  name: string;
-  isPrivate: boolean;
-}
@@ -3,18 +3,11 @@ import path from 'path';
 import toml from 'toml';
 import debug from 'debug';
 import { DataSource, DeepPartial, EntityTarget, ObjectLiteral } from 'typeorm';
-import { Config } from './config';
-import { DEFAULT_CONFIG_FILE_PATH } from './constants';

 const log = debug('snowball:utils');

-export async function getConfig() {
-  // TODO: get config path using cli
-  return await _getConfig<Config>(DEFAULT_CONFIG_FILE_PATH);
-}
-
-const _getConfig = async <ConfigType>(
-  configFile: string,
+export const getConfig = async <ConfigType>(
+  configFile: string
 ): Promise<ConfigType> => {
  const configFilePath = path.resolve(configFile);
  const fileExists = await fs.pathExists(configFilePath);
@@ -48,7 +41,7 @@ export const loadAndSaveData = async <Entity extends ObjectLiteral>(
  entityType: EntityTarget<Entity>,
  dataSource: DataSource,
  entities: any,
-  relations?: any | undefined,
+  relations?: any | undefined
 ): Promise<Entity[]> => {
  const entityRepository = dataSource.getRepository(entityType);

@@ -63,7 +56,7 @@ export const loadAndSaveData = async <Entity extends ObjectLiteral>(

        entity = {
          ...entity,
-          [field]: relations[field][entityData[valueIndex]],
+          [field]: relations[field][entityData[valueIndex]]
        };
      }
    }
@@ -73,6 +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));
@@ -1,6 +1,6 @@
 import debug from 'debug';

-import { Registry } from '@snowballtools/laconic-sdk';
+import { Registry } from '@cerc-io/laconic-sdk';

 import { DEFAULT_CONFIG_FILE_PATH } from '../src/constants';
 import { Config } from '../src/config';
@@ -2,12 +2,12 @@ import debug from 'debug';
 import { DataSource } from 'typeorm';
 import path from 'path';

-import { Registry } from '@snowballtools/laconic-sdk';
+import { Registry } from '@cerc-io/laconic-sdk';

 import { Config } from '../src/config';
 import { DEFAULT_CONFIG_FILE_PATH } from '../src/constants';
 import { getConfig } from '../src/utils';
-import { Deployment, DeploymentStatus, Environment } from '../src/entity/Deployment';
+import { Deployment, DeploymentStatus } from '../src/entity/Deployment';

 const log = debug('snowball:publish-deploy-records');

@@ -40,7 +40,7 @@ async function main () {
  });

  for await (const deployment of deployments) {
-    const url = `https://${deployment.project.name}-${deployment.id}.${misc.projectDomain}`;
+    const url = `${deployment.project.name}-${deployment.id}.${misc.projectDomain}`;

    const applicationDeploymentRecord = {
      type: 'ApplicationDeploymentRecord',
@@ -71,21 +71,6 @@ async function main () {
      registryConfig.fee
    );

-    // Remove deployment for project subdomain if deployment is for production environment
-    if (deployment.environment === Environment.Production) {
-      applicationDeploymentRecord.url = `https://${deployment.project.subDomain}`
-
-      await registry.setRecord(
-        {
-          privateKey: registryConfig.privateKey,
-          record: applicationDeploymentRecord,
-          bondId: registryConfig.bondId
-        },
-        '',
-        registryConfig.fee
-      );
-    }
-
    log('Application deployment record data:', applicationDeploymentRecord);
    log(`Application deployment record published: ${result.data.id}`);
  }
@@ -1,67 +0,0 @@
-import debug from 'debug';
-import { DataSource } from 'typeorm';
-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 { getConfig } from '../src/utils';
-import { Deployment, DeploymentStatus } from '../src/entity/Deployment';
-
-const log = debug('snowball:publish-deployment-removal-records');
-
-async function main () {
-  const { registryConfig, database, misc } = await getConfig<Config>(DEFAULT_CONFIG_FILE_PATH);
-
-  const registry = new Registry(
-    registryConfig.gqlEndpoint,
-    registryConfig.restEndpoint,
-    registryConfig.chainId
-  );
-
-  const dataSource = new DataSource({
-    type: 'better-sqlite3',
-    database: database.dbPath,
-    synchronize: true,
-    entities: [path.join(__dirname, '../src/entity/*')]
-  });
-
-  await dataSource.initialize();
-
-  const deploymentRepository = dataSource.getRepository(Deployment);
-  const deployments = await deploymentRepository.find({
-    relations: {
-      project: true
-    },
-    where: {
-      status: DeploymentStatus.Deleting
-    }
-  });
-
-  for await (const deployment of deployments) {
-    const applicationDeploymentRemovalRecord = {
-      type: "ApplicationDeploymentRemovalRecord",
-      version: "1.0.0",
-      deployment: deployment.applicationDeploymentRecordId,
-      request: deployment.applicationDeploymentRemovalRequestId,
-    }
-
-    const result = await registry.setRecord(
-      {
-        privateKey: registryConfig.privateKey,
-        record: applicationDeploymentRemovalRecord,
-        bondId: registryConfig.bondId
-      },
-      '',
-      registryConfig.fee
-    );
-
-    log('Application deployment removal record data:', applicationDeploymentRemovalRecord);
-    log(`Application deployment removal record published: ${result.data.id}`);
-  }
-}
-
-main().catch((err) => {
-  log(err);
-});
@@ -1,35 +1,74 @@
 # deployer

 - Install dependencies
-
  ```bash
  yarn
  ```
-
  ```bash
  brew install jq # if you do not have jq installed already
  ```

+
+
+
+Example of how to make the necessary deploy edits [here](https://github.com/snowball-tools/snowballtools-base/pull/131/files).
+
+- Replace variables in the following files
+  - [records/application-deployment-request.yml](records/application-deployment-request.yml)
+    - update the name & application version numbers
+    - `<CURRENT_DATE_TIME>`: Replace with current time which can be generated by command `date -u`
+      ```yml
+      # Example
+      record:
+        ...
+        meta:
+          note: Added by Snowball @ Friday 23 February 2024 06:35:50 AM UTC
+          ...
+      ```
+
+- Update record version in [records/application-record.yml](records/application-record.yml)
+  ```yml
+  record:
+    type: ApplicationRecord
+    version: <NEW_VERSION>
+    ...
+  ```
+
+- Update commit hash in the following places:
+  - [records/application-record.yml](records/application-record.yml)
+    ```yml
+    record:
+      ...
+      repository_ref: <COMMIT_HASH>
+      ...
+    ```
+  - [records/application-deployment-request.yml](records/application-deployment-request.yml)
+    ```yml
+    record:
+      ...
+      meta:
+        ...
+        repository_ref: <COMMIT_HASH>
+    ```
+  - [deploy-frontend.sh](deploy-frontend.sh)
+    Also be sure to update the app version
+    ```bash
+    ...
+    RCD_APP_VERSION="<NEW_VERSION>"
+    REPO_REF="<COMMIT_HASH>"
+    ...
+    ```
+
 - Run script to deploy app
-
-  - To deploy frontend app to `dashboard.staging.apps.snowballtools.com`
-
-    ```bash
-    ./deploy-frontend.staging.sh
-    ```
-  
-  - To deploy frontend app to `dashboard.apps.snowballtools.com`
-
-    ```bash
-    ./deploy-frontend.sh
-    ```
+  ```
+  ./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:
    ...
@@ -38,27 +77,23 @@
        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).
+- Check deployment status [here](https://console.laconic.com/deployer).
+- Check records [here](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
+    yarn laconic cns bond get --id 8fcf44b2f326b4b63ac57547777f1c78b7d494e5966e508f09001af53cb440ac
    ```
-
  - Command to refill bond
-
    ```bash
-    yarn laconic cns bond refill --id 99c0e9aec0ac1b8187faa579be3b54f93fafb6060ac1fd29170b860df605be32 --type aphoton --quantity 10000000
+    yarn laconic cns bond refill --id 8fcf44b2f326b4b63ac57547777f1c78b7d494e5966e508f09001af53cb440ac --type aphoton --quantity 10000000
    ```
@@ -1,9 +0,0 @@
-services:
-  cns:
-    restEndpoint: 'http://console.laconic.com:1317'
-    gqlEndpoint: 'http://console.laconic.com:9473/api'
-    userKey: 87d00f66a73e2ca428adeb49ba9164d0ad9a87edc60e33d46ad3031b9c5701fe
-    bondId: 89c75c7bc5759861d10285aff6f9e7227d6855e446b77ad5d8324822dfec7deb
-    chainId: laconic_9000-1
-    gas: 1200000
-    fees: 200000aphoton
@@ -2,8 +2,8 @@ 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
+    userKey: 0524fc22ea0a12e6c5cc4cfe08e73c95dffd0ab5ed72a59f459ed33134fa3b16
+    bondId: 8fcf44b2f326b4b63ac57547777f1c78b7d494e5966e508f09001af53cb440ac
@@ -12,21 +12,22 @@ 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
+# Increment application-record version
+APPLICATION_RECORD_FILE="./records/application-record.yml"
+if [ -f "$APPLICATION_RECORD_FILE" ]; then
+    # Extract current version and increment it
+    CURRENT_VERSION=$(grep 'version:' $APPLICATION_RECORD_FILE | head -1 | awk '{print $2}')
+    IFS='.' read -ra ADDR <<< "$CURRENT_VERSION"
+    VERSION_NUMBER=${ADDR[2]}
+    NEW_VERSION_NUMBER=$((VERSION_NUMBER + 1))
+    NEW_APPLICATION_VERSION="${ADDR[0]}.${ADDR[1]}.$NEW_VERSION_NUMBER"
+else
+    # If file does not exist, start from version 0.0.1
+    NEW_APPLICATION_VERSION="0.0.1"
 fi

 # Generate application-deployment-request.yml
-cat >./records/application-deployment-request.yml <<EOF
+cat > ./records/application-deployment-request.yml <<EOF
 record:
  type: ApplicationDeploymentRequest
  version: '1.0.0'
@@ -35,12 +36,12 @@ record:
  dns: dashboard
  config:
    env:
-      LACONIC_HOSTED_CONFIG_server_url: https://snowballtools-base-api-001.apps.snowballtools.com
-      LACONIC_HOSTED_CONFIG_github_clientid: b7c63b235ca1dd5639ab
-      LACONIC_HOSTED_CONFIG_github_templaterepo: snowball-tools/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: snowball-tools/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: snowball-tools/image-upload-pwa-example
-      LACONIC_HOSTED_CONFIG_wallet_connect_id: eda9ba18042a5ea500f358194611ece2
+      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"
@@ -48,7 +49,7 @@ record:
 EOF

 # Generate application-record.yml with incremented version
-cat >./records/application-record.yml <<EOF
+cat > ./records/application-record.yml <<EOF
 record:
  type: ApplicationRecord
  version: $NEW_APPLICATION_VERSION
@@ -61,54 +62,27 @@ EOF

 echo "Files generated successfully."

+# Reference: https://git.vdb.to/cerc-io/test-progressive-web-app/src/branch/main/scripts
+
 RECORD_FILE=records/application-record.yml
+CONFIG_FILE=config.yml

 # Publish ApplicationRecord
-publish_response=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE)
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to publish record"
-  exit $rc
-fi
-RECORD_ID=$(echo $publish_response | jq -r '.id')
+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"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set name: $REGISTRY_APP_CRN@${PACKAGE_VERSION}"
-  exit $rc
-fi
-sleep 2
 yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN@${LATEST_HASH}" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set hash"
-  exit $rc
-fi
-sleep 2
 # Set name if latest release
 yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set release"
-  exit $rc
-fi
 echo "$REGISTRY_APP_CRN set for ApplicationRecord"

 # Check if record found for REGISTRY_APP_CRN
-query_response=$(yarn --silent laconic -c $CONFIG_FILE cns name resolve "$REGISTRY_APP_CRN")
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to query name"
-  exit $rc
-fi
-APP_RECORD=$(echo $query_response | jq '.[0]')
+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
@@ -116,12 +90,6 @@ fi

 RECORD_FILE=records/application-deployment-request.yml

-sleep 2
-deployment_response=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE)
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to query deployment request"
-  exit $rc
-fi
-DEPLOYMENT_REQUEST_ID=$(echo $deployment_response | jq -r '.id')
+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
@@ -1,133 +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.staging.yml
-REGISTRY_BOND_ID="098c906850b87412f02200e41f449bc79e055eab77acfef32c0b22443bb46661"
-
-# 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 "staging-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 >./staging-records/application-deployment-request.yml <<EOF
-record:
-  type: ApplicationDeploymentRequest
-  version: '1.0.0'
-  name: staging-snowballtools-base-frontend@$PACKAGE_VERSION
-  application: crn://staging-snowballtools/applications/staging-snowballtools-base-frontend@$PACKAGE_VERSION
-  dns: dashboard.staging.apps.snowballtools.com
-  config:
-    env:
-      LACONIC_HOSTED_CONFIG_server_url: https://snowballtools-base-api.staging.apps.snowballtools.com
-      LACONIC_HOSTED_CONFIG_github_clientid: Ov23liOaoahRTYd4nSCV
-      LACONIC_HOSTED_CONFIG_github_templaterepo: snowball-tools/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: snowball-tools/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: snowball-tools/image-upload-pwa-example
-      LACONIC_HOSTED_CONFIG_wallet_connect_id: eda9ba18042a5ea500f358194611ece2
-      LACONIC_HOSTED_CONFIG_lit_relay_api_key: 15DDD969-E75F-404D-AAD9-58A37C4FD354_snowball
-      LACONIC_HOSTED_CONFIG_aplchemy_api_key: THvPart_gqI5x02RNYSBntlmwA66I_qc
-      LACONIC_HOSTED_CONFIG_bugsnag_api_key: 8c480cd5386079f9dd44f9581264a073
-      LACONIC_HOSTED_CONFIG_passkey_wallet_rpid: dashboard.staging.apps.snowballtools.com
-      LACONIC_HOSTED_CONFIG_turnkey_api_base_url: https://api.turnkey.com
-      LACONIC_HOSTED_CONFIG_turnkey_organization_id: 5049ae99-5bca-40b3-8317-504384d4e591
-  meta:
-    note: Added by Snowball @ $CURRENT_DATE_TIME
-    repository: "$REPO_URL"
-    repository_ref: $LATEST_HASH
-EOF
-
-# Generate application-record.yml with incremented version
-cat >./staging-records/application-record.yml <<EOF
-record:
-  type: ApplicationRecord
-  version: $NEW_APPLICATION_VERSION
-  repository_ref: $LATEST_HASH
-  repository: ["$REPO_URL"]
-  app_type: webapp
-  name: staging-snowballtools-base-frontend
-  app_version: $PACKAGE_VERSION
-EOF
-
-echo "Files generated successfully."
-
-RECORD_FILE=staging-records/application-record.yml
-
-# Publish ApplicationRecord
-publish_response=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE)
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to publish record"
-  exit $rc
-fi
-RECORD_ID=$(echo $publish_response | jq -r '.id')
-echo "ApplicationRecord published"
-echo $RECORD_ID
-
-# Set name to record
-REGISTRY_APP_CRN="crn://staging-snowballtools/applications/staging-snowballtools-base-frontend"
-
-sleep 2
-yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN@${PACKAGE_VERSION}" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set name: $REGISTRY_APP_CRN@${PACKAGE_VERSION}"
-  exit $rc
-fi
-sleep 2
-yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN@${LATEST_HASH}" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set hash"
-  exit $rc
-fi
-sleep 2
-# Set name if latest release
-yarn --silent laconic -c $CONFIG_FILE cns name set "$REGISTRY_APP_CRN" "$RECORD_ID"
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to set release"
-  exit $rc
-fi
-echo "$REGISTRY_APP_CRN set for ApplicationRecord"
-
-# Check if record found for REGISTRY_APP_CRN
-query_response=$(yarn --silent laconic -c $CONFIG_FILE cns name resolve "$REGISTRY_APP_CRN")
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to query name"
-  exit $rc
-fi
-APP_RECORD=$(echo $query_response | jq '.[0]')
-if [ -z "$APP_RECORD" ] || [ "null" == "$APP_RECORD" ]; then
-  echo "No record found for $REGISTRY_APP_CRN."
-  exit 1
-fi
-
-RECORD_FILE=staging-records/application-deployment-request.yml
-
-sleep 2
-deployment_response=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE)
-if [ $rc -ne 0 ]; then
-  echo "FATAL: Failed to query deployment request"
-  exit $rc
-fi
-DEPLOYMENT_REQUEST_ID=$(echo $deployment_response | jq -r '.id')
-echo "ApplicationDeploymentRequest published"
-echo $DEPLOYMENT_REQUEST_ID
@@ -4,6 +4,6 @@
  "main": "index.js",
  "private": true,
  "devDependencies": {
-    "@snowballtools/laconic-registry-cli": "^0.1.13"
+    "@cerc-io/laconic-registry-cli": "^0.1.10"
  }
 }
@@ -1,6 +1,6 @@
 record:
  type: ApplicationDeploymentRequest
-  version: "1.0.0"
+  version: '1.0.0'
  name: snowballtools-base-frontend@0.1.8
  application: crn://snowballtools/applications/snowballtools-base-frontend@0.1.8
  dns: dashboard
@@ -8,11 +8,11 @@ record:
    env:
      LACONIC_HOSTED_CONFIG_app_server_url: https://snowballtools-base-api-001.apps.snowballtools.com
      LACONIC_HOSTED_CONFIG_app_github_clientid: b7c63b235ca1dd5639ab
-      LACONIC_HOSTED_CONFIG_app_github_templaterepo: snowball-tools/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_app_github_pwa_templaterepo: snowball-tools/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_app_github_image_upload_templaterepo: snowball-tools/image-upload-pwa-example
+      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
+    note: Added by Snowball @ Thu Feb 29 07:46:48 UTC 2024
    repository: "https://git.vdb.to/cerc-io/snowballtools-base"
-    repository_ref: 351db16336eacc3e1f9119ceb8d1282b8e27a27e
+    repository_ref: a7810a34c90d5bfe0c6cc0697ad9aaf79b1c41d7
@@ -1,7 +1,7 @@
 record:
  type: ApplicationRecord
-  version: 0.0.2
-  repository_ref: 351db16336eacc3e1f9119ceb8d1282b8e27a27e
+  version: 0.0.27
+  repository_ref: a7810a34c90d5bfe0c6cc0697ad9aaf79b1c41d7
  repository: ["https://git.vdb.to/cerc-io/snowballtools-base"]
  app_type: webapp
  name: snowballtools-base-frontend
@@ -1,24 +0,0 @@
-record:
-  type: ApplicationDeploymentRequest
-  version: '1.0.0'
-  name: staging-snowballtools-base-frontend@0.0.0
-  application: crn://staging-snowballtools/applications/staging-snowballtools-base-frontend@0.0.0
-  dns: dashboard.staging.apps.snowballtools.com
-  config:
-    env:
-      LACONIC_HOSTED_CONFIG_server_url: https://snowballtools-base-api.staging.apps.snowballtools.com
-      LACONIC_HOSTED_CONFIG_github_clientid: Ov23liOaoahRTYd4nSCV
-      LACONIC_HOSTED_CONFIG_github_templaterepo: snowball-tools/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: snowball-tools/test-progressive-web-app
-      LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: snowball-tools/image-upload-pwa-example
-      LACONIC_HOSTED_CONFIG_wallet_connect_id: eda9ba18042a5ea500f358194611ece2
-      LACONIC_HOSTED_CONFIG_lit_relay_api_key: 15DDD969-E75F-404D-AAD9-58A37C4FD354_snowball
-      LACONIC_HOSTED_CONFIG_aplchemy_api_key: THvPart_gqI5x02RNYSBntlmwA66I_qc
-      LACONIC_HOSTED_CONFIG_bugsnag_api_key: 8c480cd5386079f9dd44f9581264a073
-      LACONIC_HOSTED_CONFIG_passkey_wallet_rpid: dashboard.staging.apps.snowballtools.com
-      LACONIC_HOSTED_CONFIG_turnkey_api_base_url: https://api.turnkey.com
-      LACONIC_HOSTED_CONFIG_turnkey_organization_id: 5049ae99-5bca-40b3-8317-504384d4e591
-  meta:
-    note: Added by Snowball @ Sat Jun 22 02:49:45 UTC 2024
-    repository: "https://git.vdb.to/cerc-io/snowballtools-base"
-    repository_ref: 61e3e88a6c9d57e95441059369ee5a46f5c07601
@@ -1,8 +0,0 @@
-record:
-  type: ApplicationRecord
-  version: 0.0.1
-  repository_ref: 61e3e88a6c9d57e95441059369ee5a46f5c07601
-  repository: ["https://git.vdb.to/cerc-io/snowballtools-base"]
-  app_type: webapp
-  name: staging-snowballtools-base-frontend
-  app_version: 0.0.0
@@ -1,23 +0,0 @@
-# deployer test
-
-Check if the live web app deployer is in a working state
-
- Web app repo used: <https://github.com/snowball-tools/test-progressive-web-app> (main branch)
- Config used: [../config.yml](../config.yml)
- The script [test-webapp-deployment-undeployment.sh](./test-webapp-deployment-undeployment.sh) performs the following:
-  - Create / update [`ApplicationRecord`](./records/application-record.yml) and [`ApplicationDeploymentRequest`](./records/application-deployment-request.yml) records with latest meta data from the repo
-  - Fetch the latest version of `deployment-test-app` from registry and increment `ApplicationRecord` version
-  - Publish the resulting `ApplicationRecord` record
-  - Set names to the record and check name resolution
-  - Publish the `ApplicationDeploymentRequest` record
-  - Check that the deployment occurs
-    - Check that a `ApplicationDeploymentRecord` is created
-    - Check that the deployment record has correct `ApplicationRecord` id
-    - Check that the URL present in deployment record is active
-  - Create and publish a [`ApplicationDeploymentRemovalRequest`](./records/application-deployment-removal-request.yml) record
-  - Check that the deployment is removed
-    - Check that a `ApplicationDeploymentRemovalRecord` is created
-    - Check that the deployment URL goes down
- The test script is run in a GitHub CI [workflow](../../../.github/workflows/test-app-deployment.yaml) that:
-  - Is scheduled to run everyday on the default (`main`) branch or can be triggered manually
-  - Sends Slack alerts to configured channels on failure
@@ -1,4 +0,0 @@
-record:
-  deployment: <APPLICATION_DEPLOYMENT_RECORD_ID>
-  type: ApplicationDeploymentRemovalRequest
-  version: 1.0.0
@@ -1,15 +0,0 @@
-record:
-  type: ApplicationDeploymentRequest
-  version: "1.0.0"
-  name: deployment-test-app@0.1.24
-  application: crn://snowballtools/applications/deployment-test-app@0.1.24
-  dns: deployment-ci-test
-  config:
-    env:
-      CERC_TEST_WEBAPP_CONFIG1: "deployment test config 1"
-      CERC_TEST_WEBAPP_CONFIG2: "deployment test config 2"
-      CERC_WEBAPP_DEBUG: 0
-  meta:
-    note: Deployment test @ Thu 11 Apr 2024 07:29:19 AM UTC
-    repository: "https://github.com/snowball-tools/test-progressive-web-app"
-    repository_ref: 05819619487a0d2dbc5453b6d1ccff3044c0dd26
@@ -1,8 +0,0 @@
-record:
-  type: ApplicationRecord
-  version: 0.0.1
-  repository_ref: 05819619487a0d2dbc5453b6d1ccff3044c0dd26
-  repository: ["https://github.com/snowball-tools/test-progressive-web-app"]
-  app_type: webapp
-  name: deployment-test-app
-  app_version: 0.1.24
@@ -1,225 +0,0 @@
-#!/bin/bash
-
-# Repository URL
-REPO_URL="https://github.com/snowball-tools/test-progressive-web-app"
-
-# Get the latest commit hash from the repository
-LATEST_HASH=$(git ls-remote $REPO_URL HEAD | awk '{print $1}')
-
-# Fetch the package.json file content
-# Extract version from package.json content
-package_json=$(wget -qO- "$REPO_URL/raw/$LATEST_HASH/package.json")
-PACKAGE_VERSION=$(echo "$package_json" | jq -r '.version')
-
-# Current date and time for note
-CURRENT_DATE_TIME=$(date -u)
-
-CONFIG_FILE=packages/deployer/config.yml
-REGISTRY_BOND_ID="99c0e9aec0ac1b8187faa579be3b54f93fafb6060ac1fd29170b860df605be32"
-
-# Reference: https://git.vdb.to/cerc-io/test-progressive-web-app/src/branch/main/scripts
-
-APP_NAME=deployment-test-app
-
-# 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 "$APP_NAME" 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-record.yml with incremented version
-RECORD_FILE=packages/deployer/test/records/application-record.yml
-
-cat >$RECORD_FILE <<EOF
-record:
-  type: ApplicationRecord
-  version: $NEW_APPLICATION_VERSION
-  repository_ref: $LATEST_HASH
-  repository: ["$REPO_URL"]
-  app_type: webapp
-  name: $APP_NAME
-  app_version: $PACKAGE_VERSION
-EOF
-
-# Generate application-deployment-request.yml
-REQUEST_RECORD_FILE=packages/deployer/test/records/application-deployment-request.yml
-
-cat >$REQUEST_RECORD_FILE <<EOF
-record:
-  type: ApplicationDeploymentRequest
-  version: '1.0.0'
-  name: $APP_NAME@$PACKAGE_VERSION
-  application: crn://snowballtools/applications/$APP_NAME@$PACKAGE_VERSION
-  dns: deployment-ci-test
-  config:
-    env:
-      CERC_TEST_WEBAPP_CONFIG1: "deployment test config 1"
-      CERC_TEST_WEBAPP_CONFIG2: "deployment test config 2"
-      CERC_WEBAPP_DEBUG: 0
-  meta:
-    note: Deployment test @ $CURRENT_DATE_TIME
-    repository: "$REPO_URL"
-    repository_ref: $LATEST_HASH
-EOF
-
-echo "Record files generated successfully."
-
-# 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/$APP_NAME"
-
-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 exists 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
-
-sleep 2
-DEPLOYMENT_REQUEST_ID=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $REQUEST_RECORD_FILE | jq -r '.id')
-echo "ApplicationDeploymentRequest published"
-echo $DEPLOYMENT_REQUEST_ID
-
-# Deployment checks
-RETRY_INTERVAL=30
-MAX_RETRIES=20
-
-# Check that a ApplicationDeploymentRecord is published
-retry_count=0
-while true; do
-  deployment_records_response=$(yarn --silent laconic -c $CONFIG_FILE cns record list --type ApplicationDeploymentRecord --all --name "$APP_NAME" request $DEPLOYMENT_REQUEST_ID)
-  len_deployment_records=$(echo $deployment_records_response | jq 'length')
-
-  # Check if number of records returned is 0
-  if [ $len_deployment_records -eq 0 ]; then
-    # Check if retries are exhausted
-    if [ $retry_count -eq $MAX_RETRIES ]; then
-      echo "Retries exhausted"
-      echo "ApplicationDeploymentRecord for deployment request $DEPLOYMENT_REQUEST_ID not found, exiting"
-      exit 1
-    else
-      echo "ApplicationDeploymentRecord not found, retrying in $RETRY_INTERVAL sec..."
-      sleep $RETRY_INTERVAL
-      retry_count=$((retry_count + 1))
-    fi
-  else
-    echo "ApplicationDeploymentRecord found"
-    break
-  fi
-done
-
-DEPLOYMENT_RECORD_ID=$(echo $deployment_records_response | jq -r '.[0].id')
-echo $DEPLOYMENT_RECORD_ID
-
-# Check if ApplicationDeploymentRecord has the correct record id
-fetched_application_record_id=$(echo $deployment_records_response | jq -r '.[0].attributes.application')
-if [ "$fetched_application_record_id" = "$RECORD_ID" ]; then
-  echo "ApplicationRecord id matched"
-else
-  echo "ApplicationRecord id does not match, expected: $RECORD_ID, received: $fetched_application_record_id"
-  exit 1
-fi
-
-# Check if the url present in ApplicationDeploymentRecord is active
-fetched_url=$(echo $deployment_records_response | jq -r '.[0].attributes.url')
-
-retry_count=0
-max_retries=10
-retry_interval=5
-while true; do
-  url_response=$(curl -s -o /dev/null -I -w "%{http_code}" $fetched_url)
-  if [ "$url_response" = "200" ]; then
-    echo "Deployment URL $fetched_url is active"
-    break
-  else
-    if [ $retry_count -eq $max_retries ]; then
-      echo "Retries exhausted"
-      echo "Deployment URL $fetched_url is not active, exiting"
-      exit 1
-    else
-      echo "Deployment URL $fetched_url is not active, received code $url_response, retrying in $retry_interval sec..."
-      sleep $retry_interval
-      retry_count=$((retry_count + 1))
-    fi
-  fi
-done
-
-# Generate application-deployment-removal-request.yml
-REMOVAL_REQUEST_RECORD_FILE=packages/deployer/test/records/application-deployment-removal-request.yml
-
-cat >$REMOVAL_REQUEST_RECORD_FILE <<EOF
-record:
-  deployment: $DEPLOYMENT_RECORD_ID
-  type: ApplicationDeploymentRemovalRequest
-  version: 1.0.0
-EOF
-
-sleep 2
-REMOVAL_REQUEST_ID=$(yarn --silent laconic -c $CONFIG_FILE cns record publish --filename $REMOVAL_REQUEST_RECORD_FILE | jq -r '.id')
-echo "ApplicationDeploymentRemovalRequest published"
-echo $REMOVAL_REQUEST_ID
-
-# Check that an ApplicationDeploymentRemovalRecord is published
-retry_count=0
-while true; do
-  removal_records_response=$(yarn --silent laconic -c $CONFIG_FILE cns record list --type ApplicationDeploymentRemovalRecord --all request $REMOVAL_REQUEST_ID)
-  len_removal_records=$(echo $removal_records_response | jq 'length')
-
-  # Check if number of records returned is 0
-  if [ $len_removal_records -eq 0 ]; then
-    # Check if retries are exhausted
-    if [ $retry_count -eq $MAX_RETRIES ]; then
-      echo "Retries exhausted"
-      echo "ApplicationDeploymentRemovalRecord for deployment removal request $REMOVAL_REQUEST_ID not found"
-      exit 1
-    else
-      echo "ApplicationDeploymentRemovalRecord not found, retrying in $RETRY_INTERVAL sec..."
-      sleep $RETRY_INTERVAL
-      retry_count=$((retry_count + 1))
-    fi
-  else
-    echo "ApplicationDeploymentRemovalRecord found"
-    REMOVAL_RECORD_ID=$(echo $removal_records_response | jq -r '.[0].id')
-    echo $REMOVAL_RECORD_ID
-    break
-  fi
-done
-
-# Check if the application url is down after deployment removal
-retry_count=0
-max_retries=10
-retry_interval=5
-while true; do
-  url_response=$(curl -s -o /dev/null -I -w "%{http_code}" $fetched_url)
-  if [ "$url_response" = "404" ]; then
-    echo "Deployment URL $fetched_url is down"
-    break
-  else
-    if [ $retry_count -eq $max_retries ]; then
-      echo "Retries exhausted"
-      echo "Deployment URL $fetched_url is still active, exiting"
-      exit 1
-    else
-      echo "Deployment URL $fetched_url is still active, received code $url_response, retrying in $retry_interval sec..."
-      sleep $retry_interval
-      retry_count=$((retry_count + 1))
-    fi
-  fi
-done
-
-echo "Test successful"
@@ -1,17 +1,7 @@
-VITE_SERVER_URL='http://localhost:8000'
+REACT_APP_SERVER_URL = 'http://localhost:8000'

-VITE_GITHUB_CLIENT_ID=
-VITE_GITHUB_PWA_TEMPLATE_REPO="snowball-tools/test-progressive-web-app"
-VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO="snowball-tools/image-upload-pwa-example"
+REACT_APP_GITHUB_CLIENT_ID = 
+REACT_APP_GITHUB_PWA_TEMPLATE_REPO =
+REACT_APP_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO =

-VITE_WALLET_CONNECT_ID=
-
-VITE_LIT_RELAY_API_KEY=
-
-VITE_ALCHEMY_API_KEY=
-
-VITE_BUGSNAG_API_KEY=
-
-VITE_PASSKEY_WALLET_RPID=
-VITE_TURNKEY_API_BASE_URL=
-VITE_TURNKEY_ORGANIZATION_ID=
+REACT_APP_WALLET_CONNECT_ID = 
@@ -0,0 +1 @@
+build
@@ -1,19 +0,0 @@
-module.exports = {
-  root: true,
-  env: { browser: true, es2020: true },
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/recommended',
-    'plugin:react-hooks/recommended',
-    'plugin:storybook/recommended',
-  ],
-  ignorePatterns: ['dist', '.eslintrc.cjs'],
-  parser: '@typescript-eslint/parser',
-  plugins: ['react-refresh'],
-  rules: {
-    'react-refresh/only-export-components': [
-      'warn',
-      { allowConstantExport: true },
-    ],
-  },
-};
@@ -0,0 +1,25 @@
+{
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "ecmaVersion": 13,
+    "sourceType": "module"
+  },
+  "env": {
+    "browser": true,
+    "es2021": true
+  },
+  "plugins": ["react", "@typescript-eslint"],
+  "extends": [
+    "plugin:react/recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:prettier/recommended"
+  ],
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
+  }
+}
@@ -22,4 +22,3 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-*storybook.log
@@ -1 +0,0 @@
-v20.12.1
@@ -1 +1,3 @@
-dist/
+# artifacts
+build
+coverage
@@ -1,33 +0,0 @@
-import type { StorybookConfig } from '@storybook/react-vite';
-
-import { join, dirname } from 'path';
-
-/**
- * This function is used to resolve the absolute path of a package.
- * It is needed in projects that use Yarn PnP or are set up within a monorepo.
- */
-function getAbsolutePath(value: string): any {
-  return dirname(require.resolve(join(value, 'package.json')));
-}
-
-const config: StorybookConfig = {
-  stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
-  addons: [
-    getAbsolutePath('@storybook/addon-onboarding'),
-    getAbsolutePath('@storybook/addon-links'),
-    getAbsolutePath('@storybook/addon-essentials'),
-    getAbsolutePath('@chromatic-com/storybook'),
-    getAbsolutePath('@storybook/addon-interactions'),
-    getAbsolutePath('storybook-addon-remix-react-router'),
-  ],
-  framework: {
-    name: getAbsolutePath('@storybook/react-vite'),
-    options: {},
-  },
-  docs: {
-    autodocs: 'tag',
-  },
-  staticDirs: ['../public'],
-};
-
-export default config;
@@ -1,16 +0,0 @@
-import type { Preview } from '@storybook/react';
-
-import '../src/index.css';
-
-const preview: Preview = {
-  parameters: {
-    controls: {
-      matchers: {
-        color: /(background|color)$/i,
-        date: /Date$/i,
-      },
-    },
-  },
-};
-
-export default preview;
@@ -1,63 +1,46 @@
-# frontend
+# Getting Started with Create React App

-This is a [vite](https://vitejs.dev/) [react](https://reactjs.org/) [nextjs](https://nextjs.org/) project in a [yarn workspace](https://yarnpkg.com/features/workspaces).
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app), using [typescript-tailwindcss-eslint-prettier](https://github.com/cufarvid/cra-templates) template.

-## Getting Started
+## Available Scripts

-### Install dependencies
+In the project directory, you can run:

-In the root of the project, run:
+### `yarn start`

-```zsh
-yarn
-```
+Runs the app in the development mode.\
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.

-### Build backend
+The page will reload if you make edits.\
+You will also see any lint errors in the console.

-```zsh
-yarn build --ignore frontend
-```
+### `yarn test`

-### Environment variables
+Launches the test runner in the interactive watch mode.\
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.

-#### Local
+### `yarn build`

-Copy the `.env.example` file to `.env`:
+Builds the app for production to the `build` folder.\
+It correctly bundles React in production mode and optimizes the build for the best performance.

-```zsh
-cp .env.example .env
-```
+The build is minified and the filenames include the hashes.\
+Your app is ready to be deployed!

-#### Staging environment variables
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

-Change in [deployer/deploy-frontend.staging.sh](/packages/deployer/deploy-frontend.staging.sh)
+### `yarn eject`

-#### Production environment variables
+**Note: this is a one-way operation. Once you `eject`, you can’t go back!**

-Change in [deployer/deploy-frontend.sh](/packages/deployer/deploy-frontend.sh)
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.

-### Run development server
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.

-```zsh
-yarn dev
-```
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.

-## Deployment
+## Learn More

-From the root of the project, run:
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

-### Staging
-
-```zsh
-cd packages/deployer && ./deploy-frontend.staging.sh
-```
-
-### Production
-
-```zsh
-cd packages/deployer && ./deploy-frontend.sh
-```
-
-### Deployment status
-
-Check the status of the deployment [here](https://webapp-deployer.apps.snowballtools.com)
+To learn React, check out the [React documentation](https://reactjs.org/).
@@ -1,4 +0,0 @@
-{
-  "projectId": "Project:663d04870db27ed66a48e466",
-  "zip": true
-}
@@ -1,22 +0,0 @@
-<!doctype html>
-<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="/favicon.ico" />
-    <link rel="apple-touch-icon" href="/logo192.png" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
-    <link rel="manifest" href="/site.webmanifest" />
-    <meta name="msapplication-TileColor" content="#2d89ef" />
-    <meta name="theme-color" content="#ffffff" />
-    <link rel="manifest" href="/manifest.json" />
-    <title>Snowball</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/index.tsx"></script>
-  </body>
-</html>
@@ -0,0 +1,7 @@
+<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>
@@ -1,48 +1,27 @@
 {
  "name": "frontend",
+  "version": "0.1.8",
  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite --port 3000",
-    "build": "vite build",
-    "lint": "tsc --noEmit",
-    "preview": "vite preview",
-    "format": "prettier --write .",
-    "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build"
-  },
  "dependencies": {
-    "@bugsnag/browser-performance": "^2.4.1",
-    "@bugsnag/js": "^7.22.7",
-    "@bugsnag/plugin-react": "^7.22.7",
    "@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-tabs": "^1.0.4",
    "@radix-ui/react-toast": "^1.1.5",
    "@radix-ui/react-tooltip": "^1.0.7",
-    "@snowballtools/auth": "^0.2.0",
-    "@snowballtools/auth-lit": "^0.2.0",
-    "@snowballtools/js-sdk": "^0.1.1",
-    "@snowballtools/link-lit-alchemy-light": "^0.2.0",
-    "@snowballtools/material-tailwind-react-fork": "^2.1.10",
-    "@snowballtools/smartwallet-alchemy-light": "^0.2.0",
-    "@snowballtools/types": "^0.2.0",
-    "@snowballtools/utils": "^0.1.1",
    "@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",
-    "@turnkey/http": "^2.10.0",
-    "@turnkey/sdk-react": "^0.1.0",
-    "@turnkey/webauthn-stamper": "^0.5.0",
-    "@walletconnect/ethereum-provider": "^2.12.2",
+    "@types/jest": "^27.5.2",
+    "@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",
@@ -50,9 +29,8 @@
    "clsx": "^2.1.0",
    "date-fns": "^3.3.1",
    "downshift": "^8.3.2",
-    "framer-motion": "^11.0.8",
+    "eslint-config-react-app": "^7.0.1",
    "gql-client": "^1.0.0",
-    "lottie-react": "^2.4.0",
    "luxon": "^3.4.4",
    "octokit": "^3.1.2",
    "react": "^18.2.0",
@@ -62,43 +40,57 @@
    "react-dom": "^18.2.0",
    "react-dropdown": "^1.11.0",
    "react-hook-form": "^7.49.0",
+    "react-hot-toast": "^2.4.1",
    "react-oauth-popup": "^1.0.5",
    "react-router-dom": "^6.20.1",
+    "react-scripts": "5.0.1",
    "react-timer-hook": "^3.0.7",
    "siwe": "^2.1.4",
    "tailwind-variants": "^0.2.0",
-    "usehooks-ts": "^2.15.1",
-    "uuid": "^9.0.1",
+    "typescript": "^4.9.5",
+    "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": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
+    "lint": "eslint ."
+  },
+  "eslintConfig": {
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  },
  "devDependencies": {
-    "@chromatic-com/storybook": "^1.3.3",
-    "@storybook/addon-essentials": "^8.0.10",
-    "@storybook/addon-interactions": "^8.0.10",
-    "@storybook/addon-links": "^8.0.10",
-    "@storybook/addon-onboarding": "^8.0.10",
-    "@storybook/blocks": "^8.0.10",
-    "@storybook/react": "^8.0.10",
-    "@storybook/react-vite": "^8.0.10",
-    "@storybook/test": "^8.0.10",
-    "@types/jest": "^27.5.2",
-    "@types/lodash": "^4.17.0",
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
    "@types/luxon": "^3.3.7",
-    "@types/node": "^16.18.68",
-    "@types/react": "^18.2.66",
-    "@types/react-dom": "^18.2.22",
-    "@types/uuid": "^9.0.8",
-    "@vitejs/plugin-react": "^4.2.1",
-    "autoprefixer": "^10.4.19",
-    "chromatic": "^11.3.2",
-    "eslint-plugin-storybook": "^0.8.0",
-    "postcss": "^8.4.38",
+    "@typescript-eslint/eslint-plugin": "^6.13.2",
+    "@typescript-eslint/parser": "^6.13.2",
+    "eslint": "^8.55.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-react": "^7.33.2",
    "prettier": "^3.1.0",
-    "storybook": "^8.0.10",
-    "storybook-addon-remix-react-router": "^3.0.0",
-    "tailwindcss": "^3.4.3",
-    "typescript": "^5.3.3",
-    "vite": "^5.2.0"
+    "tailwindcss": "^3.4.1"
  }
 }
@@ -1,6 +0,0 @@
-export default {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-};
@@ -1,3 +0,0 @@
-<svg width="197" height="2" viewBox="0 0 197 2" fill="none" xmlns="http://www.w3.org/2000/svg">
-<line x1="0.5" y1="1.19141" x2="197" y2="1.19141" stroke="#94A7B8" stroke-dasharray="1 12"/>
-</svg>
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-(cd /Users/rabbit-m2/p/snowball/js-sdk && NO_CLEAN=1 turbo build)
-
-(cd ../.. && ./scripts/yarn-file-for-local-dev.sh)
-
-rm -rf node_modules/.vite
-
-yarn dev
@@ -1,3 +1,4 @@
+import React from 'react';
 import { render, screen } from '@testing-library/react';
 import App from './App';

@@ -1,4 +1,4 @@
-import { useEffect } from 'react';
+import React from 'react';
 import { createBrowserRouter, RouterProvider } from 'react-router-dom';

 import Projects from './pages/org-slug';
@@ -9,10 +9,8 @@ import {
 } from './pages/org-slug/projects/routes';
 import ProjectSearchLayout from './layouts/ProjectSearch';
 import Index from './pages';
-import AuthPage from './pages/AuthPage';
-import { DashboardLayout } from './pages/org-slug/layout';
-import Web3Provider from 'context/Web3Provider';
-import { baseUrl } from 'utils/constants';
+import Login from './pages/Login';
+import { DashboardLayout } from 'pages/org-slug/layout';

 const router = createBrowserRouter([
  {
@@ -48,36 +46,12 @@ const router = createBrowserRouter([
  },
  {
    path: '/login',
-    element: <AuthPage />,
-  },
-  {
-    path: '/signup',
-    element: <AuthPage />,
+    element: <Login />,
  },
 ]);

 function App() {
-  // Hacky way of checking session
-  // TODO: Handle redirect backs
-  useEffect(() => {
-    fetch(`${baseUrl}/auth/session`, {
-      credentials: 'include',
-    }).then((res) => {
-      if (res.status !== 200) {
-        localStorage.clear();
-        const path = window.location.pathname;
-        if (path !== '/login' && path !== '/signup') {
-          window.location.pathname = '/login';
-        }
-      }
-    });
-  }, []);
-
-  return (
-    <Web3Provider>
-      <RouterProvider router={router} />
-    </Web3Provider>
-  );
+  return <RouterProvider router={router} />;
 }

 export default App;
@@ -1,21 +1,16 @@
-import {
-  VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO,
-  VITE_GITHUB_PWA_TEMPLATE_REPO,
-} from 'utils/constants';
-
 export default [
  {
    id: '1',
    name: 'Progressive Web App (PWA)',
    icon: 'pwa',
-    repoFullName: `${VITE_GITHUB_PWA_TEMPLATE_REPO}`,
+    repoFullName: `${process.env.REACT_APP_GITHUB_PWA_TEMPLATE_REPO}`,
    isComingSoon: false,
  },
  {
    id: '2',
    name: 'Image Upload PWA',
    icon: 'pwa',
-    repoFullName: `${VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO}`,
+    repoFullName: `${process.env.REACT_APP_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO}`,
    isComingSoon: false,
  },
  {
@@ -1,219 +0,0 @@
-import React from 'react';
-
-type Props = React.PropsWithChildren<{
-  className?: string;
-  snowZIndex?: number;
-}>;
-
-export const CloudyFlow = ({ className, children, snowZIndex }: Props) => {
-  return (
-    <div className={`bg-sky-100 relative ${className || ''}`}>
-      {children}
-      <div
-        className="absolute inset-0 overflow-hidden"
-        style={{ zIndex: snowZIndex || 0 }}
-      >
-        <div className="w-[3.72px] h-[3.72px] left-[587px] top-[147px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.72px] h-[4.72px] left-[742px] top-[336px] absolute bg-white rounded-full" />
-        <div className="w-[3.49px] h-[3.49px] left-[36px] top-[68px] absolute bg-white rounded-full" />
-        <div className="w-[3.25px] h-[3.25px] left-[55px] top-[114px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.60px] h-[5.60px] left-[1334px] top-[63px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[3.53px] h-[3.53px] left-[988px] top-[108px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.65px] h-[2.65px] left-[1380px] top-[16px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[3.60px] h-[3.60px] left-[1284px] top-[95px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-0.5 h-0.5 left-[1191px] top-[376px] absolute bg-white rounded-full" />
-        <div className="w-[2.83px] h-[2.83px] left-[1182px] top-[257px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[2.41px] h-[2.41px] left-[627px] top-[26px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[5.71px] h-[5.71px] left-[30px] top-[33px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.09px] h-[4.09px] left-[425px] top-[386px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[3.38px] h-[3.38px] left-[394px] top-[29px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.70px] h-[4.70px] left-[817px] top-[113px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-1.5 h-1.5 left-[1194px] top-[332px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.89px] h-[4.89px] left-[811px] top-[76px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.25px] h-[4.25px] left-[458px] top-[366px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[4.82px] h-[4.82px] left-[936px] top-[46px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[3.74px] h-[3.74px] left-[64px] top-[132px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-1 h-1 left-[763px] top-[10px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[3.67px] h-[3.67px] left-[861px] top-[106px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[3.62px] h-[3.62px] left-[710px] top-[278px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[3.45px] h-[3.45px] left-[1069px] top-[329px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.92px] h-[2.92px] left-[1286px] top-[299px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.84px] h-[4.84px] left-[219px] top-[269px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[2.39px] h-[2.39px] left-[817px] top-[121px] absolute bg-white rounded-full" />
-        <div className="w-[5.83px] h-[5.83px] left-[168px] top-[320px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.94px] h-[5.94px] left-[419px] top-[244px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.67px] h-[4.67px] left-[604px] top-[309px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.87px] h-[5.87px] left-[1098px] top-[379px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[5.85px] h-[5.85px] left-[644px] top-[352px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[4.19px] h-[4.19px] left-[1361px] top-[349px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[2.84px] h-[2.84px] left-[1299px] top-[194px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[4.51px] h-[4.51px] left-[468px] top-[319px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.73px] h-[2.73px] left-[1084px] top-[86px] absolute bg-white rounded-full" />
-        <div className="w-[3.43px] h-[3.43px] left-[1271px] top-[28px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[2.25px] h-[2.25px] left-[106px] top-[197px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[2.82px] h-[2.82px] left-[122px] top-[173px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.89px] h-[2.89px] left-[343px] top-[345px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.82px] h-[2.82px] left-[433px] top-[40px] absolute bg-white rounded-full" />
-        <div className="w-[4.11px] h-[4.11px] left-[904px] top-[350px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.42px] h-[4.42px] left-[1066px] top-[349px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[4.67px] h-[4.67px] left-[904px] top-[317px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[5.54px] h-[5.54px] left-[501px] top-[336px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[4.11px] h-[4.11px] left-[1149px] top-[206px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[3.55px] h-[3.55px] left-[235px] top-[362px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[2.60px] h-[2.60px] left-[1246px] top-[1px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.94px] h-[2.94px] left-[788px] top-[6px] absolute bg-white rounded-full" />
-        <div className="w-[4.19px] h-[4.19px] left-[527px] top-[365px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[4.13px] h-[4.13px] left-[201px] top-[53px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.94px] h-[2.94px] left-[765px] top-[13px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[4.11px] h-[4.11px] left-[1254px] top-[30px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[3.85px] h-[3.85px] left-[107px] top-[316px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[5.72px] h-[5.72px] left-[1305px] top-[8px] absolute bg-white rounded-full" />
-        <div className="w-[5.46px] h-[5.46px] left-[102px] top-[316px] absolute bg-white rounded-full" />
-        <div className="w-[3.77px] h-[3.77px] left-[1322px] top-[334px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.84px] h-[4.84px] left-[1370px] top-[317px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.55px] h-[5.55px] left-[945px] top-[258px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[2.24px] h-[2.24px] left-[266px] top-[362px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.89px] h-[2.89px] left-[987px] top-[156px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[3.46px] h-[3.46px] left-[10px] top-[168px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.67px] h-[5.67px] left-[441px] top-[291px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[4.07px] h-[4.07px] left-[962px] top-[364px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[5.57px] h-[5.57px] left-[599px] top-[293px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[4.41px] h-[4.41px] left-[358px] top-[163px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[2.31px] h-[2.31px] left-[670px] top-[182px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.60px] h-[2.60px] left-[621px] top-[257px] absolute bg-white rounded-full" />
-        <div className="w-[2.16px] h-[2.16px] left-[48px] top-[322px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[5.91px] h-[5.91px] left-[491px] top-[5px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.50px] h-[5.50px] left-[1139px] top-[274px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[3.74px] h-[3.74px] left-[24px] top-[177px] absolute bg-white rounded-full" />
-        <div className="w-[5.57px] h-[5.57px] left-[1166px] top-[316px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[5px] h-[5px] left-[445px] top-[326px] absolute bg-white rounded-full" />
-        <div className="w-[3.01px] h-[3.01px] left-[438px] top-[252px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[4.14px] h-[4.14px] left-[554px] top-[131px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[5.30px] h-[5.30px] left-[1010px] top-[116px] absolute bg-white rounded-full" />
-        <div className="w-[5.53px] h-[5.53px] left-[437px] top-[367px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.87px] h-[5.87px] left-[948px] top-[27px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[2.87px] h-[2.87px] left-[826px] top-[20px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[3.89px] h-[3.89px] left-[1222px] top-[112px] absolute bg-white rounded-full" />
-        <div className="w-[3.77px] h-[3.77px] left-[796px] top-[395px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.09px] h-[2.09px] left-[272px] top-[103px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.12px] h-[4.12px] left-[76px] top-[2px] absolute bg-white rounded-full" />
-        <div className="w-[3.51px] h-[3.51px] left-[226px] top-[276px] absolute bg-white rounded-full" />
-        <div className="w-[3.03px] h-[3.03px] left-[723px] top-[197px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.14px] h-[2.14px] left-[1259px] top-[17px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[3.28px] h-[3.28px] left-[1244px] top-[293px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[4.45px] h-[4.45px] left-[118px] top-[128px] absolute bg-white rounded-full" />
-        <div className="w-[4.15px] h-[4.15px] left-[490px] top-[204px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[4.93px] h-[4.93px] left-[552px] top-[38px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[5.56px] h-[5.56px] left-[115px] top-[303px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.35px] h-[2.35px] left-[509px] top-[278px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.24px] h-[5.24px] left-[804px] top-[389px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[2.44px] h-[2.44px] left-[1013px] top-[50px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[3.69px] h-[3.69px] left-[1183px] top-[95px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.83px] h-[2.83px] left-[278px] top-[181px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[3.22px] h-[3.22px] left-[1316px] top-[282px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[3.55px] h-[3.55px] left-[736px] top-[119px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[2.29px] h-[2.29px] left-[483px] top-[319px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.14px] h-[2.14px] left-[1135px] top-[19px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[3.64px] h-[3.64px] left-[39px] top-[126px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[5.30px] h-[5.30px] left-[237px] top-[369px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.57px] h-[5.57px] left-[1156px] top-[126px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.78px] h-[2.78px] left-[1295px] top-[74px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-0.5 h-0.5 left-[76px] top-[227px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[3.61px] h-[3.61px] left-[108px] top-[89px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[5.37px] h-[5.37px] left-[191px] top-[167px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.18px] h-[4.18px] left-[164px] top-[117px] absolute bg-white rounded-full" />
-        <div className="w-[5.15px] h-[5.15px] left-[533px] top-[261px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-1.5 h-1.5 left-[327px] top-[157px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[5.74px] h-[5.74px] left-[1242px] top-[122px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.22px] h-[4.22px] left-[129px] top-[265px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[2.30px] h-[2.30px] left-[1305px] top-[86px] absolute bg-white rounded-full" />
-        <div className="w-[2.70px] h-[2.70px] left-[1235px] top-[120px] absolute bg-white rounded-full" />
-        <div className="w-[2.15px] h-[2.15px] left-[596px] top-[103px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[2.17px] h-[2.17px] left-[483px] top-[233px] absolute bg-white rounded-full" />
-        <div className="w-[5.09px] h-[5.09px] left-[706px] top-[188px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[4.15px] h-[4.15px] left-[141px] top-[2px] absolute bg-white rounded-full" />
-        <div className="w-[4.20px] h-[4.20px] left-[48px] top-[124px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[3.51px] h-[3.51px] left-[1095px] top-[201px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[3.21px] h-[3.21px] left-[730px] top-[185px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[2.61px] h-[2.61px] left-[722px] top-[319px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[2.28px] h-[2.28px] left-[444px] top-[26px] absolute bg-white rounded-full" />
-        <div className="w-[4.49px] h-[4.49px] left-[355px] top-[212px] absolute bg-white rounded-full" />
-        <div className="w-[3.69px] h-[3.69px] left-[1280px] top-[312px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.23px] h-[4.23px] left-[1114px] top-[113px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[3.48px] h-[3.48px] left-[729px] top-[117px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.11px] h-[4.11px] left-[647px] top-[276px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.16px] h-[4.16px] left-[365px] top-[116px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.35px] h-[5.35px] left-[94px] top-[194px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.84px] h-[5.84px] left-[2px] top-[84px] absolute bg-white rounded-full" />
-        <div className="w-[4.43px] h-[4.43px] left-[1382px] top-[23px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[5.38px] h-[5.38px] left-[857px] top-[284px] absolute bg-white rounded-full" />
-        <div className="w-[2.77px] h-[2.77px] left-[1228px] top-[385px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.65px] h-[4.65px] left-[165px] top-[184px] absolute bg-white rounded-full" />
-        <div className="w-[5.53px] h-[5.53px] left-[568px] top-[354px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[3.59px] h-[3.59px] left-[1303px] top-[371px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[5.84px] h-[5.84px] left-[235px] top-[188px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[3.84px] h-[3.84px] left-[902px] top-[211px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[3.45px] h-[3.45px] left-[367px] top-[161px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[4.08px] h-[4.08px] left-[855px] top-[394px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[3.25px] h-[3.25px] left-[383px] top-[47px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.39px] h-[4.39px] left-[1313px] top-[165px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.60px] h-[5.60px] left-[697px] top-[327px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.09px] h-[2.09px] left-[646px] top-[370px] absolute bg-white rounded-full" />
-        <div className="w-[3.13px] h-[3.13px] left-[728px] top-[122px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.53px] h-[5.53px] left-[203px] top-[293px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[5.83px] h-[5.83px] left-[424px] top-[121px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.82px] h-[4.82px] left-[1358px] top-[176px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[3.18px] h-[3.18px] left-[1212px] top-[24px] absolute bg-white rounded-full" />
-        <div className="w-[5.23px] h-[5.23px] left-[260px] top-[217px] absolute bg-white rounded-full" />
-        <div className="w-[5.29px] h-[5.29px] left-[1204px] top-[367px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[3.47px] h-[3.47px] left-[1163px] top-[159px] absolute bg-white rounded-full" />
-        <div className="w-[5.77px] h-[5.77px] left-[1257px] top-[115px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[5.31px] h-[5.31px] left-[222px] top-[356px] absolute bg-white rounded-full" />
-        <div className="w-[5.43px] h-[5.43px] left-[1141px] top-[349px] absolute bg-white rounded-full" />
-        <div className="w-[5.62px] h-[5.62px] left-[683px] top-[81px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[3.91px] h-[3.91px] left-[269px] top-[3px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[3.51px] h-[3.51px] left-[305px] top-[310px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[5.41px] h-[5.41px] left-[530px] top-[94px] absolute bg-white rounded-full" />
-        <div className="w-[4.64px] h-[4.64px] left-[730px] top-[301px] absolute bg-white rounded-full" />
-        <div className="w-[3.59px] h-[3.59px] left-[716px] top-[14px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.77px] h-[4.77px] left-[544px] top-[13px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[2.29px] h-[2.29px] left-[357px] top-[281px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[2.42px] h-[2.42px] left-[1346px] top-[112px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[3.42px] h-[3.42px] left-[671px] top-[150px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.40px] h-[4.40px] left-[1324px] top-[268px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.21px] h-[5.21px] left-[1028px] top-[376px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[4.27px] h-[4.27px] left-[499px] top-[50px] absolute bg-white rounded-full" />
-        <div className="w-[4.35px] h-[4.35px] left-[543px] top-[359px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.25px] h-[5.25px] left-[1245px] top-[296px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[5.52px] h-[5.52px] left-[360px] top-[98px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[4.46px] h-[4.46px] left-[741px] top-[358px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[3.90px] h-[3.90px] left-[1262px] top-[184px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[5.75px] h-[5.75px] left-[552px] top-[335px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[4.95px] h-[4.95px] left-[120px] top-[178px] absolute bg-white rounded-full" />
-        <div className="w-[3.28px] h-[3.28px] left-[1337px] top-[293px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[2.43px] h-[2.43px] left-[233px] top-[310px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-1 h-1 left-[218px] top-[322px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[3.68px] h-[3.68px] left-[984px] top-[8px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[2.44px] h-[2.44px] left-[832px] top-[55px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[3.93px] h-[3.93px] left-[1105px] top-[209px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[4.08px] h-[4.08px] left-[957px] top-[23px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[2.33px] h-[2.33px] left-[1066px] top-[390px] absolute bg-white bg-opacity-80 rounded-full" />
-        <div className="w-[3.25px] h-[3.25px] left-[737px] top-[118px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[5.18px] h-[5.18px] left-[202px] top-[19px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[5.05px] h-[5.05px] left-[466px] top-[17px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[3.85px] h-[3.85px] left-[144px] top-[153px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[5.35px] h-[5.35px] left-[233px] top-[330px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-1 h-1 left-[730px] top-[179px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[4.46px] h-[4.46px] left-[1156px] top-[342px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[5.22px] h-[5.22px] left-[1275px] top-[204px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.50px] h-[5.50px] left-[38px] top-[343px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[5.14px] h-[5.14px] left-[867px] top-[113px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[2.19px] h-[2.19px] left-[1277px] top-[314px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[3.74px] h-[3.74px] left-[1136px] top-[197px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[5.37px] h-[5.37px] left-[34px] top-[226px] absolute bg-white bg-opacity-60 rounded-full" />
-        <div className="w-[5.93px] h-[5.93px] left-[727px] top-[272px] absolute bg-white bg-opacity-50 rounded-full" />
-        <div className="w-[5.29px] h-[5.29px] left-[277px] top-[43px] absolute bg-white bg-opacity-80 rounded-full" />
-      </div>
-    </div>
-  );
-};
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import { format } from 'date-fns';
 import {
  DayPicker,
@@ -12,7 +12,7 @@ import {
  Popover,
  PopoverContent,
  PopoverHandler,
-} from '@snowballtools/material-tailwind-react-fork';
+} from '@material-tailwind/react';

 import HorizontalLine from './HorizontalLine';

@@ -120,11 +120,14 @@ const DatePicker = ({
      handler={(value) => setIsOpen(value)}
    >
      <PopoverHandler>
-        <Input onChange={() => null} value={inputValue} />
+        <Input
+          onChange={() => null}
+          value={inputValue}
+          crossOrigin={undefined}
+        />
      </PopoverHandler>
      {/* TODO: Figure out what placeholder is for */}
-      {/* @ts-ignore */}
-      <PopoverContent>
+      <PopoverContent placeholder={''}>
        {mode === 'single' && (
          <DayPicker
            mode="single"
@@ -149,6 +152,7 @@ const DatePicker = ({
                className="rounded-full mr-2"
                variant="outlined"
                onClick={() => setIsOpen(false)}
+                placeholder={''}
              >
                Cancel
              </Button>
@@ -158,6 +162,7 @@ const DatePicker = ({
                className="rounded-full"
                color="gray"
                onClick={() => handleRangeSelect()}
+                placeholder={''}
              >
                Select
              </Button>
@@ -1,3 +1,4 @@
+import React from 'react';
 import {
  default as ReactDropdown,
  Option as ReactDropdownOption,
@@ -1,22 +1,13 @@
 import { Duration } from 'luxon';
-import { 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>}
@@ -1,3 +1,5 @@
+import React from 'react';
+
 const HorizontalLine = () => {
  return <hr className="h-px bg-gray-100 border-0" />;
 };
@@ -1,23 +0,0 @@
-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>
-  );
-};
@@ -6,7 +6,7 @@ import { Input, InputProps } from './shared/Input';
 const SearchBar: React.ForwardRefRenderFunction<
  HTMLInputElement,
  InputProps & RefAttributes<HTMLInputElement>
-> = ({ value, onChange, placeholder = 'Search', ...props }, ref) => {
+> = ({ value, onChange, placeholder = 'Search', ...props }) => {
  return (
    <div className="relative flex w-full">
      <Input
@@ -15,10 +15,8 @@ const SearchBar: React.ForwardRefRenderFunction<
        value={value}
        type="search"
        placeholder={placeholder}
-        appearance="borderless"
-        className="w-full lg:w-[459px]"
+        appearance={'borderless'}
        {...props}
-        ref={ref}
      />
    </div>
  );
@@ -1,4 +1,5 @@
-import { StepperNav } from './VerticalStepper';
+import React from 'react';
+import { StepperNav } from 'vertical-stepper-nav';

 const COLOR_COMPLETED = '#059669';
 const COLOR_ACTIVE = '#CFE6FC';
@@ -1,6 +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);
@@ -10,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 };
@@ -1,120 +0,0 @@
-import * as CSS from 'csstype';
-
-//
-// Nav
-//
-export interface IStepDescription {
-  stepContent: () => JSX.Element;
-  stepStateColor?: string;
-  stepStatusCircleSize?: number;
-  onClickHandler?: () => void | undefined;
-}
-
-export interface IStepperNavProps {
-  steps: IStepDescription[];
-}
-
-export const StepperNav = (props: IStepperNavProps): JSX.Element => {
-  return (
-    <nav>
-      {props.steps.map(
-        (
-          { stepContent, stepStateColor, onClickHandler, stepStatusCircleSize },
-          index,
-        ) => (
-          <div key={index}>
-            <Step
-              stepContent={stepContent}
-              statusColor={stepStateColor}
-              onClickHandler={onClickHandler}
-              statusCircleSize={stepStatusCircleSize}
-            />
-            {index !== props.steps.length - 1 && (
-              <div
-                style={{
-                  paddingLeft: `${(stepStatusCircleSize ?? 16) / 2 + 1}px`,
-                }}
-              >
-                <Separator />
-              </div>
-            )}
-          </div>
-        ),
-      )}
-    </nav>
-  );
-};
-
-//
-// Separator
-//
-const separatorStyles = {
-  height: '5vh',
-  width: 2,
-  border: '1px solid #E1E1E1',
-  background: '#E1E1E1',
-};
-
-export interface ISeparator {
-  height?: string | number;
-}
-
-export const Separator = ({ height }: ISeparator): JSX.Element => {
-  return <div style={{ ...separatorStyles, height: height ?? '5vh' }} />;
-};
-
-//
-// Step
-//
-export interface IStep {
-  stepContent: () => JSX.Element;
-  statusColor?: string;
-  statusCircleSize?: number;
-  onClickHandler?: (
-    event?: React.MouseEvent<HTMLDivElement>,
-  ) => void | undefined;
-}
-
-const buttonContainerStyles: CSS.Properties = {
-  display: 'inline-flex',
-  flexWrap: 'wrap',
-  gap: '12px',
-  padding: '2px',
-  cursor: 'pointer',
-};
-
-export const Step = ({
-  stepContent,
-  statusColor,
-  statusCircleSize,
-  onClickHandler,
-}: IStep): JSX.Element => {
-  const circleStyles = {
-    borderRadius: statusCircleSize ?? 16,
-    width: statusCircleSize ?? 16,
-    height: statusCircleSize ?? 16,
-    border: '2px solid #E1E1E1',
-    background: statusColor ?? 'white',
-  };
-
-  const keyDownHandler = (event: React.KeyboardEvent<HTMLDivElement>) => {
-    if (event.keyCode === 13 || event.keyCode === 32) {
-      onClickHandler?.();
-    }
-  };
-
-  return (
-    <div
-      tabIndex={0}
-      onClick={onClickHandler}
-      onKeyDown={keyDownHandler}
-      role="button"
-      style={{ ...buttonContainerStyles }}
-    >
-      <div>
-        <div style={circleStyles} />
-      </div>
-      <div style={{ paddingBottom: 2 }}>{stepContent()}</div>
-    </div>
-  );
-};
@@ -1,29 +0,0 @@
-import ConfirmDialog, {
-  ConfirmDialogProps,
-} from 'components/shared/ConfirmDialog';
-
-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>
-  );
-};
@@ -1,90 +0,0 @@
-import ConfirmDialog, {
-  ConfirmDialogProps,
-} from 'components/shared/ConfirmDialog';
-import { Deployment, Domain } from 'gql-client';
-
-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>
-  );
-};
@@ -1,41 +0,0 @@
-import ConfirmDialog, {
-  ConfirmDialogProps,
-} from 'components/shared/ConfirmDialog';
-
-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>
-  );
-};
@@ -1,35 +0,0 @@
-import ConfirmDialog, {
-  ConfirmDialogProps,
-} from 'components/shared/ConfirmDialog';
-
-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>
-  );
-};
@@ -1,35 +0,0 @@
-import ConfirmDialog, {
-  ConfirmDialogProps,
-} from 'components/shared/ConfirmDialog';
-
-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>
-  );
-};
@@ -1,29 +0,0 @@
-import ConfirmDialog, {
-  ConfirmDialogProps,
-} from 'components/shared/ConfirmDialog';
-
-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>
-  );
-};
@@ -1,38 +0,0 @@
-import ConfirmDialog, {
-  ConfirmDialogProps,
-} from 'components/shared/ConfirmDialog';
-
-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>
-  );
-};
@@ -1,46 +0,0 @@
-import ConfirmDialog, {
-  ConfirmDialogProps,
-} from 'components/shared/ConfirmDialog';
-
-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>
-  );
-};
@@ -9,18 +9,16 @@ export const projectCardTheme = tv({
      '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'],
+    content: ['flex', 'flex-col', 'gap-1', 'flex-1'],
    title: [
      'text-sm',
      'font-medium',
      'text-elements-high-em',
      'tracking-[-0.006em]',
-      'truncate',
    ],
-    description: ['text-xs', 'text-elements-low-em', 'truncate'],
+    description: ['text-xs', 'text-elements-low-em'],
    icons: ['flex', 'items-center', 'gap-1'],
    lowerContent: [
      'transition-colors',
@@ -1,26 +1,29 @@
+import React, {
+  ComponentPropsWithoutRef,
+  MouseEvent,
+  useCallback,
+} from 'react';
+import { ProjectCardTheme, projectCardTheme } from './ProjectCard.theme';
+import { Project } from 'gql-client';
+import { Button } from 'components/shared/Button';
+import { WavyBorder } from 'components/shared/WavyBorder';
+import {
+  BranchIcon,
+  ClockIcon,
+  GitHubLogo,
+  HorizontalDotIcon,
+  WarningDiamondIcon,
+} from 'components/shared/CustomIcon';
+import { relativeTimeMs } from 'utils/time';
+import { useNavigate } from 'react-router-dom';
+import { Avatar } from 'components/shared/Avatar';
+import { getInitials } from 'utils/geInitials';
 import {
  Menu,
  MenuHandler,
  MenuItem,
  MenuList,
-} from '@snowballtools/material-tailwind-react-fork';
-import { 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,
-  GithubLogoIcon,
-  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';
+} from '@material-tailwind/react';

 export interface ProjectCardProps
  extends ComponentPropsWithoutRef<'div'>,
@@ -53,16 +56,6 @@ export const ProjectCard = ({
    navigate(`projects/${project.id}`);
  }, [project.id, navigate]);

-  const navigateToSettingsOnClick = useCallback(
-    (
-      e: React.MouseEvent<HTMLLIElement> | React.MouseEvent<HTMLButtonElement>,
-    ) => {
-      e.stopPropagation();
-      navigate(`projects/${project.id}/settings`);
-    },
-    [project.id, navigate],
-  );
-
  return (
    <div
      {...props}
@@ -79,9 +72,7 @@ export const ProjectCard = ({
        />
        {/* Title and website */}
        <div className={theme.content()}>
-          <Tooltip content={project.name}>
-            <p className={theme.title()}>{project.name}</p>
-          </Tooltip>
+          <p className={theme.title()}>{project.name}</p>
          <p className={theme.description()}>
            {project.deployments[0]?.domain?.name ?? 'No domain'}
          </p>
@@ -101,14 +92,9 @@ export const ProjectCard = ({
                <HorizontalDotIcon />
              </Button>
            </MenuHandler>
-            <MenuList>
-              <MenuItem onClick={navigateToSettingsOnClick}>
-                Project settings
-              </MenuItem>
-              <MenuItem
-                className="text-red-500"
-                onClick={navigateToSettingsOnClick}
-              >
+            <MenuList placeholder={''}>
+              <MenuItem placeholder={''}>Project settings</MenuItem>
+              <MenuItem className="text-red-500" placeholder={''}>
                Delete project
              </MenuItem>
            </MenuList>
@@ -135,7 +121,7 @@ export const ProjectCard = ({
        <div className={theme.deploymentText()}>
          {hasDeployment ? (
            <>
-              <GithubLogoIcon />
+              <GitHubLogo />
              <span>{relativeTimeMs(project.deployments[0].createdAt)} on</span>
              <BranchIcon />
              <span>{project.deployments[0].branch}</span>
@@ -0,0 +1,127 @@
+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'
+        }`}
+        placeholder={''}
+      >
+        <List {...getMenuProps()}>
+          {items.length ? (
+            <>
+              <div className="p-3">
+                <Typography variant="small" color="gray" placeholder={''}>
+                  Suggestions
+                </Typography>
+              </div>
+              {items.map((item, index) => (
+                <ListItem
+                  selected={highlightedIndex === index || selectedItem === item}
+                  key={item.id}
+                  placeholder={''}
+                  {...getItemProps({ item, index })}
+                >
+                  <ListItemPrefix placeholder={''}>
+                    <Avatar
+                      src={item.icon || '/gray.png'}
+                      variant="rounded"
+                      placeholder={''}
+                    />
+                  </ListItemPrefix>
+                  <div>
+                    <Typography variant="h6" color="blue-gray" placeholder={''}>
+                      {item.name}
+                    </Typography>
+                    <Typography
+                      variant="small"
+                      color="gray"
+                      className="font-normal"
+                      placeholder={''}
+                    >
+                      {item.organization.name}
+                    </Typography>
+                  </div>
+                </ListItem>
+              ))}
+            </>
+          ) : (
+            <div className="p-3">
+              <Typography placeholder={''}>
+                ^ No projects matching this name
+              </Typography>
+            </div>
+          )}
+        </List>
+      </Card>
+    </div>
+  );
+};
+
+export default ProjectSearchBar;
@@ -1,93 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-import { useCombobox } from 'downshift';
-import { Project } from 'gql-client';
-import { useDebounceValue } 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, _] = useDebounceValue<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({}, { suppressRefError: true })}
-        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>
-  );
-};
@@ -1,127 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-import * as Dialog from '@radix-ui/react-dialog';
-import { Button } from 'components/shared/Button';
-import { CrossIcon, SearchIcon } from 'components/shared/CustomIcon';
-import { Input } from 'components/shared/Input';
-import { useGQLClient } from 'context/GQLClientContext';
-import { Project } from 'gql-client';
-import { useDebounceValue } from 'usehooks-ts';
-import { ProjectSearchBarItem } from './ProjectSearchBarItem';
-import { ProjectSearchBarEmpty } from './ProjectSearchBarEmpty';
-import { useNavigate } from 'react-router-dom';
-import { useCombobox } from 'downshift';
-
-interface ProjectSearchBarDialogProps extends Dialog.DialogProps {
-  open?: boolean;
-  onClose?: () => void;
-  onClickItem?: (data: Project) => void;
-}
-
-export const ProjectSearchBarDialog = ({
-  onClose,
-  onClickItem,
-  ...props
-}: ProjectSearchBarDialogProps) => {
-  const [items, setItems] = useState<Project[]>([]);
-  const [selectedItem, setSelectedItem] = useState<Project | null>(null);
-  const client = useGQLClient();
-  const navigate = useNavigate();
-
-  const {
-    getInputProps,
-    getItemProps,
-    getMenuProps,
-    inputValue,
-    setInputValue,
-  } = useCombobox({
-    items,
-    itemToString(item) {
-      return item ? item.name : '';
-    },
-    selectedItem,
-    onSelectedItemChange: ({ selectedItem: newSelectedItem }) => {
-      if (newSelectedItem) {
-        setSelectedItem(newSelectedItem);
-        onClickItem?.(newSelectedItem);
-        navigate(
-          `/${newSelectedItem.organization.slug}/projects/${newSelectedItem.id}`,
-        );
-      }
-    },
-  });
-
-  const [debouncedInputValue, _] = useDebounceValue<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]);
-
-  const handleClose = () => {
-    setInputValue('');
-    setItems([]);
-    onClose?.();
-  };
-
-  return (
-    <Dialog.Root {...props}>
-      <Dialog.Portal>
-        <Dialog.Overlay className="bg-base-bg fixed inset-0 md:hidden overflow-y-auto" />
-        <Dialog.Content>
-          <div className="h-full flex flex-col fixed top-0 inset-0">
-            <div className="py-2.5 px-4 flex items-center justify-between border-b border-border-separator/[0.06]">
-              <Input
-                {...getInputProps({}, { suppressRefError: true })}
-                leftIcon={<SearchIcon />}
-                placeholder="Search"
-                appearance="borderless"
-                autoFocus
-              />
-              <Button iconOnly variant="ghost" onClick={handleClose}>
-                <CrossIcon size={16} />
-              </Button>
-            </div>
-            {/* Content */}
-            <div
-              className="flex flex-col gap-1 px-2 py-2"
-              {...getMenuProps(
-                {},
-                {
-                  suppressRefError: true,
-                },
-              )}
-            >
-              {items.length > 0 ? (
-                <>
-                  <div className="px-2 py-2">
-                    <p className="text-elements-mid-em text-xs font-medium">
-                      Suggestions
-                    </p>
-                  </div>
-                  {items.map((item, index) => (
-                    <ProjectSearchBarItem
-                      key={item.id}
-                      item={item}
-                      {...getItemProps({ item, index })}
-                    />
-                  ))}
-                </>
-              ) : (
-                inputValue && <ProjectSearchBarEmpty />
-              )}
-            </div>
-          </div>
-        </Dialog.Content>
-      </Dialog.Portal>
-    </Dialog.Root>
-  );
-};
@@ -1,24 +0,0 @@
-import { InfoRoundFilledIcon } from 'components/shared/CustomIcon';
-import { ComponentPropsWithoutRef } from 'react';
-import { cn } from 'utils/classnames';
-
-interface ProjectSearchBarEmptyProps extends ComponentPropsWithoutRef<'div'> {}
-
-export const ProjectSearchBarEmpty = ({
-  className,
-  ...props
-}: ProjectSearchBarEmptyProps) => {
-  return (
-    <div
-      {...props}
-      className={cn('flex items-center px-2 py-2 gap-3', className)}
-    >
-      <div className="w-8 h-8 rounded-lg flex items-center justify-center bg-orange-50 text-elements-warning">
-        <InfoRoundFilledIcon size={16} />
-      </div>
-      <p className="text-elements-low-em text-sm tracking-[-0.006em]">
-        No projects matching this name
-      </p>
-    </div>
-  );
-};
@@ -1,59 +0,0 @@
-import { Avatar } from 'components/shared/Avatar';
-import { Overwrite, UseComboboxGetItemPropsReturnValue } from 'downshift';
-import { Project } from 'gql-client';
-import { ComponentPropsWithoutRef, forwardRef } from 'react';
-import { OmitCommon } from 'types/common';
-import { cn } from 'utils/classnames';
-import { getInitials } from 'utils/geInitials';
-
-/**
- * Represents a type that merges ComponentPropsWithoutRef<'li'> with certain exclusions.
- * @type {MergedComponentPropsWithoutRef}
- */
-type MergedComponentPropsWithoutRef = OmitCommon<
-  ComponentPropsWithoutRef<'button'>,
-  Omit<
-    Overwrite<UseComboboxGetItemPropsReturnValue, Project[]>,
-    'index' | 'item'
-  >
->;
-
-interface ProjectSearchBarItemProps extends MergedComponentPropsWithoutRef {
-  item: Project;
-  active?: boolean;
-}
-
-const ProjectSearchBarItem = forwardRef<
-  HTMLButtonElement,
-  ProjectSearchBarItemProps
->(({ item, active, ...props }, ref) => {
-  return (
-    <button
-      {...props}
-      ref={ref}
-      key={item.id}
-      className={cn(
-        'px-2 py-2 flex items-center gap-3 rounded-lg text-left hover:bg-base-bg-emphasized',
-        {
-          'bg-base-bg-emphasized': active,
-        },
-      )}
-    >
-      <Avatar
-        size={32}
-        imageSrc={item.icon}
-        initials={getInitials(item.name)}
-      />
-      <div className="flex flex-col flex-1">
-        <p className="text-sm tracking-[-0.006em] text-elements-high-em">
-          {item.name}
-        </p>
-        <p className="text-xs text-elements-low-em">{item.organization.name}</p>
-      </div>
-    </button>
-  );
-});
-
-ProjectSearchBarItem.displayName = 'ProjectSearchBarItem';
-
-export { ProjectSearchBarItem };
@@ -1,2 +0,0 @@
-export * from './ProjectSearchBar';
-export * from './ProjectSearchBarDialog';
@@ -2,22 +2,22 @@ import React from 'react';
 import OauthPopup from 'react-oauth-popup';

 import { useGQLClient } from '../../../context/GQLClientContext';
-import { Button } from '../../shared/Button';
+import { Button } from 'components/shared/Button';
 import {
  GitIcon,
  EllipsesIcon,
  SnowballIcon,
  GithubIcon,
  GitTeaIcon,
-} from '../../shared/CustomIcon';
-import { useToast } from '../../shared/Toast';
-import { IconWithFrame } from '../../shared/IconWithFrame';
-import { Heading } from '../../shared/Heading';
-import { MockConnectGitCard } from './MockConnectGitCard';
-import { VITE_GITHUB_CLIENT_ID } from 'utils/constants';
+} from 'components/shared/CustomIcon';
+import { useToast } from 'components/shared/Toast';
+import { IconWithFrame } from 'components/shared/IconWithFrame';
+import { Heading } from 'components/shared/Heading';

 const SCOPES = 'repo user';
-const GITHUB_OAUTH_URL = `https://github.com/login/oauth/authorize?client_id=${VITE_GITHUB_CLIENT_ID}&scope=${encodeURIComponent(SCOPES)}`;
+const GITHUB_OAUTH_URL = `https://github.com/login/oauth/authorize?client_id=${
+  process.env.REACT_APP_GITHUB_CLIENT_ID
+}&scope=${encodeURIComponent(SCOPES)}`;

 interface ConnectAccountInterface {
  onAuth: (token: string) => void;
@@ -93,7 +93,6 @@ const ConnectAccount: React.FC<ConnectAccountInterface> = ({
      </div>

      {/* TODO: Add ConnectAccountTabPanel */}
-      <MockConnectGitCard />
      {/* <div className="rounded-l shadow p-2 flex-col justify-start items-start gap-2 inline-flex">
        <ConnectAccountTabPanel />
      </div> */}
@@ -1,12 +1,11 @@
 import React, { useCallback, useEffect } from 'react';
 import { useNavigate, useParams, useSearchParams } from 'react-router-dom';

+import { Button, Typography } from '@material-tailwind/react';
+
 import { DeployStep, DeployStatus } from './DeployStep';
 import { Stopwatch, setStopWatchOffset } from '../../StopWatch';
-import { Heading } from '../../shared/Heading';
-import { Button } from '../../shared/Button';
-import { ClockOutlineIcon, WarningIcon } from '../../shared/CustomIcon';
-import { CancelDeploymentDialog } from '../../projects/Dialog/CancelDeploymentDialog';
+import ConfirmDialog from 'components/shared/ConfirmDialog';

 const TIMEOUT_DURATION = 5000;
 const Deploy = () => {
@@ -32,58 +31,63 @@ const Deploy = () => {
  }, []);

  return (
-    <div className="space-y-7">
-      <div className="flex justify-between">
-        <div className="space-y-1.5">
-          <Heading as="h4" className="md:text-lg font-medium">
-            Deployment started ...
-          </Heading>
-          <div className="flex items-center gap-1.5">
-            <ClockOutlineIcon size={16} className="text-elements-mid-em" />
+    <div>
+      <div className="flex justify-between mb-6">
+        <div>
+          <h4>Deployment started ...</h4>
+          <div className="flex">
+            ^&nbsp;
            <Stopwatch
              offsetTimestamp={setStopWatchOffset(Date.now().toString())}
            />
          </div>
        </div>
-        <Button
-          onClick={handleOpen}
-          size="sm"
-          variant="tertiary"
-          leftIcon={<WarningIcon size={16} />}
-        >
-          Cancel
-        </Button>
-        <CancelDeploymentDialog
-          handleCancel={handleOpen}
+        <div>
+          <Button
+            onClick={handleOpen}
+            variant="outlined"
+            size="sm"
+            placeholder={''}
+          >
+            ^ Cancel
+          </Button>
+        </div>
+        <ConfirmDialog
+          dialogTitle="Cancel deployment?"
+          handleOpen={handleOpen}
          open={open}
+          confirmButtonTitle="Yes, Cancel deployment"
          handleConfirm={handleCancel}
-        />
-      </div>
-
-      <div>
-        <DeployStep
-          title="Building"
-          status={DeployStatus.COMPLETE}
-          step="1"
-          processTime="72000"
-        />
-        <DeployStep
-          title="Deployment summary"
-          status={DeployStatus.PROCESSING}
-          step="2"
-          startTime={Date.now().toString()}
-        />
-        <DeployStep
-          title="Running checks"
-          status={DeployStatus.NOT_STARTED}
-          step="3"
-        />
-        <DeployStep
-          title="Assigning domains"
-          status={DeployStatus.NOT_STARTED}
-          step="4"
-        />
+          color="red"
+        >
+          <Typography variant="small" placeholder={''}>
+            This will halt the deployment and you will have to start the process
+            from scratch.
+          </Typography>
+        </ConfirmDialog>
      </div>
+      <DeployStep
+        title="Building"
+        status={DeployStatus.COMPLETE}
+        step="1"
+        processTime="72000"
+      />
+      <DeployStep
+        title="Deployment summary"
+        status={DeployStatus.PROCESSING}
+        step="2"
+        startTime={Date.now().toString()}
+      />
+      <DeployStep
+        title="Running checks"
+        status={DeployStatus.NOT_STARTED}
+        step="3"
+      />
+      <DeployStep
+        title="Assigning domains"
+        status={DeployStatus.NOT_STARTED}
+        step="4"
+      />
    </div>
  );
 };
@@ -1,22 +1,11 @@
-import { useState } from 'react';
+import React, { useState } from 'react';
+import toast from 'react-hot-toast';

-import { Collapse } from '@snowballtools/material-tailwind-react-fork';
+import { Collapse, Button, Typography } from '@material-tailwind/react';

 import { Stopwatch, setStopWatchOffset } from '../../StopWatch';
 import FormatMillisecond from '../../FormatMilliSecond';
 import processLogs from '../../../assets/process-logs.json';
-import { cn } from 'utils/classnames';
-import {
-  CheckRoundFilledIcon,
-  ClockOutlineIcon,
-  CopyIcon,
-  LoaderIcon,
-  MinusCircleIcon,
-  PlusIcon,
-} from 'components/shared/CustomIcon';
-import { Button } from 'components/shared/Button';
-import { useToast } from 'components/shared/Toast';
-import { useIntersectionObserver } from 'usehooks-ts';

 enum DeployStatus {
  PROCESSING = 'progress',
@@ -39,115 +28,61 @@ const DeployStep = ({
  startTime,
  processTime,
 }: DeployStepsProps) => {
-  const [isOpen, setIsOpen] = useState(false);
-  const { toast, dismiss } = useToast();
-  const { isIntersecting: hideGradientOverlay, ref } = useIntersectionObserver({
-    threshold: 1,
-  });
-
-  const disableCollapse = status !== DeployStatus.COMPLETE;
+  const [collapse, setCollapse] = useState(false);

  return (
-    <div className="border-b border-border-separator">
-      {/* Collapisble trigger */}
-      <button
-        className={cn(
-          'flex justify-between w-full py-5 gap-2',
-          disableCollapse && 'cursor-auto',
+    <div className="border-b-2">
+      <div className="flex justify-between p-2 gap-2">
+        {status === DeployStatus.NOT_STARTED && <div>{step}</div>}
+        {status === DeployStatus.PROCESSING && <div>O</div>}
+        {status === DeployStatus.COMPLETE && (
+          <div>
+            <button
+              onClick={() => {
+                setCollapse(!collapse);
+              }}
+            >
+              {collapse ? '-' : '+'}
+            </button>
+          </div>
        )}
-        tabIndex={disableCollapse ? -1 : undefined}
-        onClick={() => {
-          if (!disableCollapse) {
-            setIsOpen((val) => !val);
-          }
-        }}
-      >
-        <div className={cn('grow flex items-center gap-3')}>
-          {/* Icon */}
-          <div className="w-6 h-6 grid place-content-center">
-            {status === DeployStatus.NOT_STARTED && (
-              <div className="grid place-content-center w-6 h-6 rounded-[48px] bg-base-bg-emphasized font-mono text-xs">
-                {step}
-              </div>
-            )}
-            {status === DeployStatus.PROCESSING && (
-              <LoaderIcon className="animate-spin text-elements-link" />
-            )}
-            {status === DeployStatus.COMPLETE && (
-              <div className="text-controls-primary">
-                {!isOpen && <PlusIcon size={24} />}
-                {isOpen && <MinusCircleIcon size={24} />}
-              </div>
-            )}
-          </div>
-
-          {/* Title */}
-          <span
-            className={cn(
-              'text-left text-sm md:text-base',
-              status === DeployStatus.PROCESSING && 'text-elements-link',
-            )}
-          >
-            {title}
-          </span>
-        </div>
-
-        {/* Timer */}
+        <div className="grow">{title}</div>
        {status === DeployStatus.PROCESSING && (
-          <div className="flex items-center gap-1.5">
-            <ClockOutlineIcon size={16} className="text-elements-low-em" />
-            <Stopwatch offsetTimestamp={setStopWatchOffset(startTime!)} />
-          </div>
+          <>
+            ^<Stopwatch offsetTimestamp={setStopWatchOffset(startTime!)} />
+          </>
        )}
        {status === DeployStatus.COMPLETE && (
-          <div className="flex items-center gap-1.5">
-            <div className="w-4.5 h-4.5 grid place-content-center">
-              <CheckRoundFilledIcon
-                className="text-elements-success"
-                size={15}
-              />
-            </div>
-            <FormatMillisecond time={Number(processTime)} />{' '}
-          </div>
+          <>
+            ^<FormatMillisecond time={Number(processTime)} />{' '}
+          </>
        )}
-      </button>
-
-      {/* Collapsible */}
-      <Collapse open={isOpen}>
-        <div className="relative text-xs text-elements-low-em h-36 overflow-y-auto">
-          {/* Logs */}
+      </div>
+      <Collapse open={collapse}>
+        <div className="p-2 text-sm text-gray-500 h-36 overflow-y-scroll">
          {processLogs.map((log, key) => {
            return (
-              <p className="font-mono" key={key}>
+              <Typography
+                variant="small"
+                color="gray"
+                key={key}
+                placeholder={''}
+              >
                {log}
-              </p>
+              </Typography>
            );
          })}
-
-          {/* End of logs ref used for hiding gradient overlay */}
-          <div ref={ref} />
-
-          {/* Overflow gradient overlay  */}
-          {!hideGradientOverlay && (
-            <div className="h-14 w-full sticky bottom-0 inset-x-0 bg-gradient-to-t from-white to-transparent" />
-          )}
-
-          {/* Copy log button */}
-          <div className={cn('sticky bottom-4 left-1/2 flex justify-center')}>
+          <div className="sticky bottom-0 left-1/2 flex justify-center">
            <Button
-              size="xs"
+              size="sm"
              onClick={() => {
                navigator.clipboard.writeText(processLogs.join('\n'));
-                toast({
-                  title: 'Logs copied',
-                  variant: 'success',
-                  id: 'logs',
-                  onDismiss: dismiss,
-                });
+                toast.success('Logs copied');
              }}
-              leftIcon={<CopyIcon size={16} />}
+              color="blue"
+              placeholder={''}
            >
-              Copy log
+              ^ Copy log
            </Button>
          </div>
        </div>
@@ -1,163 +0,0 @@
-import React, { useMemo } from 'react';
-import { SegmentedControls } from 'components/shared/SegmentedControls';
-import { useState } from 'react';
-import {
-  GithubIcon,
-  LockIcon,
-  TemplateIcon,
-  TemplateIconType,
-} from 'components/shared/CustomIcon';
-import { relativeTimeISO } from 'utils/time';
-import { useMediaQuery } from 'usehooks-ts';
-
-export const MockConnectGitCard = () => {
-  const [segmentedControlsValue, setSegmentedControlsValue] =
-    useState<string>('import');
-
-  const isDesktopView = useMediaQuery('(min-width: 960px)'); // lg:
-  const segmentedControlsProps = isDesktopView ? {} : { size: 'sm' as const };
-
-  const fiveMinutesAgo = new Date(Date.now() - 1000 * 300).toISOString();
-
-  const SEGMENTED_CONTROLS_OPTIONS = [
-    {
-      label: 'Import a repository',
-      value: 'import',
-    },
-    {
-      label: 'Start with a template',
-      value: 'template',
-    },
-  ];
-
-  const IMPORT_CONTENT = [
-    {
-      full_name: 'snowball/igloo',
-      updated_at: fiveMinutesAgo,
-    },
-    {
-      full_name: 'snowball/android-sdk',
-      updated_at: fiveMinutesAgo,
-      visibility: 'private',
-    },
-    {
-      full_name: 'snowball/landing-page',
-      updated_at: fiveMinutesAgo,
-    },
-  ];
-
-  const TEMPLATE_CONTENT = [
-    {
-      name: 'Web app',
-      icon: 'web',
-    },
-    {
-      name: 'Progressive Web App (PWA)',
-      icon: 'pwa',
-    },
-    {
-      name: 'React Native',
-      icon: 'react-native',
-    },
-    {
-      name: 'Kotlin',
-      icon: 'kotlin',
-    },
-    {
-      name: 'Swift',
-      icon: 'swift',
-    },
-  ];
-
-  const renderContent = useMemo(() => {
-    if (segmentedControlsValue === 'import') {
-      return (
-        <div className="flex flex-col gap-2 relative z-0">
-          {IMPORT_CONTENT.map((repo, index) => (
-            <React.Fragment key={index}>
-              <MockProjectCard {...repo} />
-              {index !== IMPORT_CONTENT.length - 1 && (
-                <div className="border-b border-base-border" />
-              )}
-            </React.Fragment>
-          ))}
-        </div>
-      );
-    }
-    return (
-      <div className="grid grid-cols-1 lg:grid-cols-2 relative z-0">
-        {TEMPLATE_CONTENT.map((template, index) => (
-          <MockTemplateCard key={index} {...template} />
-        ))}
-      </div>
-    );
-  }, [segmentedControlsValue]);
-
-  return (
-    <div className="relative bg-base-bg shadow-card rounded-2xl px-2 py-2 w-full max-w-[560px] flex flex-col gap-2">
-      {/* Content */}
-      <SegmentedControls
-        value={segmentedControlsValue}
-        onChange={setSegmentedControlsValue}
-        options={SEGMENTED_CONTROLS_OPTIONS}
-        type="full-width"
-        {...segmentedControlsProps}
-      />
-      {renderContent}
-
-      {/* Shade */}
-      <div className="pointer-events-none z-99 absolute inset-0 rounded-2xl bg-gradient-to-t from-white to-transparent" />
-    </div>
-  );
-};
-
-const MockProjectCard = ({
-  full_name,
-  updated_at,
-  visibility,
-}: {
-  full_name: string;
-  updated_at?: string;
-  visibility?: string;
-}) => {
-  return (
-    <div className="group flex items-start sm:items-center gap-3 pl-3 py-3 cursor-pointer rounded-xl hover:bg-base-bg-emphasized relative">
-      {/* Icon container */}
-      <div className="w-10 h-10 bg-base-bg rounded-md justify-center items-center flex">
-        <GithubIcon />
-      </div>
-      {/* Content */}
-      <div className="flex flex-1 gap-3 flex-wrap">
-        <div className="flex flex-col items-start gap-1">
-          <p className="text-elements-high-em text-sm font-medium tracking-[-0.006em]">
-            {full_name}
-          </p>
-          <p className="text-elements-low-em text-xs">
-            {updated_at && relativeTimeISO(updated_at)}
-          </p>
-        </div>
-        {visibility === 'private' && (
-          <div className="bg-orange-50 border border-orange-200 px-2 py-1 flex items-center gap-1 rounded-lg text-xs text-orange-600 h-fit">
-            <LockIcon />
-            Private
-          </div>
-        )}
-      </div>
-    </div>
-  );
-};
-
-const MockTemplateCard = ({ icon, name }: { icon: string; name: string }) => {
-  return (
-    <div className="flex items-center gap-3 px-3 py-3 hover:bg-base-bg-emphasized rounded-2xl group relative cursor-default">
-      {/* Icon */}
-      <div className="px-1 py-1 rounded-xl bg-base-bg border border-border-interactive/10 shadow-card-sm">
-        <TemplateIcon type={icon as TemplateIconType} />
-      </div>
-      {/* Name */}
-      <p className="flex-1 text-left text-sm tracking-tighter text-elements-high-em">
-        {name}
-      </p>
-    </div>
-  );
-};
@@ -0,0 +1,81 @@
+import React, { useCallback } from 'react';
+import toast from 'react-hot-toast';
+import { useNavigate, useParams } from 'react-router-dom';
+
+import { Chip, IconButton, Spinner } from '@material-tailwind/react';
+
+import { relativeTimeISO } from '../../../utils/time';
+import { GitRepositoryDetails } from '../../../types';
+import { useGQLClient } from '../../../context/GQLClientContext';
+import { GithubIcon, LockIcon } from 'components/shared/CustomIcon';
+
+interface ProjectRepoCardProps {
+  repository: GitRepositoryDetails;
+}
+
+const ProjectRepoCard: React.FC<ProjectRepoCardProps> = ({ repository }) => {
+  const client = useGQLClient();
+  const navigate = useNavigate();
+  const [isLoading, setIsLoading] = React.useState(false);
+
+  const { orgSlug } = useParams();
+
+  const createProject = useCallback(async () => {
+    if (!repository) {
+      return;
+    }
+
+    setIsLoading(true);
+    const { addProject } = await client.addProject(orgSlug!, {
+      name: `${repository.owner!.login}-${repository.name}`,
+      prodBranch: repository.default_branch!,
+      repository: repository.full_name,
+      // TODO: Compute template from repo
+      template: 'webapp',
+    });
+
+    if (Boolean(addProject)) {
+      setIsLoading(false);
+      navigate(`import?projectId=${addProject.id}`);
+    } else {
+      setIsLoading(false);
+      toast.error('Failed to create project');
+    }
+  }, [client, repository]);
+
+  return (
+    <div
+      className="group flex items-center gap-4 text-gray-500 text-xs hover:bg-gray-100 p-2 cursor-pointer"
+      onClick={createProject}
+    >
+      <div className="w-10 h-10 bg-white rounded-md justify-center items-center gap-1.5 inline-flex">
+        <GithubIcon />
+      </div>
+      <div className="grow">
+        <div>
+          <span className="text-black">{repository.full_name}</span>
+          {repository.visibility === 'private' && (
+            <Chip
+              className="normal-case inline ml-6 font-normal text-xs text-xs bg-orange-50 border border-orange-200 text-orange-600 items-center gap-1 inline-flex"
+              size="sm"
+              value="Private"
+              icon={<LockIcon />}
+            />
+          )}
+        </div>
+        <p>{repository.updated_at && relativeTimeISO(repository.updated_at)}</p>
+      </div>
+      {isLoading ? (
+        <Spinner className="h-4 w-4" />
+      ) : (
+        <div className="hidden group-hover:block">
+          <IconButton size="sm" placeholder={''}>
+            {'>'}
+          </IconButton>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default ProjectRepoCard;
@@ -1,114 +0,0 @@
-import React, { useCallback, useState } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
-
-import { Spinner } from '@snowballtools/material-tailwind-react-fork';
-
-import { relativeTimeISO } from 'utils/time';
-import { GitRepositoryDetails } from '../../../../types/types';
-import { useGQLClient } from 'context/GQLClientContext';
-import {
-  ArrowRightCircleIcon,
-  GithubIcon,
-  LockIcon,
-} from 'components/shared/CustomIcon';
-import { Button } from 'components/shared/Button';
-import { useToast } from 'components/shared/Toast';
-
-interface ProjectRepoCardProps {
-  repository: GitRepositoryDetails;
-}
-
-export const ProjectRepoCard: React.FC<ProjectRepoCardProps> = ({
-  repository,
-}) => {
-  const client = useGQLClient();
-  const navigate = useNavigate();
-  const [isLoading, setIsLoading] = useState(false);
-
-  const { orgSlug } = useParams();
-  const { toast, dismiss } = useToast();
-
-  const createProject = useCallback(async () => {
-    if (!repository || !orgSlug) {
-      return toast({
-        id: 'missing-repository-or-org-slug',
-        title: 'Repository or organization slug is missing',
-        variant: 'error',
-        onDismiss: dismiss,
-      });
-    }
-
-    try {
-      setIsLoading(true);
-      const { addProject } = await client.addProject(orgSlug, {
-        name: `${repository.owner?.login}-${repository.name}`,
-        prodBranch: repository.default_branch as string,
-        repository: repository.full_name,
-        // TODO: Compute template from repo
-        template: 'webapp',
-      });
-      if (addProject) {
-        navigate(`import?projectId=${addProject.id}`);
-      } else {
-        toast({
-          id: 'failed-to-create-project',
-          title: 'Failed to create project',
-          variant: 'error',
-          onDismiss: dismiss,
-        });
-      }
-    } catch (error) {
-      console.error((error as Error).message);
-      toast({
-        id: 'failed-to-create-project',
-        title: 'Failed to create project',
-        variant: 'error',
-        onDismiss: dismiss,
-      });
-    } finally {
-      setIsLoading(false);
-    }
-  }, [client, repository, orgSlug, setIsLoading, navigate, toast]);
-
-  return (
-    <div
-      className="group flex items-start sm:items-center gap-3 px-3 py-3 cursor-pointer rounded-xl hover:bg-base-bg-emphasized relative"
-      onClick={createProject}
-    >
-      {/* Icon container */}
-      <div className="w-10 h-10 bg-base-bg rounded-md justify-center items-center flex">
-        <GithubIcon />
-      </div>
-      {/* Content */}
-      <div className="flex flex-1 gap-3 flex-wrap">
-        <div className="flex flex-col gap-1">
-          <p className="text-elements-high-em text-sm font-medium tracking-[-0.006em]">
-            {repository.full_name}
-          </p>
-          <p className="text-elements-low-em text-xs">
-            {repository.updated_at && relativeTimeISO(repository.updated_at)}
-          </p>
-        </div>
-        {repository.visibility === 'private' && (
-          <div className="bg-orange-50 border border-orange-200 px-2 py-1 flex items-center gap-1 rounded-lg text-xs text-orange-600 h-fit">
-            <LockIcon />
-            Private
-          </div>
-        )}
-      </div>
-      {/* Right action */}
-      {isLoading ? (
-        <Spinner className="h-4 w-4 absolute right-3" />
-      ) : (
-        <Button
-          variant="tertiary"
-          size="sm"
-          iconOnly
-          className="sm:group-hover:flex hidden absolute right-3"
-        >
-          <ArrowRightCircleIcon />
-        </Button>
-      )}
-    </div>
-  );
-};
@@ -1 +0,0 @@
-export * from './ProjectRepoCard';
@@ -0,0 +1,158 @@
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { Octokit } from 'octokit';
+import assert from 'assert';
+import { useDebounce } from 'usehooks-ts';
+
+import { Button, Typography, Option } from '@material-tailwind/react';
+
+import SearchBar from '../../SearchBar';
+import ProjectRepoCard from './ProjectRepoCard';
+import { GitOrgDetails, GitRepositoryDetails } from '../../../types';
+import AsyncSelect from '../../shared/AsyncSelect';
+import { GithubIcon } from 'components/shared/CustomIcon';
+
+const DEFAULT_SEARCHED_REPO = '';
+const REPOS_PER_PAGE = 5;
+
+interface RepositoryListProps {
+  octokit: Octokit;
+}
+
+const RepositoryList = ({ octokit }: RepositoryListProps) => {
+  const [searchedRepo, setSearchedRepo] = useState(DEFAULT_SEARCHED_REPO);
+  const [selectedAccount, setSelectedAccount] = useState('');
+  const [orgs, setOrgs] = useState<GitOrgDetails[]>([]);
+  // TODO: Add new type for Git user when required
+  const [gitUser, setGitUser] = useState<GitOrgDetails>();
+
+  const [repositoryDetails, setRepositoryDetails] = useState<
+    GitRepositoryDetails[]
+  >([]);
+
+  useEffect(() => {
+    const fetchUserAndOrgs = async () => {
+      const user = await octokit.rest.users.getAuthenticated();
+      const orgs = await octokit.rest.orgs.listForAuthenticatedUser();
+      setOrgs(orgs.data);
+      setGitUser(user.data);
+      setSelectedAccount(user.data.login);
+    };
+
+    fetchUserAndOrgs();
+  }, [octokit]);
+
+  const debouncedSearchedRepo = useDebounce<string>(searchedRepo, 500);
+
+  useEffect(() => {
+    const fetchRepos = async () => {
+      if (!selectedAccount || !gitUser) {
+        return;
+      }
+
+      // Check search input and use GitHub search API
+      if (debouncedSearchedRepo) {
+        let query = `${debouncedSearchedRepo} in:name fork:true`;
+
+        // Check if selected account is an organization
+        if (selectedAccount === gitUser.login) {
+          query = query + ` user:${selectedAccount}`;
+        } else {
+          query = query + ` org:${selectedAccount}`;
+        }
+
+        const result = await octokit.rest.search.repos({
+          q: query,
+          per_page: REPOS_PER_PAGE,
+        });
+
+        setRepositoryDetails(result.data.items);
+        return;
+      }
+
+      if (selectedAccount === gitUser.login) {
+        const result = await octokit.rest.repos.listForAuthenticatedUser({
+          per_page: REPOS_PER_PAGE,
+          affiliation: 'owner',
+        });
+        setRepositoryDetails(result.data);
+        return;
+      }
+
+      const selectedOrg = orgs.find((org) => org.login === selectedAccount);
+      assert(selectedOrg, 'Selected org not found in list');
+
+      const result = await octokit.rest.repos.listForOrg({
+        org: selectedOrg.login,
+        per_page: REPOS_PER_PAGE,
+        type: 'all',
+      });
+
+      setRepositoryDetails(result.data);
+    };
+
+    fetchRepos();
+  }, [selectedAccount, gitUser, orgs, debouncedSearchedRepo]);
+
+  const handleResetFilters = useCallback(() => {
+    assert(gitUser, 'Git user is not available');
+    setSearchedRepo(DEFAULT_SEARCHED_REPO);
+    setSelectedAccount(gitUser.login);
+  }, [gitUser]);
+
+  const accounts = useMemo(() => {
+    if (!octokit || !gitUser) {
+      return [];
+    }
+
+    return [gitUser, ...orgs];
+  }, [octokit, orgs, gitUser]);
+
+  return (
+    <div className="p-4">
+      <div className="flex gap-2 mb-2 items-center">
+        <div className="basis-1/3">
+          <AsyncSelect
+            value={selectedAccount}
+            onChange={(value) => setSelectedAccount(value!)}
+          >
+            {accounts.map((account) => (
+              <Option key={account.id} value={account.login}>
+                <div className="flex items-center gap-2 justify-start">
+                  <GithubIcon /> {account.login}
+                </div>
+              </Option>
+            ))}
+          </AsyncSelect>
+        </div>
+        <div className="basis-2/3 flex-grow flex items-center">
+          <SearchBar
+            value={searchedRepo}
+            onChange={(event) => setSearchedRepo(event.target.value)}
+            placeholder="Search for repository"
+          />
+        </div>
+      </div>
+      {Boolean(repositoryDetails.length) ? (
+        repositoryDetails.map((repo, key) => {
+          return <ProjectRepoCard repository={repo} key={key} />;
+        })
+      ) : (
+        <div className="mt-4 p-6 flex items-center justify-center">
+          <div className="text-center">
+            <Typography placeholder={''}>No repository found</Typography>
+            <Button
+              className="rounded-full mt-5"
+              size="sm"
+              onClick={handleResetFilters}
+              placeholder={''}
+            >
+              ^ Reset filters
+            </Button>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default RepositoryList;
@@ -1,182 +0,0 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import assert from 'assert';
-import { useDebounce } from 'usehooks-ts';
-
-import { ProjectRepoCard } from 'components/projects/create/ProjectRepoCard';
-import { GitOrgDetails, GitRepositoryDetails } from '../../../../types/types';
-import {
-  ChevronGrabberHorizontal,
-  GithubIcon,
-  RefreshIcon,
-  SearchIcon,
-} from 'components/shared/CustomIcon';
-import { Select, SelectOption } from 'components/shared/Select';
-import { Input } from 'components/shared/Input';
-import { Button } from 'components/shared/Button';
-import { useOctokit } from 'context/OctokitContext';
-
-const DEFAULT_SEARCHED_REPO = '';
-const REPOS_PER_PAGE = 5;
-
-export const RepositoryList = () => {
-  const [searchedRepo, setSearchedRepo] = useState(DEFAULT_SEARCHED_REPO);
-  const [selectedAccount, setSelectedAccount] = useState<SelectOption>();
-  const [orgs, setOrgs] = useState<GitOrgDetails[]>([]);
-  // TODO: Add new type for Git user when required
-  const [gitUser, setGitUser] = useState<GitOrgDetails>();
-  const { octokit, isAuth } = useOctokit();
-
-  const [repositoryDetails, setRepositoryDetails] = useState<
-    GitRepositoryDetails[]
-  >([]);
-
-  useEffect(() => {
-    const fetchUserAndOrgs = async () => {
-      try {
-        const user = await octokit.rest.users.getAuthenticated();
-        const orgs = await octokit.rest.orgs.listForAuthenticatedUser();
-        setOrgs(orgs.data);
-        setGitUser(user.data);
-        setSelectedAccount({ label: user.data.login, value: user.data.login });
-      } catch (error) {
-        // Error handled by octokit error hook interceptor in Octokit context
-        console.error(error);
-        return;
-      }
-    };
-
-    if (isAuth) {
-      fetchUserAndOrgs();
-    }
-  }, [octokit, isAuth]);
-
-  const debouncedSearchedRepo = useDebounce<string>(searchedRepo, 500);
-
-  useEffect(() => {
-    const fetchRepos = async () => {
-      if (!selectedAccount || !gitUser) {
-        return;
-      }
-
-      // Check search input and use GitHub search API
-      if (debouncedSearchedRepo) {
-        let query = `${debouncedSearchedRepo} in:name fork:true`;
-
-        // Check if selected account is an organization
-        if (selectedAccount.value === gitUser.login) {
-          query = query + ` user:${selectedAccount}`;
-        } else {
-          query = query + ` org:${selectedAccount}`;
-        }
-
-        const result = await octokit.rest.search.repos({
-          q: query,
-          per_page: REPOS_PER_PAGE,
-        });
-
-        setRepositoryDetails(result.data.items);
-        return;
-      }
-
-      if (selectedAccount.value === gitUser.login) {
-        const result = await octokit.rest.repos.listForAuthenticatedUser({
-          per_page: REPOS_PER_PAGE,
-          affiliation: 'owner',
-        });
-        setRepositoryDetails(result.data);
-        return;
-      }
-
-      const selectedOrg = orgs.find(
-        (org) => org.login === selectedAccount.value,
-      );
-      assert(selectedOrg, 'Selected org not found in list');
-
-      const result = await octokit.rest.repos.listForOrg({
-        org: selectedOrg.login,
-        per_page: REPOS_PER_PAGE,
-        type: 'all',
-      });
-
-      setRepositoryDetails(result.data);
-    };
-
-    fetchRepos();
-  }, [selectedAccount, gitUser, orgs, debouncedSearchedRepo]);
-
-  const handleResetFilters = useCallback(() => {
-    assert(gitUser, 'Git user is not available');
-    setSearchedRepo(DEFAULT_SEARCHED_REPO);
-    setSelectedAccount({ label: gitUser.login, value: gitUser.login });
-  }, [gitUser]);
-
-  const accounts = useMemo(() => {
-    if (!octokit || !gitUser) {
-      return [];
-    }
-
-    return [gitUser, ...orgs];
-  }, [octokit, orgs, gitUser]);
-
-  const options = useMemo(() => {
-    return accounts.map((account) => ({
-      label: account.login,
-      value: account.login,
-      leftIcon: <GithubIcon />,
-    }));
-  }, [accounts]);
-
-  return (
-    <section className="space-y-3">
-      {/* Dropdown and search */}
-      <div className="flex flex-col lg:flex-row gap-0 lg:gap-3 items-center">
-        <div className="lg:basis-1/3 w-full">
-          <Select
-            options={options}
-            placeholder="Select a repository"
-            value={selectedAccount}
-            leftIcon={selectedAccount ? <GithubIcon /> : undefined}
-            rightIcon={<ChevronGrabberHorizontal />}
-            onChange={(value) => setSelectedAccount(value as SelectOption)}
-          />
-        </div>
-        <div className="basis-2/3 flex w-full flex-grow">
-          <Input
-            className="w-full"
-            value={searchedRepo}
-            placeholder="Search for repository"
-            leftIcon={<SearchIcon />}
-            onChange={(e) => setSearchedRepo(e.target.value)}
-          />
-        </div>
-      </div>
-
-      {/* Repository list */}
-      {Boolean(repositoryDetails.length) ? (
-        <div className="flex flex-col gap-2">
-          {repositoryDetails.map((repo, index) => (
-            <div key={index}>
-              <ProjectRepoCard repository={repo} />
-              {/* Horizontal line */}
-              {index !== repositoryDetails.length - 1 && (
-                <div className="border-b border-border-separator/[0.06] w-full" />
-              )}
-            </div>
-          ))}
-        </div>
-      ) : (
-        <div className="mt-4 p-6 flex flex-col gap-4 items-center justify-center">
-          <p className="text-elements-high-em font-sans">No repository found</p>
-          <Button
-            variant="tertiary"
-            leftIcon={<RefreshIcon />}
-            size="sm"
-            onClick={handleResetFilters}
-          >
-            Reset filters
-          </Button>
-        </div>
-      )}
-    </section>
-  );
-};
--- a/Show More
+++ b/Show More