Implement Gitea authentication and get access token

* Update logo.svg

* Update logo.svg

* Delete packages/frontend/public/favicon.ico

* Delete packages/frontend/public/logo192.png

* Delete packages/frontend/public/logo512.png

* Add files via upload

* Add files via upload

* Add files via upload

* Update site.webmanifest

* Update index.html

---------

Co-authored-by: Vivian Phung <dev+github@vivianphung.com>

.vscode/settings.json

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

README.md

@@ -1,8 +1,8 @@
-# snowballtools
+# snowballtools-base
 
 ## Setup
 
-- Clone the  `snowballtools` repo
+- Clone the `snowballtools-base` repo
 
   ```bash
   git clone git@github.com:snowball-tools/snowballtools-base.git
@@ -28,63 +28,138 @@
   cd packages/backend
   ```
 
-- Load fixtures in database
-
-  ```bash
-  yarn test:db:load:fixtures
-  ```
-
 - Set `gitHub.oAuth.clientId` and `gitHub.oAuth.clientSecret` in backend [config file](packages/backend/environments/local.toml)
-  - Client ID and secret will be available after creating Github OAuth app
-    - https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/creating-an-oauth-app
+  - 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
 
-- Run the laconicd stack following this [doc](https://git.vdb.to/cerc-io/stack-orchestrator/src/branch/main/docs/laconicd-with-console.md)
+### Backend Production
 
-- Get the private key and set `registryConfig.privateKey` in backend [config file](packages/backend/environments/local.toml)
+- Let us assume the following domains for backend and frontend
+  - Backend server: `api.snowballtools.com`
+  - Frontend app: `dashboard.snowballtools.com`
 
-  ```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
+- 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 = ""
   ```
 
-- 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)
+- 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
 
-  ```bash
-  # For registryConfig.restEndpoint
-  laconic-so --stack fixturenet-laconic-loaded deploy port laconicd 1317
-  # 0.0.0.0:32777
+- Set `gitHub.webhookUrl` in backend [config file](packages/backend/environments/local.toml)
 
-  # For registryConfig.gqlEndpoint
-  laconic-so --stack fixturenet-laconic-loaded deploy port laconicd 9473
-  # 0.0.0.0:32771
+  ```toml
+  ...
+  [gitHub]
+    webhookUrl = "https://api.snowballtools.com"
+  ...
   ```
 
-- Run the script to create bond, reserve the authority and set authority bond
+- Let us assume domain for Laconicd to be `api.laconic.com` and set the following in backend [config file](packages/backend/environments/local.toml)
 
-  ```bash
-  yarn test:registry:init
-  # snowball:initialize-registry bondId: 6af0ab81973b93d3511ae79841756fb5da3fd2f70ea1279e81fae7c9b19af6c4 +0ms
+  ```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"
+  ...
   ```
 
-  - Get the bond id and set `registryConfig.bondId` in backend [config file](packages/backend/environments/local.toml)
+- 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
-  - https://ngrok.com/docs/getting-started/
+  - [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]
@@ -95,7 +170,7 @@
 - Start the server in `packages/backend`
 
   ```bash
-  yarn start
+  yarn start:dev
   ```
 
 ## Frontend
@@ -106,12 +181,6 @@
   cd packages/frontend
   ```
 
-- Copy the graphQL endpoint from terminal and add the endpoint in the [.env](packages/frontend/.env) file present in `packages/frontend`
-
-  ```env
-  REACT_APP_GQL_SERVER_URL = 'http://localhost:8000/graphql'
-  ```
-
 - Copy the GitHub OAuth app client ID from previous steps and set it in frontend [.env](packages/frontend/.env) file
 
   ```env
@@ -121,20 +190,32 @@
 - Set `REACT_APP_GITHUB_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_TEMPLATE_REPO = cerc-io/test-progressive-web-app
   ```
 
-### Development
+### Frontend Production
 
-- Start the React application
+- Let us assume the following domains for backend and frontend
+  - Backend server: `api.snowballtools.com`
+  - Frontend app: `dashboard.snowballtools.com`
 
-  ```bash
-  yarn start
+- Set the following values in [.env](packages/frontend/.env) file
+
+  ```env
+  # Backend server endpoint
+  REACT_APP_SERVER_URL = 'https://api.snowballtools.com'
   ```
 
-- The React application will be running in `http://localhost:3000/`
+- 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
 
-### Production
+  ```env
+  REACT_APP_WALLET_CONNECT_ID = <PROJECT_ID>
+  ```
 
 - Build the React application
 
@@ -148,3 +229,28 @@
   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/`

build-webapp.sh

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

packages/backend/.eslintrc.json

@@ -25,9 +25,6 @@
         "allowArgumentsExplicitlyTypedAsAny": true
       }
     ],
-    "@typescript-eslint/no-unused-vars": [
-      "error",
-      { "ignoreRestSiblings": true }
-    ]
+    "@typescript-eslint/no-unused-vars": ["error", { "ignoreRestSiblings": true }]
   }
 }

packages/backend/environments/local.toml

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

packages/backend/package.json

@@ -12,13 +12,16 @@
     "@types/node": "^20.11.0",
     "apollo-server-core": "^3.13.0",
     "apollo-server-express": "^3.13.0",
+    "cors": "^2.8.5",
     "debug": "^4.3.1",
     "express": "^4.18.2",
+    "express-session": "^1.18.0",
     "fs-extra": "^11.2.0",
     "graphql": "^16.8.1",
     "luxon": "^3.4.4",
     "nanoid": "3",
     "nanoid-dictionary": "^5.0.0-beta.1",
+    "node-fetch": "2",
     "octokit": "^3.1.2",
     "reflect-metadata": "^0.2.1",
     "semver": "^7.6.0",
@@ -42,7 +45,9 @@
     "test:db:delete": "DEBUG=snowball:* ts-node ./test/delete-db.ts"
   },
   "devDependencies": {
+    "@types/express-session": "^1.17.10",
     "@types/fs-extra": "^11.0.4",
+    "@types/node-fetch": "^2.6.11",
     "@typescript-eslint/eslint-plugin": "^6.18.1",
     "@typescript-eslint/parser": "^6.18.1",
     "better-sqlite3": "^9.2.2",

packages/backend/src/config.ts

@@ -1,7 +1,18 @@
+export interface SessionConfig {
+  secret: string;
+  appOriginUrl: string;
+  trustProxy: boolean;
+  domain: string;
+}
+
 export interface ServerConfig {
   host: string;
   port: number;
   gqlPath?: string;
+  sessionSecret: string;
+  appOriginUrl: string;
+  isProduction: boolean;
+  session: SessionConfig;
 }
 
 export interface DatabaseConfig {
@@ -13,7 +24,7 @@ export interface GitHubConfig {
   oAuth: {
     clientId: string;
     clientSecret: string;
-  };
+  }
 }
 
 export interface RegistryConfig {
@@ -23,11 +34,16 @@ export interface RegistryConfig {
   privateKey: string;
   bondId: string;
   fetchDeploymentRecordDelay: number;
+  authority: string;
   fee: {
     amount: string;
     denom: string;
     gas: string;
-  };
+  }
+}
+
+export interface MiscConfig {
+  projectDomain: string;
 }
 
 export interface Config {
@@ -35,4 +51,5 @@ export interface Config {
   database: DatabaseConfig;
   gitHub: GitHubConfig;
   registryConfig: RegistryConfig;
+  misc: MiscConfig;
 }

packages/backend/src/constants.ts

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

packages/backend/src/database.ts

@@ -1,17 +1,11 @@
-import {
-  DataSource,
-  DeepPartial,
-  FindManyOptions,
-  FindOneOptions,
-  FindOptionsWhere
-} from 'typeorm';
+import { DataSource, DeepPartial, FindManyOptions, FindOneOptions, FindOptionsWhere } from 'typeorm';
 import path from 'path';
 import debug from 'debug';
 import assert from 'assert';
 import { customAlphabet } from 'nanoid';
 import { lowercase, numbers } from 'nanoid-dictionary';
 
-import { DatabaseConfig } from './config';
+import { DatabaseConfig, MiscConfig } from './config';
 import { User } from './entity/User';
 import { Organization } from './entity/Organization';
 import { Project } from './entity/Project';
@@ -19,13 +13,10 @@ import { Deployment } from './entity/Deployment';
 import { ProjectMember } from './entity/ProjectMember';
 import { EnvironmentVariable } from './entity/EnvironmentVariable';
 import { Domain } from './entity/Domain';
-import { PROJECT_DOMAIN } from './constants';
 import { getEntities, loadAndSaveData } from './utils';
 import { UserOrganization } from './entity/UserOrganization';
 
 const ORGANIZATION_DATA_PATH = '../test/fixtures/organizations.json';
-const USER_DATA_PATH = '../test/fixtures/users.json';
-const USER_ORGANIZATION_DATA_PATH = '../test/fixtures/user-organizations.json';
 
 const log = debug('snowball:database');
 
@@ -34,8 +25,9 @@ const nanoid = customAlphabet(lowercase + numbers, 8);
 // TODO: Fix order of methods
 export class Database {
   private dataSource: DataSource;
+  private projectDomain: string;
 
-  constructor ({ dbPath }: DatabaseConfig) {
+  constructor ({ dbPath } : DatabaseConfig, { projectDomain } : MiscConfig) {
     this.dataSource = new DataSource({
       type: 'better-sqlite3',
       database: dbPath,
@@ -43,6 +35,8 @@ export class Database {
       synchronize: true,
       logging: false
     });
+
+    this.projectDomain = projectDomain;
   }
 
   async init (): Promise<void> {
@@ -51,36 +45,10 @@ export class Database {
 
     const organizations = await this.getOrganizations({});
 
+    // Load an organization if none exist
     if (!organizations.length) {
-      const orgEntities = await getEntities(
-        path.resolve(__dirname, ORGANIZATION_DATA_PATH)
-      );
-      const savedOrgs = await loadAndSaveData(Organization, this.dataSource, [
-        orgEntities[0]
-      ]);
-
-      // TODO: Remove user once authenticated
-      const userEntities = await getEntities(
-        path.resolve(__dirname, USER_DATA_PATH)
-      );
-      const savedUsers = await loadAndSaveData(User, this.dataSource, [
-        userEntities[0]
-      ]);
-
-      const userOrganizationRelations = {
-        member: savedUsers,
-        organization: savedOrgs
-      };
-
-      const userOrgEntities = await getEntities(
-        path.resolve(__dirname, USER_ORGANIZATION_DATA_PATH)
-      );
-      await loadAndSaveData(
-        UserOrganization,
-        this.dataSource,
-        [userOrgEntities[0]],
-        userOrganizationRelations
-      );
+      const orgEntities = await getEntities(path.resolve(__dirname, ORGANIZATION_DATA_PATH));
+      await loadAndSaveData(Organization, this.dataSource, [orgEntities[0]]);
     }
   }
 
@@ -98,26 +66,22 @@ export class Database {
     return user;
   }
 
-  async updateUser (userId: string, data: DeepPartial<User>): Promise<boolean> {
+  async updateUser (user: User, data: DeepPartial<User>): Promise<boolean> {
     const userRepository = this.dataSource.getRepository(User);
-    const updateResult = await userRepository.update({ id: userId }, data);
+    const updateResult = await userRepository.update({ id: user.id }, data);
     assert(updateResult.affected);
 
     return updateResult.affected > 0;
   }
 
-  async getOrganizations (
-    options: FindManyOptions<Organization>
-  ): Promise<Organization[]> {
+  async getOrganizations (options: FindManyOptions<Organization>): Promise<Organization[]> {
     const organizationRepository = this.dataSource.getRepository(Organization);
     const organizations = await organizationRepository.find(options);
 
     return organizations;
   }
 
-  async getOrganization (
-    options: FindOneOptions<Organization>
-  ): Promise<Organization | null> {
+  async getOrganization (options: FindOneOptions<Organization>): Promise<Organization | null> {
     const organizationRepository = this.dataSource.getRepository(Organization);
     const organization = await organizationRepository.findOne(options);
 
@@ -140,6 +104,13 @@ export class Database {
     return userOrgs;
   }
 
+  async addUserOrganization (data: DeepPartial<UserOrganization>): Promise<UserOrganization> {
+    const userOrganizationRepository = this.dataSource.getRepository(UserOrganization);
+    const newUserOrganization = await userOrganizationRepository.save(data);
+
+    return newUserOrganization;
+  }
+
   async getProjects (options: FindManyOptions<Project>): Promise<Project[]> {
     const projectRepository = this.dataSource.getRepository(Project);
     const projects = await projectRepository.find(options);
@@ -152,11 +123,7 @@ export class Database {
 
     const project = await projectRepository
       .createQueryBuilder('project')
-      .leftJoinAndSelect(
-        'project.deployments',
-        'deployments',
-        'deployments.isCurrent = true'
-      )
+      .leftJoinAndSelect('project.deployments', 'deployments', 'deployments.isCurrent = true')
       .leftJoinAndSelect('deployments.createdBy', 'user')
       .leftJoinAndSelect('deployments.domain', 'domain')
       .leftJoinAndSelect('project.owner', 'owner')
@@ -169,29 +136,19 @@ export class Database {
     return project;
   }
 
-  async getProjectsInOrganization (
-    userId: string,
-    organizationSlug: string
-  ): Promise<Project[]> {
+  async getProjectsInOrganization (userId: string, organizationSlug: string): Promise<Project[]> {
     const projectRepository = this.dataSource.getRepository(Project);
 
     const projects = await projectRepository
       .createQueryBuilder('project')
-      .leftJoinAndSelect(
-        'project.deployments',
-        'deployments',
-        'deployments.isCurrent = true'
-      )
+      .leftJoinAndSelect('project.deployments', 'deployments', 'deployments.isCurrent = true')
       .leftJoinAndSelect('deployments.domain', 'domain')
       .leftJoin('project.projectMembers', 'projectMembers')
       .leftJoin('project.organization', 'organization')
-      .where(
-        '(project.ownerId = :userId OR projectMembers.userId = :userId) AND organization.slug = :organizationSlug',
-        {
-          userId,
-          organizationSlug
-        }
-      )
+      .where('(project.ownerId = :userId OR projectMembers.userId = :userId) AND organization.slug = :organizationSlug', {
+        userId,
+        organizationSlug
+      })
       .getMany();
 
     return projects;
@@ -200,9 +157,7 @@ export class Database {
   /**
    * Get deployments with specified filter
    */
-  async getDeployments (
-    options: FindManyOptions<Deployment>
-  ): Promise<Deployment[]> {
+  async getDeployments (options: FindManyOptions<Deployment>): Promise<Deployment[]> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
     const deployments = await deploymentRepository.find(options);
 
@@ -227,9 +182,7 @@ export class Database {
     });
   }
 
-  async getDeployment (
-    options: FindOneOptions<Deployment>
-  ): Promise<Deployment | null> {
+  async getDeployment (options: FindOneOptions<Deployment>): Promise<Deployment | null> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
     const deployment = await deploymentRepository.findOne(options);
 
@@ -257,11 +210,8 @@ export class Database {
     return deployment;
   }
 
-  async getProjectMembersByProjectId (
-    projectId: string
-  ): Promise<ProjectMember[]> {
-    const projectMemberRepository =
-      this.dataSource.getRepository(ProjectMember);
+  async getProjectMembersByProjectId (projectId: string): Promise<ProjectMember[]> {
+    const projectMemberRepository = this.dataSource.getRepository(ProjectMember);
 
     const projectMembers = await projectMemberRepository.find({
       relations: {
@@ -278,12 +228,8 @@ export class Database {
     return projectMembers;
   }
 
-  async getEnvironmentVariablesByProjectId (
-    projectId: string,
-    filter?: FindOptionsWhere<EnvironmentVariable>
-  ): Promise<EnvironmentVariable[]> {
-    const environmentVariableRepository =
-      this.dataSource.getRepository(EnvironmentVariable);
+  async getEnvironmentVariablesByProjectId (projectId: string, filter?: FindOptionsWhere<EnvironmentVariable>): Promise<EnvironmentVariable[]> {
+    const environmentVariableRepository = this.dataSource.getRepository(EnvironmentVariable);
 
     const environmentVariables = await environmentVariableRepository.find({
       where: {
@@ -298,12 +244,9 @@ export class Database {
   }
 
   async removeProjectMemberById (projectMemberId: string): Promise<boolean> {
-    const projectMemberRepository =
-      this.dataSource.getRepository(ProjectMember);
+    const projectMemberRepository = this.dataSource.getRepository(ProjectMember);
 
-    const deleteResult = await projectMemberRepository.delete({
-      id: projectMemberId
-    });
+    const deleteResult = await projectMemberRepository.delete({ id: projectMemberId });
 
     if (deleteResult.affected) {
       return deleteResult.affected > 0;
@@ -312,63 +255,37 @@ export class Database {
     }
   }
 
-  async updateProjectMemberById (
-    projectMemberId: string,
-    data: DeepPartial<ProjectMember>
-  ): Promise<boolean> {
-    const projectMemberRepository =
-      this.dataSource.getRepository(ProjectMember);
-    const updateResult = await projectMemberRepository.update(
-      { id: projectMemberId },
-      data
-    );
+  async updateProjectMemberById (projectMemberId: string, data: DeepPartial<ProjectMember>): Promise<boolean> {
+    const projectMemberRepository = this.dataSource.getRepository(ProjectMember);
+    const updateResult = await projectMemberRepository.update({ id: projectMemberId }, data);
 
     return Boolean(updateResult.affected);
   }
 
-  async addProjectMember (
-    data: DeepPartial<ProjectMember>
-  ): Promise<ProjectMember> {
-    const projectMemberRepository =
-      this.dataSource.getRepository(ProjectMember);
+  async addProjectMember (data: DeepPartial<ProjectMember>): Promise<ProjectMember> {
+    const projectMemberRepository = this.dataSource.getRepository(ProjectMember);
     const newProjectMember = await projectMemberRepository.save(data);
 
     return newProjectMember;
   }
 
-  async addEnvironmentVariables (
-    data: DeepPartial<EnvironmentVariable>[]
-  ): Promise<EnvironmentVariable[]> {
-    const environmentVariableRepository =
-      this.dataSource.getRepository(EnvironmentVariable);
-    const savedEnvironmentVariables =
-      await environmentVariableRepository.save(data);
+  async addEnvironmentVariables (data: DeepPartial<EnvironmentVariable>[]): Promise<EnvironmentVariable[]> {
+    const environmentVariableRepository = this.dataSource.getRepository(EnvironmentVariable);
+    const savedEnvironmentVariables = await environmentVariableRepository.save(data);
 
     return savedEnvironmentVariables;
   }
 
-  async updateEnvironmentVariable (
-    environmentVariableId: string,
-    data: DeepPartial<EnvironmentVariable>
-  ): Promise<boolean> {
-    const environmentVariableRepository =
-      this.dataSource.getRepository(EnvironmentVariable);
-    const updateResult = await environmentVariableRepository.update(
-      { id: environmentVariableId },
-      data
-    );
+  async updateEnvironmentVariable (environmentVariableId: string, data: DeepPartial<EnvironmentVariable>): Promise<boolean> {
+    const environmentVariableRepository = this.dataSource.getRepository(EnvironmentVariable);
+    const updateResult = await environmentVariableRepository.update({ id: environmentVariableId }, data);
 
     return Boolean(updateResult.affected);
   }
 
-  async deleteEnvironmentVariable (
-    environmentVariableId: string
-  ): Promise<boolean> {
-    const environmentVariableRepository =
-      this.dataSource.getRepository(EnvironmentVariable);
-    const deleteResult = await environmentVariableRepository.delete({
-      id: environmentVariableId
-    });
+  async deleteEnvironmentVariable (environmentVariableId: string): Promise<boolean> {
+    const environmentVariableRepository = this.dataSource.getRepository(EnvironmentVariable);
+    const deleteResult = await environmentVariableRepository.delete({ id: environmentVariableId });
 
     if (deleteResult.affected) {
       return deleteResult.affected > 0;
@@ -378,8 +295,7 @@ export class Database {
   }
 
   async getProjectMemberById (projectMemberId: string): Promise<ProjectMember> {
-    const projectMemberRepository =
-      this.dataSource.getRepository(ProjectMember);
+    const projectMemberRepository = this.dataSource.getRepository(ProjectMember);
 
     const projectMemberWithProject = await projectMemberRepository.find({
       relations: {
@@ -391,7 +307,8 @@ export class Database {
       where: {
         id: projectMemberId
       }
-    });
+    }
+    );
 
     if (projectMemberWithProject.length === 0) {
       throw new Error('Member does not exist');
@@ -400,49 +317,34 @@ export class Database {
     return projectMemberWithProject[0];
   }
 
-  async getProjectsBySearchText (
-    userId: string,
-    searchText: string
-  ): Promise<Project[]> {
+  async getProjectsBySearchText (userId: string, searchText: string): Promise<Project[]> {
     const projectRepository = this.dataSource.getRepository(Project);
 
     const projects = await projectRepository
       .createQueryBuilder('project')
       .leftJoinAndSelect('project.organization', 'organization')
       .leftJoin('project.projectMembers', 'projectMembers')
-      .where(
-        '(project.owner = :userId OR projectMembers.member.id = :userId) AND project.name LIKE :searchText',
-        {
-          userId,
-          searchText: `%${searchText}%`
-        }
-      )
+      .where('(project.owner = :userId OR projectMembers.member.id = :userId) AND project.name LIKE :searchText', {
+        userId,
+        searchText: `%${searchText}%`
+      })
       .getMany();
 
     return projects;
   }
 
-  async updateDeploymentById (
-    deploymentId: string,
-    data: DeepPartial<Deployment>
-  ): Promise<boolean> {
+  async updateDeploymentById (deploymentId: string, data: DeepPartial<Deployment>): Promise<boolean> {
     return this.updateDeployment({ id: deploymentId }, data);
   }
 
-  async updateDeployment (
-    criteria: FindOptionsWhere<Deployment>,
-    data: DeepPartial<Deployment>
-  ): Promise<boolean> {
+  async updateDeployment (criteria: FindOptionsWhere<Deployment>, data: DeepPartial<Deployment>): Promise<boolean> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
     const updateResult = await deploymentRepository.update(criteria, data);
 
     return Boolean(updateResult.affected);
   }
 
-  async updateDeploymentsByProjectIds (
-    projectIds: string[],
-    data: DeepPartial<Deployment>
-  ): Promise<boolean> {
+  async updateDeploymentsByProjectIds (projectIds: string[], data: DeepPartial<Deployment>): Promise<boolean> {
     const deploymentRepository = this.dataSource.getRepository(Deployment);
 
     const updateResult = await deploymentRepository
@@ -455,11 +357,7 @@ export class Database {
     return Boolean(updateResult.affected);
   }
 
-  async addProject (
-    userId: string,
-    organizationId: string,
-    data: DeepPartial<Project>
-  ): Promise<Project> {
+  async addProject (user: User, organizationId: string, data: DeepPartial<Project>): Promise<Project> {
     const projectRepository = this.dataSource.getRepository(Project);
 
     // TODO: Check if organization exists
@@ -469,28 +367,20 @@ export class Database {
     // TODO: Set icon according to framework
     newProject.icon = '';
 
-    newProject.owner = Object.assign(new User(), {
-      id: userId
-    });
+    newProject.owner = user;
 
     newProject.organization = Object.assign(new Organization(), {
       id: organizationId
     });
 
-    newProject.subDomain = `${newProject.name}.${PROJECT_DOMAIN}`;
+    newProject.subDomain = `${newProject.name}.${this.projectDomain}`;
 
     return projectRepository.save(newProject);
   }
 
-  async updateProjectById (
-    projectId: string,
-    data: DeepPartial<Project>
-  ): Promise<boolean> {
+  async updateProjectById (projectId: string, data: DeepPartial<Project>): Promise<boolean> {
     const projectRepository = this.dataSource.getRepository(Project);
-    const updateResult = await projectRepository.update(
-      { id: projectId },
-      data
-    );
+    const updateResult = await projectRepository.update({ id: projectId }, data);
 
     return Boolean(updateResult.affected);
   }
@@ -537,20 +427,14 @@ export class Database {
     return domain;
   }
 
-  async updateDomainById (
-    domainId: string,
-    data: DeepPartial<Domain>
-  ): Promise<boolean> {
+  async updateDomainById (domainId: string, data: DeepPartial<Domain>): Promise<boolean> {
     const domainRepository = this.dataSource.getRepository(Domain);
     const updateResult = await domainRepository.update({ id: domainId }, data);
 
     return Boolean(updateResult.affected);
   }
 
-  async getDomainsByProjectId (
-    projectId: string,
-    filter?: FindOptionsWhere<Domain>
-  ): Promise<Domain[]> {
+  async getDomainsByProjectId (projectId: string, filter?: FindOptionsWhere<Domain>): Promise<Domain[]> {
     const domainRepository = this.dataSource.getRepository(Domain);
 
     const domains = await domainRepository.find({

packages/backend/src/entity/Deployment.ts

@@ -27,26 +27,26 @@ export enum DeploymentStatus {
 }
 
 export interface ApplicationDeploymentRequest {
-  type: string;
-  version: string;
-  name: string;
-  application: string;
-  config: string;
-  meta: string;
+  type: string
+  version: string
+  name: string
+  application: string
+  config: string,
+  meta: string
 }
 
 export interface ApplicationRecord {
   type: string;
-  version: string;
-  name: string;
-  description?: string;
-  homepage?: string;
-  license?: string;
-  author?: string;
-  repository?: string[];
-  app_version?: string;
-  repository_ref: string;
-  app_type: string;
+  version:string
+  name: string
+  description?: string
+  homepage?: string
+  license?: string
+  author?: string
+  repository?: string[],
+  app_version?: string
+  repository_ref: string
+  app_type: string
 }
 
 @Entity()
@@ -87,11 +87,11 @@ export class Deployment {
   @Column('simple-json')
     applicationRecordData!: ApplicationRecord;
 
-  @Column('varchar')
-    applicationDeploymentRequestId!: string;
+  @Column('varchar', { nullable: true })
+    applicationDeploymentRequestId!: string | null;
 
-  @Column('simple-json')
-    applicationDeploymentRequestData!: ApplicationDeploymentRequest;
+  @Column('simple-json', { nullable: true })
+    applicationDeploymentRequestData!: ApplicationDeploymentRequest | null;
 
   @Column('varchar', { nullable: true })
     applicationDeploymentRecordId!: string | null;

packages/backend/src/entity/Domain.ts

@@ -39,7 +39,7 @@ export class Domain {
 
   @ManyToOne(() => Domain)
   @JoinColumn({ name: 'redirectToId' })
-  // eslint-disable-next-line no-use-before-define
+    // eslint-disable-next-line no-use-before-define
     redirectTo!: Domain | null;
 
   @Column({

packages/backend/src/entity/Organization.ts

@@ -27,12 +27,8 @@ export class Organization {
   @UpdateDateColumn()
     updatedAt!: Date;
 
-  @OneToMany(
-    () => UserOrganization,
-    (userOrganization) => userOrganization.organization,
-    {
-      cascade: ['soft-remove']
-    }
-  )
+  @OneToMany(() => UserOrganization, userOrganization => userOrganization.organization, {
+    cascade: ['soft-remove']
+  })
     userOrganizations!: UserOrganization[];
 }

packages/backend/src/entity/Project.ts

@@ -76,7 +76,7 @@ export class Project {
   @OneToMany(() => Deployment, (deployment) => deployment.project)
     deployments!: Deployment[];
 
-  @OneToMany(() => ProjectMember, (projectMember) => projectMember.project, {
+  @OneToMany(() => ProjectMember, projectMember => projectMember.project, {
     cascade: ['soft-remove']
   })
     projectMembers!: ProjectMember[];

packages/backend/src/entity/ProjectMember.ts

@@ -15,7 +15,7 @@ import { User } from './User';
 
 export enum Permission {
   View = 'View',
-  Edit = 'Edit',
+  Edit = 'Edit'
 }
 
 @Entity()

packages/backend/src/entity/User.ts

@@ -12,10 +12,15 @@ import { UserOrganization } from './UserOrganization';
 
 @Entity()
 @Unique(['email'])
+@Unique(['ethAddress'])
 export class User {
   @PrimaryGeneratedColumn('uuid')
     id!: string;
 
+  // TODO: Set ethAddress as ID
+  @Column()
+    ethAddress!: string;
+
   @Column('varchar', { length: 255, nullable: true })
     name!: string | null;
 
@@ -34,17 +39,13 @@ export class User {
   @CreateDateColumn()
     updatedAt!: Date;
 
-  @OneToMany(() => ProjectMember, (projectMember) => projectMember.project, {
+  @OneToMany(() => ProjectMember, projectMember => projectMember.project, {
     cascade: ['soft-remove']
   })
     projectMembers!: ProjectMember[];
 
-  @OneToMany(
-    () => UserOrganization,
-    (UserOrganization) => UserOrganization.member,
-    {
-      cascade: ['soft-remove']
-    }
-  )
+  @OneToMany(() => UserOrganization, UserOrganization => UserOrganization.member, {
+    cascade: ['soft-remove']
+  })
     userOrganizations!: UserOrganization[];
 }

packages/backend/src/entity/UserOrganization.ts

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

packages/backend/src/index.ts

@@ -19,9 +19,7 @@ const OAUTH_CLIENT_TYPE = 'oauth-app';
 
 export const main = async (): Promise<void> => {
   // TODO: get config path using cli
-  const { server, database, gitHub, registryConfig } = await getConfig<Config>(
-    DEFAULT_CONFIG_FILE_PATH
-  );
+  const { server, database, gitHub, registryConfig, misc } = await getConfig<Config>(DEFAULT_CONFIG_FILE_PATH);
 
   const app = new OAuthApp({
     clientType: OAUTH_CLIENT_TYPE,
@@ -29,20 +27,13 @@ export const main = async (): Promise<void> => {
     clientSecret: gitHub.oAuth.clientSecret
   });
 
-  const db = new Database(database);
+  const db = new Database(database, misc);
   await db.init();
 
   const registry = new Registry(registryConfig);
-  const service = new Service(
-    { gitHubConfig: gitHub, registryConfig },
-    db,
-    app,
-    registry
-  );
+  const service = new Service({ gitHubConfig: gitHub, registryConfig }, db, app, registry);
 
-  const typeDefs = fs
-    .readFileSync(path.join(__dirname, 'schema.gql'))
-    .toString();
+  const typeDefs = fs.readFileSync(path.join(__dirname, 'schema.gql')).toString();
   const resolvers = await createResolvers(service);
 
   await createAndStartServer(server, typeDefs, resolvers, service);

packages/backend/src/registry.ts

@@ -6,11 +6,7 @@ import { DateTime } from 'luxon';
 import { Registry as LaconicRegistry } from '@cerc-io/laconic-sdk';
 
 import { RegistryConfig } from './config';
-import {
-  ApplicationRecord,
-  Deployment,
-  ApplicationDeploymentRequest
-} from './entity/Deployment';
+import { ApplicationRecord, Deployment, ApplicationDeploymentRequest } from './entity/Deployment';
 import { AppDeploymentRecord, PackageJSON } from './types';
 
 const log = debug('snowball:registry');
@@ -24,13 +20,9 @@ export class Registry {
   private registry: LaconicRegistry;
   private registryConfig: RegistryConfig;
 
-  constructor (registryConfig: RegistryConfig) {
+  constructor (registryConfig : RegistryConfig) {
     this.registryConfig = registryConfig;
-    this.registry = new LaconicRegistry(
-      registryConfig.gqlEndpoint,
-      registryConfig.restEndpoint,
-      registryConfig.chainId
-    );
+    this.registry = new LaconicRegistry(registryConfig.gqlEndpoint, registryConfig.restEndpoint, registryConfig.chainId);
   }
 
   async createApplicationRecord ({
@@ -40,38 +32,24 @@ export class Registry {
     appType,
     repoUrl
   }: {
-    appName: string;
-    packageJSON: PackageJSON;
-    commitHash: string;
-    appType: string;
-    repoUrl: string;
-  }): Promise<{
-    applicationRecordId: string;
-    applicationRecordData: ApplicationRecord;
-  }> {
+    appName: string,
+    packageJSON: PackageJSON
+    commitHash: string,
+    appType: string,
+    repoUrl: string
+  }): Promise<{applicationRecordId: string, applicationRecordData: ApplicationRecord}> {
     // Use laconic-sdk to publish record
     // Reference: https://git.vdb.to/cerc-io/test-progressive-web-app/src/branch/main/scripts/publish-app-record.sh
     // Fetch previous records
-    const records = await this.registry.queryRecords(
-      {
-        type: APP_RECORD_TYPE,
-        name: packageJSON.name
-      },
-      true
-    );
+    const records = await this.registry.queryRecords({
+      type: APP_RECORD_TYPE,
+      name: packageJSON.name
+    }, true);
 
     // Get next version of record
-    const bondRecords = records.filter(
-      (record: any) => record.bondId === this.registryConfig.bondId
-    );
-    const [latestBondRecord] = bondRecords.sort(
-      (a: any, b: any) =>
-        new Date(b.createTime).getTime() - new Date(a.createTime).getTime()
-    );
-    const nextVersion = semverInc(
-      latestBondRecord?.attributes.version ?? '0.0.0',
-      'patch'
-    );
+    const bondRecords = records.filter((record: any) => record.bondId === this.registryConfig.bondId);
+    const [latestBondRecord] = bondRecords.sort((a: any, b: any) => new Date(b.createTime).getTime() - new Date(a.createTime).getTime());
+    const nextVersion = semverInc(latestBondRecord?.attributes.version ?? '0.0.0', 'patch');
 
     assert(nextVersion, 'Application record version not valid');
 
@@ -86,12 +64,7 @@ export class Registry {
       ...(packageJSON.description && { description: packageJSON.description }),
       ...(packageJSON.homepage && { homepage: packageJSON.homepage }),
       ...(packageJSON.license && { license: packageJSON.license }),
-      ...(packageJSON.author && {
-        author:
-          typeof packageJSON.author === 'object'
-            ? JSON.stringify(packageJSON.author)
-            : packageJSON.author
-      }),
+      ...(packageJSON.author && { author: typeof packageJSON.author === 'object' ? JSON.stringify(packageJSON.author) : packageJSON.author }),
       ...(packageJSON.version && { app_version: packageJSON.version })
     };
 
@@ -108,45 +81,27 @@ export class Registry {
     log('Application record data:', applicationRecord);
 
     // TODO: Discuss computation of CRN
-    const crn = this.getCrn(packageJSON.name, appName);
+    const crn = this.getCrn(appName);
     log(`Setting name: ${crn} for record ID: ${result.data.id}`);
 
-    await this.registry.setName(
-      { cid: result.data.id, crn },
-      this.registryConfig.privateKey,
-      this.registryConfig.fee
-    );
-    await this.registry.setName(
-      { cid: result.data.id, crn: `${crn}@${applicationRecord.app_version}` },
-      this.registryConfig.privateKey,
-      this.registryConfig.fee
-    );
-    await this.registry.setName(
-      {
-        cid: result.data.id,
-        crn: `${crn}@${applicationRecord.repository_ref}`
-      },
-      this.registryConfig.privateKey,
-      this.registryConfig.fee
-    );
+    await this.registry.setName({ cid: result.data.id, crn }, this.registryConfig.privateKey, this.registryConfig.fee);
+    await this.registry.setName({ cid: result.data.id, crn: `${crn}@${applicationRecord.app_version}` }, this.registryConfig.privateKey, this.registryConfig.fee);
+    await this.registry.setName({ cid: result.data.id, crn: `${crn}@${applicationRecord.repository_ref}` }, this.registryConfig.privateKey, this.registryConfig.fee);
 
-    return {
-      applicationRecordId: result.data.id,
-      applicationRecordData: applicationRecord
-    };
+    return { applicationRecordId: result.data.id, applicationRecordData: applicationRecord };
   }
 
   async createApplicationDeploymentRequest (data: {
-    appName: string;
-    packageJsonName: string;
-    commitHash: string;
-    repository: string;
-    environmentVariables: { [key: string]: string };
+    deployment: Deployment,
+    appName: string,
+    packageJsonName: string,
+    repository: string,
+    environmentVariables: { [key: string]: string }
   }): Promise<{
-    applicationDeploymentRequestId: string;
-    applicationDeploymentRequestData: ApplicationDeploymentRequest;
+    applicationDeploymentRequestId: string,
+    applicationDeploymentRequestData: ApplicationDeploymentRequest
   }> {
-    const crn = this.getCrn(data.packageJsonName, data.appName);
+    const crn = this.getCrn(data.appName);
     const records = await this.registry.resolveNames([crn]);
     const applicationRecord = records[0];
 
@@ -160,9 +115,9 @@ export class Registry {
       version: '1.0.0',
       name: `${applicationRecord.attributes.name}@${applicationRecord.attributes.app_version}`,
       application: `${crn}@${applicationRecord.attributes.app_version}`,
+      dns: `${data.deployment.project.name}-${data.deployment.id}`,
 
       // TODO: Not set in test-progressive-web-app CI
-      // dns: '$CERC_REGISTRY_DEPLOYMENT_SHORT_HOSTNAME',
       // deployment: '$CERC_REGISTRY_DEPLOYMENT_CRN',
 
       // https://git.vdb.to/cerc-io/laconic-registry-cli/commit/129019105dfb93bebcea02fde0ed64d0f8e5983b
@@ -170,11 +125,9 @@ export class Registry {
         env: data.environmentVariables
       }),
       meta: JSON.stringify({
-        note: `Added by Snowball @ ${DateTime.utc().toFormat(
-          "EEE LLL dd HH:mm:ss 'UTC' yyyy"
-        )}`,
+        note: `Added by Snowball @ ${DateTime.utc().toFormat('EEE LLL dd HH:mm:ss \'UTC\' yyyy')}`,
         repository: data.repository,
-        repository_ref: data.commitHash
+        repository_ref: data.deployment.commitHash
       })
     };
 
@@ -190,40 +143,25 @@ export class Registry {
     log(`Application deployment request record published: ${result.data.id}`);
     log('Application deployment request data:', applicationDeploymentRequest);
 
-    return {
-      applicationDeploymentRequestId: result.data.id,
-      applicationDeploymentRequestData: applicationDeploymentRequest
-    };
+    return { applicationDeploymentRequestId: result.data.id, applicationDeploymentRequestData: applicationDeploymentRequest };
   }
 
   /**
    * Fetch ApplicationDeploymentRecords for deployments
    */
-  async getDeploymentRecords (
-    deployments: Deployment[]
-  ): Promise<AppDeploymentRecord[]> {
+  async getDeploymentRecords (deployments: Deployment[]): Promise<AppDeploymentRecord[]> {
     // Fetch ApplicationDeploymentRecords for corresponding ApplicationRecord set in deployments
     // TODO: Implement Laconicd GQL query to filter records by multiple values for an attribute
-    const records = await this.registry.queryRecords(
-      {
-        type: APP_DEPLOYMENT_RECORD_TYPE
-      },
-      true
-    );
+    const records = await this.registry.queryRecords({
+      type: APP_DEPLOYMENT_RECORD_TYPE
+    }, true);
 
     // Filter records with ApplicationRecord ids
-    return records.filter((record: AppDeploymentRecord) =>
-      deployments.some(
-        (deployment) =>
-          deployment.applicationRecordId === record.attributes.application
-      )
-    );
+    return records.filter((record: AppDeploymentRecord) => deployments.some(deployment => deployment.applicationRecordId === record.attributes.application));
   }
 
-  getCrn (packageJsonName: string, appName: string): string {
-    const [arg1] = packageJsonName.split('/');
-    const authority = arg1.replace('@', '');
-
-    return `crn://${authority}/applications/${appName}`;
+  getCrn (appName: string): string {
+    assert(this.registryConfig.authority, "Authority doesn't exist");
+    return `crn://${this.registryConfig.authority}/applications/${appName}`;
   }
 }

packages/backend/src/resolvers.ts

@@ -6,6 +6,7 @@ import { Permission } from './entity/ProjectMember';
 import { Domain } from './entity/Domain';
 import { Project } from './entity/Project';
 import { EnvironmentVariable } from './entity/EnvironmentVariable';
+import { GitType } from './types';
 
 const log = debug('snowball:resolver');
 
@@ -14,36 +15,26 @@ export const createResolvers = async (service: Service): Promise<any> => {
     Query: {
       // TODO: add custom type for context
       user: (_: any, __: any, context: any) => {
-        return service.getUser(context.userId);
+        return context.user;
       },
 
-      organizations: async (_: any, __: any, context: any) => {
-        return service.getOrganizationsByUserId(context.userId);
+      organizations: async (_:any, __: any, context: any) => {
+        return service.getOrganizationsByUserId(context.user);
       },
 
       project: async (_: any, { projectId }: { projectId: string }) => {
         return service.getProjectById(projectId);
       },
 
-      projectsInOrganization: async (
-        _: any,
-        { organizationSlug }: { organizationSlug: string },
-        context: any
-      ) => {
-        return service.getProjectsInOrganization(
-          context.userId,
-          organizationSlug
-        );
+      projectsInOrganization: async (_: any, { organizationSlug }: {organizationSlug: string }, context: any) => {
+        return service.getProjectsInOrganization(context.user, organizationSlug);
       },
 
       deployments: async (_: any, { projectId }: { projectId: string }) => {
         return service.getDeploymentsByProjectId(projectId);
       },
 
-      environmentVariables: async (
-        _: any,
-        { projectId }: { projectId: string }
-      ) => {
+      environmentVariables: async (_: any, { projectId }: { projectId: string }) => {
         return service.getEnvironmentVariablesByProjectId(projectId);
       },
 
@@ -51,55 +42,32 @@ export const createResolvers = async (service: Service): Promise<any> => {
         return service.getProjectMembersByProjectId(projectId);
       },
 
-      searchProjects: async (
-        _: any,
-        { searchText }: { searchText: string },
-        context: any
-      ) => {
-        return service.searchProjects(context.userId, searchText);
+      searchProjects: async (_: any, { searchText }: { searchText: string }, context: any) => {
+        return service.searchProjects(context.user, searchText);
       },
 
-      domains: async (
-        _: any,
-        {
-          projectId,
-          filter
-        }: { projectId: string; filter?: FindOptionsWhere<Domain> }
-      ) => {
+      domains: async (_:any, { projectId, filter }: { projectId: string, filter?: FindOptionsWhere<Domain> }) => {
         return service.getDomainsByProjectId(projectId, filter);
       }
     },
 
     // TODO: Return error in GQL response
     Mutation: {
-      removeProjectMember: async (
-        _: any,
-        { projectMemberId }: { projectMemberId: string },
-        context: any
-      ) => {
+      removeProjectMember: async (_: any, { projectMemberId }: { projectMemberId: string }, context: any) => {
         try {
-          return await service.removeProjectMember(
-            context.userId,
-            projectMemberId
-          );
+          return await service.removeProjectMember(context.user, projectMemberId);
         } catch (err) {
           log(err);
           return false;
         }
       },
 
-      updateProjectMember: async (
-        _: any,
-        {
-          projectMemberId,
-          data
-        }: {
-          projectMemberId: string;
-          data: {
-            permissions: Permission[];
-          };
+      updateProjectMember: async (_: any, { projectMemberId, data }: {
+        projectMemberId: string,
+        data: {
+          permissions: Permission[]
         }
-      ) => {
+      }) => {
         try {
           return await service.updateProjectMember(projectMemberId, data);
         } catch (err) {
@@ -108,19 +76,13 @@ export const createResolvers = async (service: Service): Promise<any> => {
         }
       },
 
-      addProjectMember: async (
-        _: any,
-        {
-          projectId,
-          data
-        }: {
-          projectId: string;
-          data: {
-            email: string;
-            permissions: Permission[];
-          };
+      addProjectMember: async (_: any, { projectId, data }: {
+        projectId: string,
+        data: {
+          email: string,
+          permissions: Permission[]
         }
-      ) => {
+      }) => {
         try {
           return Boolean(await service.addProjectMember(projectId, data));
         } catch (err) {
@@ -129,51 +91,25 @@ export const createResolvers = async (service: Service): Promise<any> => {
         }
       },
 
-      addEnvironmentVariables: async (
-        _: any,
-        {
-          projectId,
-          data
-        }: {
-          projectId: string;
-          data: { environments: string[]; key: string; value: string }[];
-        }
-      ) => {
+      addEnvironmentVariables: async (_: any, { projectId, data }: { projectId: string, data: { environments: string[], key: string, value: string}[] }) => {
         try {
-          return Boolean(
-            await service.addEnvironmentVariables(projectId, data)
-          );
+          return Boolean(await service.addEnvironmentVariables(projectId, data));
         } catch (err) {
           log(err);
           return false;
         }
       },
 
-      updateEnvironmentVariable: async (
-        _: any,
-        {
-          environmentVariableId,
-          data
-        }: {
-          environmentVariableId: string;
-          data: DeepPartial<EnvironmentVariable>;
-        }
-      ) => {
+      updateEnvironmentVariable: async (_: any, { environmentVariableId, data }: { environmentVariableId: string, data : DeepPartial<EnvironmentVariable>}) => {
         try {
-          return await service.updateEnvironmentVariable(
-            environmentVariableId,
-            data
-          );
+          return await service.updateEnvironmentVariable(environmentVariableId, data);
         } catch (err) {
           log(err);
           return false;
         }
       },
 
-      removeEnvironmentVariable: async (
-        _: any,
-        { environmentVariableId }: { environmentVariableId: string }
-      ) => {
+      removeEnvironmentVariable: async (_: any, { environmentVariableId }: { environmentVariableId: string}) => {
         try {
           return await service.removeEnvironmentVariable(environmentVariableId);
         } catch (err) {
@@ -182,45 +118,25 @@ export const createResolvers = async (service: Service): Promise<any> => {
         }
       },
 
-      updateDeploymentToProd: async (
-        _: any,
-        { deploymentId }: { deploymentId: string },
-        context: any
-      ) => {
+      updateDeploymentToProd: async (_: any, { deploymentId }: { deploymentId: string }, context: any) => {
         try {
-          return Boolean(
-            await service.updateDeploymentToProd(context.userId, deploymentId)
-          );
+          return Boolean(await service.updateDeploymentToProd(context.user, deploymentId));
         } catch (err) {
           log(err);
           return false;
         }
       },
 
-      addProject: async (
-        _: any,
-        {
-          organizationSlug,
-          data
-        }: { organizationSlug: string; data: DeepPartial<Project> },
-        context: any
-      ) => {
+      addProject: async (_: any, { organizationSlug, data }: { organizationSlug: string, data: DeepPartial<Project> }, context: any) => {
         try {
-          return await service.addProject(
-            context.userId,
-            organizationSlug,
-            data
-          );
+          return await service.addProject(context.user, organizationSlug, data);
         } catch (err) {
           log(err);
           throw err;
         }
       },
 
-      updateProject: async (
-        _: any,
-        { projectId, data }: { projectId: string; data: DeepPartial<Project> }
-      ) => {
+      updateProject: async (_: any, { projectId, data }: { projectId: string, data: DeepPartial<Project> }) => {
         try {
           return await service.updateProject(projectId, data);
         } catch (err) {
@@ -229,15 +145,9 @@ export const createResolvers = async (service: Service): Promise<any> => {
         }
       },
 
-      redeployToProd: async (
-        _: any,
-        { deploymentId }: { deploymentId: string },
-        context: any
-      ) => {
+      redeployToProd: async (_: any, { deploymentId }: { deploymentId: string }, context: any) => {
         try {
-          return Boolean(
-            await service.redeployToProd(context.userId, deploymentId)
-          );
+          return Boolean(await service.redeployToProd(context.user, deploymentId));
         } catch (err) {
           log(err);
           return false;
@@ -248,8 +158,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
         try {
           return await service.deleteProject(projectId);
         } catch (err) {
-          log(err);
-          return false;
+          log(err); return false;
         }
       },
 
@@ -262,13 +171,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
         }
       },
 
-      rollbackDeployment: async (
-        _: any,
-        {
-          projectId,
-          deploymentId
-        }: { deploymentId: string; projectId: string }
-      ) => {
+      rollbackDeployment: async (_: any, { projectId, deploymentId }: {deploymentId: string, projectId: string }) => {
         try {
           return await service.rollbackDeployment(projectId, deploymentId);
         } catch (err) {
@@ -277,10 +180,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
         }
       },
 
-      addDomain: async (
-        _: any,
-        { projectId, data }: { projectId: string; data: { name: string } }
-      ) => {
+      addDomain: async (_: any, { projectId, data }: { projectId: string, data: { name: string } }) => {
         try {
           return Boolean(await service.addDomain(projectId, data));
         } catch (err) {
@@ -289,10 +189,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
         }
       },
 
-      updateDomain: async (
-        _: any,
-        { domainId, data }: { domainId: string; data: DeepPartial<Domain> }
-      ) => {
+      updateDomain: async (_: any, { domainId, data }: { domainId: string, data: DeepPartial<Domain>}) => {
         try {
           return await service.updateDomain(domainId, data);
         } catch (err) {
@@ -301,13 +198,18 @@ export const createResolvers = async (service: Service): Promise<any> => {
         }
       },
 
-      authenticateGitHub: async (
-        _: any,
-        { code }: { code: string },
-        context: any
-      ) => {
+      authenticateGitHub: async (_: any, { code }: { code: string }, context: any) => {
         try {
-          return await service.authenticateGitHub(code, context.userId);
+          return await service.authenticateGitHub(code, context.user);
+        } catch (err) {
+          log(err);
+          return false;
+        }
+      },
+
+      authenticateGit: async (_: any, { type, code }: { type: GitType, code: string }, context: any) => {
+        try {
+          return await service.authenticateGit(type, code, context.user);
         } catch (err) {
           log(err);
           return false;
@@ -316,9 +218,7 @@ export const createResolvers = async (service: Service): Promise<any> => {
 
       unauthenticateGitHub: async (_: any, __: object, context: any) => {
         try {
-          return service.unauthenticateGitHub(context.userId, {
-            gitHubToken: null
-          });
+          return service.unauthenticateGitHub(context.user, { gitHubToken: null });
         } catch (err) {
           log(err);
           return false;

packages/backend/src/routes/auth.ts

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

packages/backend/src/schema.gql

@@ -26,6 +26,11 @@ enum DomainStatus {
   Pending
 }
 
+enum GitType {
+  GitHub
+  Gitea
+}
+
 type User {
   id: String!
   name: String
@@ -188,19 +193,10 @@ type Query {
 
 type Mutation {
   addProjectMember(projectId: String!, data: AddProjectMemberInput): Boolean!
-  updateProjectMember(
-    projectMemberId: String!
-    data: UpdateProjectMemberInput
-  ): Boolean!
+  updateProjectMember(projectMemberId: String!, data: UpdateProjectMemberInput): Boolean!
   removeProjectMember(projectMemberId: String!): Boolean!
-  addEnvironmentVariables(
-    projectId: String!
-    data: [AddEnvironmentVariableInput!]
-  ): Boolean!
-  updateEnvironmentVariable(
-    environmentVariableId: String!
-    data: UpdateEnvironmentVariableInput!
-  ): Boolean!
+  addEnvironmentVariables(projectId: String!, data: [AddEnvironmentVariableInput!]): Boolean!
+  updateEnvironmentVariable(environmentVariableId: String!, data: UpdateEnvironmentVariableInput!): Boolean!
   removeEnvironmentVariable(environmentVariableId: String!): Boolean!
   updateDeploymentToProd(deploymentId: String!): Boolean!
   addProject(organizationSlug: String!, data: AddProjectInput): Project!
@@ -212,5 +208,6 @@ type Mutation {
   addDomain(projectId: String!, data: AddDomainInput!): Boolean!
   updateDomain(domainId: String!, data: UpdateDomainInput!): Boolean!
   authenticateGitHub(code: String!): AuthResult!
+  authenticateGit(type: GitType!, code: String!): AuthResult!
   unauthenticateGitHub: Boolean!
 }

packages/backend/src/server.ts

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

packages/backend/src/service.ts

@@ -2,6 +2,7 @@ import assert from 'assert';
 import debug from 'debug';
 import { DeepPartial, FindOptionsWhere } from 'typeorm';
 import { Octokit, RequestError } from 'octokit';
+import fetch from 'node-fetch';
 
 import { OAuthApp } from '@octokit/oauth-app';
 
@@ -15,15 +16,17 @@ import { Permission, ProjectMember } from './entity/ProjectMember';
 import { User } from './entity/User';
 import { Registry } from './registry';
 import { GitHubConfig, RegistryConfig } from './config';
-import { AppDeploymentRecord, GitPushEventPayload, PackageJSON } from './types';
+import { AppDeploymentRecord, GitPushEventPayload, GitType, PackageJSON } from './types';
+import { Role } from './entity/UserOrganization';
 
 const log = debug('snowball:service');
 
 const GITHUB_UNIQUE_WEBHOOK_ERROR = 'Hook already exists on this repository';
+const GITEA_ACCESS_TOKEN_ENDPOINT = 'https://git.vdb.to/login/oauth/access_token';
 
 interface Config {
-  gitHubConfig: GitHubConfig;
-  registryConfig: RegistryConfig;
+  gitHubConfig: GitHubConfig
+  registryConfig: RegistryConfig
 }
 
 export class Service {
@@ -71,9 +74,7 @@ export class Service {
     });
 
     if (deployments.length) {
-      log(
-        `Found ${deployments.length} deployments in ${DeploymentStatus.Building} state`
-      );
+      log(`Found ${deployments.length} deployments in ${DeploymentStatus.Building} state`);
 
       // Fetch ApplicationDeploymentRecord for deployments
       const records = await this.registry.getDeploymentRecords(deployments);
@@ -93,12 +94,10 @@ export class Service {
   /**
    * Update deployments with ApplicationDeploymentRecord data
    */
-  async updateDeploymentsWithRecordData (
-    records: AppDeploymentRecord[]
-  ): Promise<void> {
+  async updateDeploymentsWithRecordData (records: AppDeploymentRecord[]): Promise<void> {
     // Get deployments for ApplicationDeploymentRecords
     const deployments = await this.db.getDeployments({
-      where: records.map((record) => ({
+      where: records.map(record => ({
         applicationRecordId: record.attributes.application
       })),
       order: {
@@ -107,46 +106,38 @@ export class Service {
     });
 
     // Get project IDs of deployments that are in production environment
-    const productionDeploymentProjectIds = deployments.reduce(
-      (acc, deployment): Set<string> => {
-        if (deployment.environment === Environment.Production) {
-          acc.add(deployment.projectId);
-        }
+    const productionDeploymentProjectIds = deployments.reduce((acc, deployment): Set<string> => {
+      if (deployment.environment === Environment.Production) {
+        acc.add(deployment.projectId);
+      }
 
-        return acc;
-      },
-      new Set<string>()
-    );
+      return acc;
+    }, new Set<string>());
 
     // Set old deployments isCurrent to false
-    await this.db.updateDeploymentsByProjectIds(
-      Array.from(productionDeploymentProjectIds),
-      { isCurrent: false }
-    );
+    await this.db.updateDeploymentsByProjectIds(Array.from(productionDeploymentProjectIds), { isCurrent: false });
 
-    const recordToDeploymentsMap = deployments.reduce(
-      (acc: { [key: string]: Deployment }, deployment) => {
-        acc[deployment.applicationRecordId] = deployment;
-        return acc;
-      },
-      {}
-    );
+    const recordToDeploymentsMap = deployments.reduce((acc: {[key: string]: Deployment}, deployment) => {
+      acc[deployment.applicationRecordId] = deployment;
+      return acc;
+    }, {});
 
     // Update deployment data for ApplicationDeploymentRecords
     const deploymentUpdatePromises = records.map(async (record) => {
       const deployment = recordToDeploymentsMap[record.attributes.application];
 
-      await this.db.updateDeploymentById(deployment.id, {
-        applicationDeploymentRecordId: record.id,
-        applicationDeploymentRecordData: record.attributes,
-        url: record.attributes.url,
-        status: DeploymentStatus.Ready,
-        isCurrent: deployment.environment === Environment.Production
-      });
-
-      log(
-        `Updated deployment ${deployment.id} with URL ${record.attributes.url}`
+      await this.db.updateDeploymentById(
+        deployment.id,
+        {
+          applicationDeploymentRecordId: record.id,
+          applicationDeploymentRecordData: record.attributes,
+          url: record.attributes.url,
+          status: DeploymentStatus.Ready,
+          isCurrent: deployment.environment === Environment.Production
+        }
       );
+
+      log(`Updated deployment ${deployment.id} with URL ${record.attributes.url}`);
     });
 
     await Promise.all(deploymentUpdatePromises);
@@ -160,18 +151,45 @@ export class Service {
     });
   }
 
+  async loadOrCreateUser (ethAddress: string): Promise<User> {
+    // Get user by ETH address
+    let user = await this.db.getUser({
+      where: {
+        ethAddress
+      }
+    });
+
+    if (!user) {
+      const [org] = await this.db.getOrganizations({});
+      assert(org, 'No organizations exists in database');
+
+      // Create user with new address
+      user = await this.db.addUser({
+        email: `${ethAddress}@example.com`,
+        name: ethAddress,
+        isVerified: true,
+        ethAddress
+      });
+
+      await this.db.addUserOrganization({
+        member: user,
+        organization: org,
+        role: Role.Owner
+      });
+    }
+
+    return user;
+  }
+
   async getOctokit (userId: string): Promise<Octokit> {
     const user = await this.db.getUser({ where: { id: userId } });
-    assert(
-      user && user.gitHubToken,
-      'User needs to be authenticated with GitHub token'
-    );
+    assert(user && user.gitHubToken, 'User needs to be authenticated with GitHub token');
 
     return new Octokit({ auth: user.gitHubToken });
   }
 
-  async getOrganizationsByUserId (userId: string): Promise<Organization[]> {
-    const dbOrganizations = await this.db.getOrganizationsByUserId(userId);
+  async getOrganizationsByUserId (user: User): Promise<Organization[]> {
+    const dbOrganizations = await this.db.getOrganizationsByUserId(user.id);
     return dbOrganizations;
   }
 
@@ -180,14 +198,8 @@ export class Service {
     return dbProject;
   }
 
-  async getProjectsInOrganization (
-    userId: string,
-    organizationSlug: string
-  ): Promise<Project[]> {
-    const dbProjects = await this.db.getProjectsInOrganization(
-      userId,
-      organizationSlug
-    );
+  async getProjectsInOrganization (user: User, organizationSlug: string): Promise<Project[]> {
+    const dbProjects = await this.db.getProjectsInOrganization(user.id, organizationSlug);
     return dbProjects;
   }
 
@@ -196,52 +208,35 @@ export class Service {
     return dbDeployments;
   }
 
-  async getEnvironmentVariablesByProjectId (
-    projectId: string
-  ): Promise<EnvironmentVariable[]> {
-    const dbEnvironmentVariables =
-      await this.db.getEnvironmentVariablesByProjectId(projectId);
+  async getEnvironmentVariablesByProjectId (projectId: string): Promise<EnvironmentVariable[]> {
+    const dbEnvironmentVariables = await this.db.getEnvironmentVariablesByProjectId(projectId);
     return dbEnvironmentVariables;
   }
 
-  async getProjectMembersByProjectId (
-    projectId: string
-  ): Promise<ProjectMember[]> {
-    const dbProjectMembers =
-      await this.db.getProjectMembersByProjectId(projectId);
+  async getProjectMembersByProjectId (projectId: string): Promise<ProjectMember[]> {
+    const dbProjectMembers = await this.db.getProjectMembersByProjectId(projectId);
     return dbProjectMembers;
   }
 
-  async searchProjects (userId: string, searchText: string): Promise<Project[]> {
-    const dbProjects = await this.db.getProjectsBySearchText(
-      userId,
-      searchText
-    );
+  async searchProjects (user: User, searchText: string): Promise<Project[]> {
+    const dbProjects = await this.db.getProjectsBySearchText(user.id, searchText);
     return dbProjects;
   }
 
-  async getDomainsByProjectId (
-    projectId: string,
-    filter?: FindOptionsWhere<Domain>
-  ): Promise<Domain[]> {
+  async getDomainsByProjectId (projectId: string, filter?: FindOptionsWhere<Domain>): Promise<Domain[]> {
     const dbDomains = await this.db.getDomainsByProjectId(projectId, filter);
     return dbDomains;
   }
 
-  async updateProjectMember (
-    projectMemberId: string,
-    data: { permissions: Permission[] }
-  ): Promise<boolean> {
+  async updateProjectMember (projectMemberId: string, data: {permissions: Permission[]}): Promise<boolean> {
     return this.db.updateProjectMemberById(projectMemberId, data);
   }
 
-  async addProjectMember (
-    projectId: string,
+  async addProjectMember (projectId: string,
     data: {
-      email: string;
-      permissions: Permission[];
-    }
-  ): Promise<ProjectMember> {
+      email: string,
+      permissions: Permission[]
+    }): Promise<ProjectMember> {
     // TODO: Send invitation
     let user = await this.db.getUser({
       where: {
@@ -269,68 +264,50 @@ export class Service {
     return newProjectMember;
   }
 
-  async removeProjectMember (
-    userId: string,
-    projectMemberId: string
-  ): Promise<boolean> {
+  async removeProjectMember (user: User, projectMemberId: string): Promise<boolean> {
     const member = await this.db.getProjectMemberById(projectMemberId);
 
-    if (String(member.member.id) === userId) {
+    if (String(member.member.id) === user.id) {
       throw new Error('Invalid operation: cannot remove self');
     }
 
     const memberProject = member.project;
     assert(memberProject);
 
-    if (String(userId) === String(memberProject.owner.id)) {
+    if (String(user.id) === String(memberProject.owner.id)) {
       return this.db.removeProjectMemberById(projectMemberId);
     } else {
       throw new Error('Invalid operation: not authorized');
     }
   }
 
-  async addEnvironmentVariables (
-    projectId: string,
-    data: { environments: string[]; key: string; value: string }[]
-  ): Promise<EnvironmentVariable[]> {
-    const formattedEnvironmentVariables = data
-      .map((environmentVariable) => {
-        return environmentVariable.environments.map((environment) => {
-          return {
-            key: environmentVariable.key,
-            value: environmentVariable.value,
-            environment: environment as Environment,
-            project: Object.assign(new Project(), {
-              id: projectId
-            })
-          };
+  async addEnvironmentVariables (projectId: string, data: { environments: string[], key: string, value: string}[]): Promise<EnvironmentVariable[]> {
+    const formattedEnvironmentVariables = data.map((environmentVariable) => {
+      return environmentVariable.environments.map((environment) => {
+        return ({
+          key: environmentVariable.key,
+          value: environmentVariable.value,
+          environment: environment as Environment,
+          project: Object.assign(new Project(), {
+            id: projectId
+          })
         });
-      })
-      .flat();
+      });
+    }).flat();
 
-    const savedEnvironmentVariables = await this.db.addEnvironmentVariables(
-      formattedEnvironmentVariables
-    );
+    const savedEnvironmentVariables = await this.db.addEnvironmentVariables(formattedEnvironmentVariables);
     return savedEnvironmentVariables;
   }
 
-  async updateEnvironmentVariable (
-    environmentVariableId: string,
-    data: DeepPartial<EnvironmentVariable>
-  ): Promise<boolean> {
+  async updateEnvironmentVariable (environmentVariableId: string, data : DeepPartial<EnvironmentVariable>): Promise<boolean> {
     return this.db.updateEnvironmentVariable(environmentVariableId, data);
   }
 
-  async removeEnvironmentVariable (
-    environmentVariableId: string
-  ): Promise<boolean> {
+  async removeEnvironmentVariable (environmentVariableId: string): Promise<boolean> {
     return this.db.deleteEnvironmentVariable(environmentVariableId);
   }
 
-  async updateDeploymentToProd (
-    userId: string,
-    deploymentId: string
-  ): Promise<Deployment> {
+  async updateDeploymentToProd (user: User, deploymentId: string): Promise<Deployment> {
     const oldDeployment = await this.db.getDeployment({
       where: { id: deploymentId },
       relations: {
@@ -342,21 +319,20 @@ export class Service {
       throw new Error('Deployment does not exist');
     }
 
-    const prodBranchDomains = await this.db.getDomainsByProjectId(
-      oldDeployment.project.id,
-      { branch: oldDeployment.project.prodBranch }
-    );
+    const prodBranchDomains = await this.db.getDomainsByProjectId(oldDeployment.project.id, { branch: oldDeployment.project.prodBranch });
 
-    const octokit = await this.getOctokit(userId);
+    const octokit = await this.getOctokit(user.id);
 
-    const newDeployment = await this.createDeployment(userId, octokit, {
-      project: oldDeployment.project,
-      branch: oldDeployment.branch,
-      environment: Environment.Production,
-      domain: prodBranchDomains[0],
-      commitHash: oldDeployment.commitHash,
-      commitMessage: oldDeployment.commitMessage
-    });
+    const newDeployment = await this.createDeployment(user.id,
+      octokit,
+      {
+        project: oldDeployment.project,
+        branch: oldDeployment.branch,
+        environment: Environment.Production,
+        domain: prodBranchDomains[0],
+        commitHash: oldDeployment.commitHash,
+        commitMessage: oldDeployment.commitMessage
+      });
 
     return newDeployment;
   }
@@ -368,9 +344,7 @@ export class Service {
     recordData: { repoUrl?: string } = {}
   ): Promise<Deployment> {
     assert(data.project?.repository, 'Project repository not found');
-    log(
-      `Creating deployment in project ${data.project.name} from branch ${data.branch}`
-    );
+    log(`Creating deployment in project ${data.project.name} from branch ${data.branch}`);
     const [owner, repo] = data.project.repository.split('/');
 
     const { data: packageJSONData } = await octokit.rest.repos.getContent({
@@ -390,56 +364,28 @@ export class Service {
     assert(packageJSON.name, "name field doesn't exist in package.json");
 
     if (!recordData.repoUrl) {
-      const { data: repoDetails } = await octokit.rest.repos.get({
-        owner,
-        repo
-      });
+      const { data: repoDetails } = await octokit.rest.repos.get({ owner, repo });
       recordData.repoUrl = repoDetails.html_url;
     }
 
     // TODO: Set environment variables for each deployment (environment variables can`t be set in application record)
-    const { applicationRecordId, applicationRecordData } =
-      await this.registry.createApplicationRecord({
-        appName: repo,
-        packageJSON,
-        appType: data.project!.template!,
-        commitHash: data.commitHash!,
-        repoUrl: recordData.repoUrl
-      });
-
-    const environmentVariables =
-      await this.db.getEnvironmentVariablesByProjectId(data.project.id!, {
-        environment: Environment.Production
-      });
-
-    const environmentVariablesObj = environmentVariables.reduce(
-      (acc, env) => {
-        acc[env.key] = env.value;
-
-        return acc;
-      },
-      {} as { [key: string]: string }
-    );
-
-    const { applicationDeploymentRequestId, applicationDeploymentRequestData } =
-      await this.registry.createApplicationDeploymentRequest({
-        appName: repo,
-        packageJsonName: packageJSON.name,
-        commitHash: data.commitHash!,
-        repository: recordData.repoUrl,
-        environmentVariables: environmentVariablesObj
-      });
+    const { applicationRecordId, applicationRecordData } = await this.registry.createApplicationRecord({
+      appName: repo,
+      packageJSON,
+      appType: data.project!.template!,
+      commitHash: data.commitHash!,
+      repoUrl: recordData.repoUrl
+    });
 
     // Update previous deployment with prod branch domain
     // TODO: Fix unique constraint error for domain
-    await this.db.updateDeployment(
-      {
-        domainId: data.domain?.id
-      },
-      {
+    if (data.domain) {
+      await this.db.updateDeployment({
+        domainId: data.domain.id
+      }, {
         domain: null
-      }
-    );
+      });
+    }
 
     const newDeployment = await this.db.addDeployment({
       project: data.project,
@@ -450,25 +396,37 @@ export class Service {
       status: DeploymentStatus.Building,
       applicationRecordId,
       applicationRecordData,
-      applicationDeploymentRequestId,
-      applicationDeploymentRequestData,
       domain: data.domain,
       createdBy: Object.assign(new User(), {
         id: userId
       })
     });
 
-    log(
-      `Created deployment ${newDeployment.id} and published application record ${applicationRecordId}`
-    );
+    log(`Created deployment ${newDeployment.id} and published application record ${applicationRecordId}`);
+
+    const environmentVariables = await this.db.getEnvironmentVariablesByProjectId(data.project.id!, { environment: Environment.Production });
+
+    const environmentVariablesObj = environmentVariables.reduce((acc, env) => {
+      acc[env.key] = env.value;
+
+      return acc;
+    }, {} as { [key: string]: string });
+
+    const { applicationDeploymentRequestId, applicationDeploymentRequestData } = await this.registry.createApplicationDeploymentRequest(
+      {
+        deployment: newDeployment,
+        appName: repo,
+        packageJsonName: packageJSON.name,
+        repository: recordData.repoUrl,
+        environmentVariables: environmentVariablesObj
+      });
+
+    await this.db.updateDeploymentById(newDeployment.id, { applicationDeploymentRequestId, applicationDeploymentRequestData });
+
     return newDeployment;
   }
 
-  async addProject (
-    userId: string,
-    organizationSlug: string,
-    data: DeepPartial<Project>
-  ): Promise<Project | undefined> {
+  async addProject (user: User, organizationSlug: string, data: DeepPartial<Project>): Promise<Project | undefined> {
     const organization = await this.db.getOrganization({
       where: {
         slug: organizationSlug
@@ -478,14 +436,12 @@ export class Service {
       throw new Error('Organization does not exist');
     }
 
-    const project = await this.db.addProject(userId, organization.id, data);
+    const project = await this.db.addProject(user, organization.id, data);
 
-    const octokit = await this.getOctokit(userId);
+    const octokit = await this.getOctokit(user.id);
     const [owner, repo] = project.repository.split('/');
 
-    const {
-      data: [latestCommit]
-    } = await octokit.rest.repos.listCommits({
+    const { data: [latestCommit] } = await octokit.rest.repos.listCommits({
       owner,
       repo,
       sha: project.prodBranch,
@@ -495,8 +451,7 @@ export class Service {
     const { data: repoDetails } = await octokit.rest.repos.get({ owner, repo });
 
     // Create deployment with prod branch and latest commit
-    await this.createDeployment(
-      userId,
+    await this.createDeployment(user.id,
       octokit,
       {
         project,
@@ -523,10 +478,7 @@ export class Service {
         owner,
         repo,
         config: {
-          url: new URL(
-            'api/github/webhook',
-            this.config.gitHubConfig.webhookUrl
-          ).href,
+          url: new URL('api/github/webhook', this.config.gitHubConfig.webhookUrl).href,
           content_type: 'json'
         },
         events: ['push']
@@ -534,13 +486,9 @@ export class Service {
     } catch (err) {
       // https://docs.github.com/en/rest/repos/webhooks?apiVersion=2022-11-28#create-a-repository-webhook--status-codes
       if (
-        !(
-          err instanceof RequestError &&
-          err.status === 422 &&
-          (err.response?.data as any).errors.some(
-            (err: any) => err.message === GITHUB_UNIQUE_WEBHOOK_ERROR
-          )
-        )
+        !(err instanceof RequestError &&
+        err.status === 422 &&
+        (err.response?.data as any).errors.some((err: any) => err.message === GITHUB_UNIQUE_WEBHOOK_ERROR))
       ) {
         throw err;
       }
@@ -552,9 +500,7 @@ export class Service {
   async handleGitHubPush (data: GitPushEventPayload): Promise<void> {
     const { repository, ref, head_commit: headCommit } = data;
     log(`Handling GitHub push event from repository: ${repository.full_name}`);
-    const projects = await this.db.getProjects({
-      where: { repository: repository.full_name }
-    });
+    const projects = await this.db.getProjects({ where: { repository: repository.full_name } });
 
     if (!projects.length) {
       log(`No projects found for repository ${repository.full_name}`);
@@ -566,29 +512,23 @@ export class Service {
 
     for await (const project of projects) {
       const octokit = await this.getOctokit(project.ownerId);
-      const [domain] = await this.db.getDomainsByProjectId(project.id, {
-        branch
-      });
+      const [domain] = await this.db.getDomainsByProjectId(project.id, { branch });
 
       // Create deployment with branch and latest commit in GitHub data
-      await this.createDeployment(project.ownerId, octokit, {
-        project,
-        branch,
-        environment:
-          project.prodBranch === branch
-            ? Environment.Production
-            : Environment.Preview,
-        domain,
-        commitHash: headCommit.id,
-        commitMessage: headCommit.message
-      });
+      await this.createDeployment(project.ownerId,
+        octokit,
+        {
+          project,
+          branch,
+          environment: project.prodBranch === branch ? Environment.Production : Environment.Preview,
+          domain,
+          commitHash: headCommit.id,
+          commitMessage: headCommit.message
+        });
     }
   }
 
-  async updateProject (
-    projectId: string,
-    data: DeepPartial<Project>
-  ): Promise<boolean> {
+  async updateProject (projectId: string, data: DeepPartial<Project>): Promise<boolean> {
     return this.db.updateProjectById(projectId, data);
   }
 
@@ -605,18 +545,13 @@ export class Service {
     });
 
     if (domainsRedirectedFrom.length > 0) {
-      throw new Error(
-        'Cannot delete domain since it has redirects from other domains'
-      );
+      throw new Error('Cannot delete domain since it has redirects from other domains');
     }
 
     return this.db.deleteDomainById(domainId);
   }
 
-  async redeployToProd (
-    userId: string,
-    deploymentId: string
-  ): Promise<Deployment> {
+  async redeployToProd (user: User, deploymentId: string): Promise<Deployment> {
     const oldDeployment = await this.db.getDeployment({
       relations: {
         project: true,
@@ -632,25 +567,24 @@ export class Service {
       throw new Error('Deployment not found');
     }
 
-    const octokit = await this.getOctokit(userId);
+    const octokit = await this.getOctokit(user.id);
 
-    const newDeployment = await this.createDeployment(userId, octokit, {
-      project: oldDeployment.project,
-      // TODO: Put isCurrent field in project
-      branch: oldDeployment.branch,
-      environment: Environment.Production,
-      domain: oldDeployment.domain,
-      commitHash: oldDeployment.commitHash,
-      commitMessage: oldDeployment.commitMessage
-    });
+    const newDeployment = await this.createDeployment(user.id,
+      octokit,
+      {
+        project: oldDeployment.project,
+        // TODO: Put isCurrent field in project
+        branch: oldDeployment.branch,
+        environment: Environment.Production,
+        domain: oldDeployment.domain,
+        commitHash: oldDeployment.commitHash,
+        commitMessage: oldDeployment.commitMessage
+      });
 
     return newDeployment;
   }
 
-  async rollbackDeployment (
-    projectId: string,
-    deploymentId: string
-  ): Promise<boolean> {
+  async rollbackDeployment (projectId: string, deploymentId: string): Promise<boolean> {
     // TODO: Implement transactions
     const oldCurrentDeployment = await this.db.getDeployment({
       relations: {
@@ -668,25 +602,16 @@ export class Service {
       throw new Error('Current deployment doesnot exist');
     }
 
-    const oldCurrentDeploymentUpdate = await this.db.updateDeploymentById(
-      oldCurrentDeployment.id,
-      { isCurrent: false, domain: null }
-    );
+    const oldCurrentDeploymentUpdate = await this.db.updateDeploymentById(oldCurrentDeployment.id, { isCurrent: false, domain: null });
 
-    const newCurrentDeploymentUpdate = await this.db.updateDeploymentById(
-      deploymentId,
-      { isCurrent: true, domain: oldCurrentDeployment?.domain }
-    );
+    const newCurrentDeploymentUpdate = await this.db.updateDeploymentById(deploymentId, { isCurrent: true, domain: oldCurrentDeployment?.domain });
 
     return newCurrentDeploymentUpdate && oldCurrentDeploymentUpdate;
   }
 
-  async addDomain (
-    projectId: string,
-    data: { name: string }
-  ): Promise<{
-    primaryDomain: Domain;
-    redirectedDomain: Domain;
+  async addDomain (projectId: string, data: { name: string }): Promise<{
+    primaryDomain: Domain,
+    redirectedDomain: Domain
   }> {
     const currentProject = await this.db.getProjectById(projectId);
 
@@ -711,20 +636,12 @@ export class Service {
       redirectTo: savedPrimaryDomain
     };
 
-    const savedRedirectedDomain = await this.db.addDomain(
-      redirectedDomainDetails
-    );
+    const savedRedirectedDomain = await this.db.addDomain(redirectedDomainDetails);
 
-    return {
-      primaryDomain: savedPrimaryDomain,
-      redirectedDomain: savedRedirectedDomain
-    };
+    return { primaryDomain: savedPrimaryDomain, redirectedDomain: savedRedirectedDomain };
   }
 
-  async updateDomain (
-    domainId: string,
-    data: DeepPartial<Domain>
-  ): Promise<boolean> {
+  async updateDomain (domainId: string, data: DeepPartial<Domain>): Promise<boolean> {
     const domain = await this.db.getDomain({
       where: {
         id: domainId
@@ -765,9 +682,7 @@ export class Service {
       }
 
       if (redirectedDomain.redirectToId) {
-        throw new Error(
-          'Unable to redirect to the domain because it is already redirecting elsewhere. Redirects cannot be chained.'
-        );
+        throw new Error('Unable to redirect to the domain because it is already redirecting elsewhere. Redirects cannot be chained.');
       }
 
       newDomain.redirectTo = redirectedDomain;
@@ -778,25 +693,59 @@ export class Service {
     return updateResult;
   }
 
-  async authenticateGitHub (
-    code: string,
-    userId: string
-  ): Promise<{ token: string }> {
-    const {
-      authentication: { token }
-    } = await this.oauthApp.createToken({
+  async authenticateGitHub (code:string, user: User): Promise<{token: string}> {
+    const { authentication: { token } } = await this.oauthApp.createToken({
       code
     });
 
-    await this.db.updateUser(userId, { gitHubToken: token });
+    await this.db.updateUser(user, { gitHubToken: token });
 
     return { token };
   }
 
-  async unauthenticateGitHub (
-    userId: string,
-    data: DeepPartial<User>
-  ): Promise<boolean> {
-    return this.db.updateUser(userId, data);
+  async authenticateGit (type: GitType, code:string, user: User): Promise<{token: string}> {
+    let token: string;
+
+    switch (type) {
+      case GitType.GitHub:
+        ({ authentication: { token } } = await this.oauthApp.createToken({
+          code
+        }));
+
+        break;
+
+      case GitType.Gitea: {
+        const response = await fetch(GITEA_ACCESS_TOKEN_ENDPOINT, {
+          method: 'post',
+          body: JSON.stringify({
+            // TODO: Fetch from config
+            client_id: '',
+            client_secret: '',
+            code,
+            grant_type: 'authorization_code',
+            // TODO: Get frontend app URL from config
+            redirect_uri: 'http://localhost:3000/organization/projects/create'
+          }),
+          headers: { 'Content-Type': 'application/json' }
+        });
+
+        assert(response.ok, `HTTP Error Response: ${response.status} ${response.statusText}`);
+        const data: any = await response.json();
+        ({ access_token: token } = data);
+
+        break;
+      }
+
+      default: throw new Error(`Type ${type} not handled for Git authentication`);
+    }
+
+    assert(token, `Access token is not set for type ${type}`);
+    await this.db.updateUser(user, { gitHubToken: token });
+
+    return { token };
+  }
+
+  async unauthenticateGitHub (user: User, data: DeepPartial<User>): Promise<boolean> {
+    return this.db.updateUser(user, data);
   }
 }

packages/backend/src/types.ts

@@ -47,5 +47,10 @@ interface RegistryRecord {
 }
 
 export interface AppDeploymentRecord extends RegistryRecord {
-  attributes: AppDeploymentRecordAttributes;
+  attributes: AppDeploymentRecordAttributes
+}
+
+export enum GitType {
+  GitHub = 'GitHub',
+  Gitea = 'Gitea',
 }

packages/backend/src/utils.ts

@@ -37,15 +37,10 @@ export const getEntities = async (filePath: string): Promise<any> => {
   return entities;
 };
 
-export const loadAndSaveData = async <Entity extends ObjectLiteral>(
-  entityType: EntityTarget<Entity>,
-  dataSource: DataSource,
-  entities: any,
-  relations?: any | undefined
-): Promise<Entity[]> => {
+export const loadAndSaveData = async <Entity extends ObjectLiteral>(entityType: EntityTarget<Entity>, dataSource: DataSource, entities: any, relations?: any | undefined): Promise<Entity[]> => {
   const entityRepository = dataSource.getRepository(entityType);
 
-  const savedEntity: Entity[] = [];
+  const savedEntity:Entity[] = [];
 
   for (const entityData of entities) {
     let entity = entityRepository.create(entityData as DeepPartial<Entity>);

packages/backend/test/delete-db.ts

@@ -18,4 +18,4 @@ const main = async () => {
   deleteFile(config.database.dbPath);
 };
 
-main().catch((err) => log(err));
+main().catch(err => log(err));

packages/backend/test/fixtures/deployments.json

@@ -1,9 +1,9 @@
 [
   {
     "projectIndex": 0,
-    "domainIndex": 0,
+    "domainIndex":0,
     "createdByIndex": 0,
-    "id": "ffhae3zq",
+    "id":"ffhae3zq",
     "status": "Ready",
     "environment": "Production",
     "isCurrent": true,
@@ -18,9 +18,9 @@
   },
   {
     "projectIndex": 0,
-    "domainIndex": 1,
+    "domainIndex":1,
     "createdByIndex": 0,
-    "id": "vehagei8",
+    "id":"vehagei8",
     "status": "Ready",
     "environment": "Preview",
     "isCurrent": false,
@@ -35,9 +35,9 @@
   },
   {
     "projectIndex": 0,
-    "domainIndex": 2,
+    "domainIndex":2,
     "createdByIndex": 0,
-    "id": "qmgekyte",
+    "id":"qmgekyte",
     "status": "Ready",
     "environment": "Development",
     "isCurrent": false,
@@ -54,7 +54,7 @@
     "projectIndex": 0,
     "domainIndex": null,
     "createdByIndex": 0,
-    "id": "f8wsyim6",
+    "id":"f8wsyim6",
     "status": "Ready",
     "environment": "Production",
     "isCurrent": false,
@@ -69,9 +69,9 @@
   },
   {
     "projectIndex": 1,
-    "domainIndex": 3,
+    "domainIndex":3,
     "createdByIndex": 1,
-    "id": "eO8cckxk",
+    "id":"eO8cckxk",
     "status": "Ready",
     "environment": "Production",
     "isCurrent": true,
@@ -86,9 +86,9 @@
   },
   {
     "projectIndex": 1,
-    "domainIndex": 4,
+    "domainIndex":4,
     "createdByIndex": 1,
-    "id": "yaq0t5yw",
+    "id":"yaq0t5yw",
     "status": "Ready",
     "environment": "Preview",
     "isCurrent": false,
@@ -103,9 +103,9 @@
   },
   {
     "projectIndex": 1,
-    "domainIndex": 5,
+    "domainIndex":5,
     "createdByIndex": 1,
-    "id": "hwwr6sbx",
+    "id":"hwwr6sbx",
     "status": "Ready",
     "environment": "Development",
     "isCurrent": false,
@@ -120,9 +120,9 @@
   },
   {
     "projectIndex": 2,
-    "domainIndex": 9,
+    "domainIndex":9,
     "createdByIndex": 2,
-    "id": "ndxje48a",
+    "id":"ndxje48a",
     "status": "Ready",
     "environment": "Production",
     "isCurrent": true,
@@ -137,9 +137,9 @@
   },
   {
     "projectIndex": 2,
-    "domainIndex": 7,
+    "domainIndex":7,
     "createdByIndex": 2,
-    "id": "gtgpgvei",
+    "id":"gtgpgvei",
     "status": "Ready",
     "environment": "Preview",
     "isCurrent": false,
@@ -154,9 +154,9 @@
   },
   {
     "projectIndex": 2,
-    "domainIndex": 8,
+    "domainIndex":8,
     "createdByIndex": 2,
-    "id": "b4bpthjr",
+    "id":"b4bpthjr",
     "status": "Ready",
     "environment": "Development",
     "isCurrent": false,
@@ -173,7 +173,7 @@
     "projectIndex": 3,
     "domainIndex": 6,
     "createdByIndex": 2,
-    "id": "b4bpthjr",
+    "id":"b4bpthjr",
     "status": "Ready",
     "environment": "Production",
     "isCurrent": true,

packages/backend/test/fixtures/project-members.json

@@ -2,55 +2,77 @@
   {
     "memberIndex": 1,
     "projectIndex": 0,
-    "permissions": ["View"],
+    "permissions": [
+      "View"
+    ],
     "isPending": false
   },
   {
     "memberIndex": 2,
     "projectIndex": 0,
-    "permissions": ["View", "Edit"],
+    "permissions": [
+      "View",
+      "Edit"
+    ],
     "isPending": false
   },
   {
     "memberIndex": 2,
     "projectIndex": 1,
-    "permissions": ["View"],
+    "permissions": [
+      "View"
+    ],
     "isPending": false
   },
   {
     "memberIndex": 0,
     "projectIndex": 2,
-    "permissions": ["View"],
+    "permissions": [
+      "View"
+    ],
     "isPending": false
   },
   {
     "memberIndex": 1,
     "projectIndex": 2,
-    "permissions": ["View", "Edit"],
+    "permissions": [
+      "View",
+      "Edit"
+    ],
     "isPending": false
   },
   {
     "memberIndex": 0,
     "projectIndex": 3,
-    "permissions": ["View"],
+    "permissions": [
+      "View"
+    ],
     "isPending": false
   },
   {
     "memberIndex": 2,
     "projectIndex": 3,
-    "permissions": ["View", "Edit"],
+    "permissions": [
+      "View",
+      "Edit"
+    ],
     "isPending": false
   },
   {
     "memberIndex": 1,
     "projectIndex": 4,
-    "permissions": ["View"],
+    "permissions": [
+      "View"
+    ],
     "isPending": false
   },
   {
     "memberIndex": 2,
     "projectIndex": 4,
-    "permissions": ["View", "Edit"],
+    "permissions": [
+      "View",
+      "Edit"
+    ],
     "isPending": false
   }
 ]

packages/backend/test/fixtures/users.json

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

packages/backend/test/initialize-db.ts

@@ -10,12 +10,7 @@ import { EnvironmentVariable } from '../src/entity/EnvironmentVariable';
 import { Domain } from '../src/entity/Domain';
 import { ProjectMember } from '../src/entity/ProjectMember';
 import { Deployment } from '../src/entity/Deployment';
-import {
-  checkFileExists,
-  getConfig,
-  getEntities,
-  loadAndSaveData
-} from '../src/utils';
+import { checkFileExists, getConfig, getEntities, loadAndSaveData } from '../src/utils';
 import { Config } from '../src/config';
 import { DEFAULT_CONFIG_FILE_PATH } from '../src/constants';
 
@@ -32,34 +27,19 @@ const ENVIRONMENT_VARIABLE_DATA_PATH = './fixtures/environment-variables.json';
 const REDIRECTED_DOMAIN_DATA_PATH = './fixtures/redirected-domains.json';
 
 const generateTestData = async (dataSource: DataSource) => {
-  const userEntities = await getEntities(
-    path.resolve(__dirname, USER_DATA_PATH)
-  );
+  const userEntities = await getEntities(path.resolve(__dirname, USER_DATA_PATH));
   const savedUsers = await loadAndSaveData(User, dataSource, userEntities);
 
-  const orgEntities = await getEntities(
-    path.resolve(__dirname, ORGANIZATION_DATA_PATH)
-  );
-  const savedOrgs = await loadAndSaveData(
-    Organization,
-    dataSource,
-    orgEntities
-  );
+  const orgEntities = await getEntities(path.resolve(__dirname, ORGANIZATION_DATA_PATH));
+  const savedOrgs = await loadAndSaveData(Organization, dataSource, orgEntities);
 
   const projectRelations = {
     owner: savedUsers,
     organization: savedOrgs
   };
 
-  const projectEntities = await getEntities(
-    path.resolve(__dirname, PROJECT_DATA_PATH)
-  );
-  const savedProjects = await loadAndSaveData(
-    Project,
-    dataSource,
-    projectEntities,
-    projectRelations
-  );
+  const projectEntities = await getEntities(path.resolve(__dirname, PROJECT_DATA_PATH));
+  const savedProjects = await loadAndSaveData(Project, dataSource, projectEntities, projectRelations);
 
   const domainRepository = dataSource.getRepository(Domain);
 
@@ -67,30 +47,16 @@ const generateTestData = async (dataSource: DataSource) => {
     project: savedProjects
   };
 
-  const primaryDomainsEntities = await getEntities(
-    path.resolve(__dirname, PRIMARY_DOMAIN_DATA_PATH)
-  );
-  const savedPrimaryDomains = await loadAndSaveData(
-    Domain,
-    dataSource,
-    primaryDomainsEntities,
-    domainPrimaryRelations
-  );
+  const primaryDomainsEntities = await getEntities(path.resolve(__dirname, PRIMARY_DOMAIN_DATA_PATH));
+  const savedPrimaryDomains = await loadAndSaveData(Domain, dataSource, primaryDomainsEntities, domainPrimaryRelations);
 
   const domainRedirectedRelations = {
     project: savedProjects,
     redirectTo: savedPrimaryDomains
   };
 
-  const redirectDomainsEntities = await getEntities(
-    path.resolve(__dirname, REDIRECTED_DOMAIN_DATA_PATH)
-  );
-  await loadAndSaveData(
-    Domain,
-    dataSource,
-    redirectDomainsEntities,
-    domainRedirectedRelations
-  );
+  const redirectDomainsEntities = await getEntities(path.resolve(__dirname, REDIRECTED_DOMAIN_DATA_PATH));
+  await loadAndSaveData(Domain, dataSource, redirectDomainsEntities, domainRedirectedRelations);
 
   const savedDomains = await domainRepository.find();
 
@@ -99,30 +65,16 @@ const generateTestData = async (dataSource: DataSource) => {
     organization: savedOrgs
   };
 
-  const userOrganizationsEntities = await getEntities(
-    path.resolve(__dirname, USER_ORGANIZATION_DATA_PATH)
-  );
-  await loadAndSaveData(
-    UserOrganization,
-    dataSource,
-    userOrganizationsEntities,
-    userOrganizationRelations
-  );
+  const userOrganizationsEntities = await getEntities(path.resolve(__dirname, USER_ORGANIZATION_DATA_PATH));
+  await loadAndSaveData(UserOrganization, dataSource, userOrganizationsEntities, userOrganizationRelations);
 
   const projectMemberRelations = {
     member: savedUsers,
     project: savedProjects
   };
 
-  const projectMembersEntities = await getEntities(
-    path.resolve(__dirname, PROJECT_MEMBER_DATA_PATH)
-  );
-  await loadAndSaveData(
-    ProjectMember,
-    dataSource,
-    projectMembersEntities,
-    projectMemberRelations
-  );
+  const projectMembersEntities = await getEntities(path.resolve(__dirname, PROJECT_MEMBER_DATA_PATH));
+  await loadAndSaveData(ProjectMember, dataSource, projectMembersEntities, projectMemberRelations);
 
   const deploymentRelations = {
     project: savedProjects,
@@ -130,29 +82,15 @@ const generateTestData = async (dataSource: DataSource) => {
     createdBy: savedUsers
   };
 
-  const deploymentsEntities = await getEntities(
-    path.resolve(__dirname, DEPLOYMENT_DATA_PATH)
-  );
-  await loadAndSaveData(
-    Deployment,
-    dataSource,
-    deploymentsEntities,
-    deploymentRelations
-  );
+  const deploymentsEntities = await getEntities(path.resolve(__dirname, DEPLOYMENT_DATA_PATH));
+  await loadAndSaveData(Deployment, dataSource, deploymentsEntities, deploymentRelations);
 
   const environmentVariableRelations = {
     project: savedProjects
   };
 
-  const environmentVariablesEntities = await getEntities(
-    path.resolve(__dirname, ENVIRONMENT_VARIABLE_DATA_PATH)
-  );
-  await loadAndSaveData(
-    EnvironmentVariable,
-    dataSource,
-    environmentVariablesEntities,
-    environmentVariableRelations
-  );
+  const environmentVariablesEntities = await getEntities(path.resolve(__dirname, ENVIRONMENT_VARIABLE_DATA_PATH));
+  await loadAndSaveData(EnvironmentVariable, dataSource, environmentVariablesEntities, environmentVariableRelations);
 };
 
 const main = async () => {

packages/backend/test/initialize-registry.ts

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

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

@@ -5,22 +5,16 @@ import path from 'path';
 import { Registry } from '@cerc-io/laconic-sdk';
 
 import { Config } from '../src/config';
-import { DEFAULT_CONFIG_FILE_PATH, PROJECT_DOMAIN } from '../src/constants';
+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-deploy-records');
 
 async function main () {
-  const { registryConfig, database } = await getConfig<Config>(
-    DEFAULT_CONFIG_FILE_PATH
-  );
+  const { registryConfig, database, misc } = await getConfig<Config>(DEFAULT_CONFIG_FILE_PATH);
 
-  const registry = new Registry(
-    registryConfig.gqlEndpoint,
-    registryConfig.restEndpoint,
-    registryConfig.chainId
-  );
+  const registry = new Registry(registryConfig.gqlEndpoint, registryConfig.restEndpoint, registryConfig.chainId);
 
   const dataSource = new DataSource({
     type: 'better-sqlite3',
@@ -42,7 +36,7 @@ async function main () {
   });
 
   for await (const deployment of deployments) {
-    const url = `${deployment.project.name}-${deployment.id}.${PROJECT_DOMAIN}`;
+    const url = `${deployment.project.name}-${deployment.id}.${misc.projectDomain}`;
 
     const applicationDeploymentRecord = {
       type: 'ApplicationDeploymentRecord',

packages/frontend/.env

@@ -1,4 +1,8 @@
-REACT_APP_GQL_SERVER_URL = 'http://localhost:8000/graphql'
+REACT_APP_SERVER_URL = 'http://localhost:8000'
 
 REACT_APP_GITHUB_CLIENT_ID =
 REACT_APP_GITHUB_TEMPLATE_REPO =
+
+REACT_APP_GITEA_CLIENT_ID =
+
+REACT_APP_WALLET_CONNECT_ID =

packages/frontend/.vscode/settings.json

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

packages/frontend/logo.svg

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

packages/frontend/package.json

@@ -3,14 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@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-switch": "^1.0.3",
-    "@radix-ui/react-radio-group": "^1.1.3",
-    "@radix-ui/react-tabs": "^1.0.4",
-    "@radix-ui/react-tooltip": "^1.0.7",
+    "@tanstack/react-query": "^5.22.2",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
@@ -18,16 +12,17 @@
     "@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",
-    "clsx": "^2.1.0",
-    "date-fns": "^3.3.1",
+    "axios": "^1.6.7",
+    "date-fns": "^3.0.1",
     "downshift": "^8.2.3",
     "eslint-config-react-app": "^7.0.1",
     "gql-client": "^1.0.0",
     "luxon": "^3.4.4",
     "octokit": "^3.1.2",
     "react": "^18.2.0",
-    "react-calendar": "^4.8.0",
     "react-code-blocks": "^0.1.6",
     "react-day-picker": "^8.9.1",
     "react-dom": "^18.2.0",
@@ -38,10 +33,12 @@
     "react-router-dom": "^6.20.1",
     "react-scripts": "5.0.1",
     "react-timer-hook": "^3.0.7",
-    "tailwind-variants": "^0.2.0",
+    "siwe": "^2.1.4",
     "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": {
@@ -81,6 +78,6 @@
     "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-react": "^7.33.2",
     "prettier": "^3.1.0",
-    "tailwindcss": "^3.4.1"
+    "tailwindcss": "^3.3.6"
   }
 }

packages/frontend/public/browserconfig.xml

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

packages/frontend/public/index.html

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

packages/frontend/public/site.webmanifest

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

packages/frontend/src/App.tsx

@@ -9,8 +9,8 @@ import {
   projectsRoutesWithoutSearch,
 } from './pages/org-slug/projects/routes';
 import ProjectSearchLayout from './layouts/ProjectSearch';
-import { OctokitProvider } from './context/OctokitContext';
 import Index from './pages';
+import Login from './pages/Login';
 
 const router = createBrowserRouter([
   {
@@ -44,14 +44,14 @@ const router = createBrowserRouter([
     path: '/',
     element: <Index />,
   },
+  {
+    path: '/login',
+    element: <Login />,
+  },
 ]);
 
 function App() {
-  return (
-    <OctokitProvider>
-      <RouterProvider router={router} />
-    </OctokitProvider>
-  );
+  return <RouterProvider router={router} />;
 }
 
 export default App;

packages/frontend/src/components/Sidebar.tsx

@@ -3,6 +3,7 @@ import { Link, NavLink, useNavigate, useParams } from 'react-router-dom';
 import { Organization } from 'gql-client';
 
 import { Typography, Option } from '@material-tailwind/react';
+import { useDisconnect } from 'wagmi';
 
 import { useGQLClient } from '../context/GQLClientContext';
 import AsyncSelect from './shared/AsyncSelect';
@@ -11,6 +12,7 @@ const Sidebar = () => {
   const { orgSlug } = useParams();
   const navigate = useNavigate();
   const client = useGQLClient();
+  const { disconnect } = useDisconnect();
 
   const [selectedOrgSlug, setSelectedOrgSlug] = useState(orgSlug);
   const [organizations, setOrganizations] = useState<Organization[]>([]);
@@ -25,6 +27,11 @@ const Sidebar = () => {
     setSelectedOrgSlug(orgSlug);
   }, [orgSlug]);
 
+  const handleLogOut = useCallback(() => {
+    disconnect();
+    navigate('/login');
+  }, [disconnect, navigate]);
+
   return (
     <div className="flex flex-col h-full p-4">
       <div className="grow">
@@ -76,8 +83,11 @@ const Sidebar = () => {
         </div>
       </div>
       <div className="grow flex flex-col justify-end">
-        <div>Documentation</div>
-        <div>Support</div>
+        <a className="cursor-pointer" onClick={handleLogOut}>
+          Log Out
+        </a>
+        <a className="cursor-pointer">Documentation</a>
+        <a className="cursor-pointer">Support</a>
       </div>
     </div>
   );

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

@@ -1,15 +1,21 @@
-import { Button } from '@material-tailwind/react';
 import React from 'react';
 import OauthPopup from 'react-oauth-popup';
+import { GitType } from 'gql-client';
+
+import { Button } from '@material-tailwind/react';
 
 import { useGQLClient } from '../../../context/GQLClientContext';
 import ConnectAccountTabPanel from './ConnectAccountTabPanel';
 
 const SCOPES = 'repo user';
+
 const GITHUB_OAUTH_URL = `https://github.com/login/oauth/authorize?client_id=${
   process.env.REACT_APP_GITHUB_CLIENT_ID
 }&scope=${encodeURIComponent(SCOPES)}`;
 
+const REDIRECT_URI = `${window.location.origin}/organization/projects/create`;
+const GITEA_OAUTH_URL = `https://git.vdb.to/login/oauth/authorize?client_id=${process.env.REACT_APP_GITEA_CLIENT_ID}&redirect_uri=${REDIRECT_URI}&response_type=code`;
+
 interface ConnectAccountInterface {
   onAuth: (token: string) => void;
 }
@@ -17,11 +23,13 @@ interface ConnectAccountInterface {
 const ConnectAccount = ({ onAuth: onToken }: ConnectAccountInterface) => {
   const client = useGQLClient();
 
-  const handleCode = async (code: string) => {
+  const handleCode = async (type: GitType, code: string) => {
     // Pass code to backend and get access token
     const {
-      authenticateGitHub: { token },
-    } = await client.authenticateGitHub(code);
+      authenticateGit: { token },
+    } = await client.authenticateGit(type, code);
+
+    // TODO: Handle token according to Git type
     onToken(token);
   };
 
@@ -40,7 +48,7 @@ const ConnectAccount = ({ onAuth: onToken }: ConnectAccountInterface) => {
       <div className="mt-2 flex">
         <OauthPopup
           url={GITHUB_OAUTH_URL}
-          onCode={handleCode}
+          onCode={(code) => handleCode(GitType.GitHub, code)}
           onClose={() => {}}
           title="Snowball"
           width={1000}
@@ -48,7 +56,16 @@ const ConnectAccount = ({ onAuth: onToken }: ConnectAccountInterface) => {
         >
           <Button className="rounded-full mx-2">Connect to Github</Button>
         </OauthPopup>
-        <Button className="rounded-full mx-2">Connect to Gitea</Button>
+        <OauthPopup
+          url={GITEA_OAUTH_URL}
+          onCode={(code) => handleCode(GitType.Gitea, code)}
+          onClose={() => {}}
+          title="Snowball"
+          width={1000}
+          height={1000}
+        >
+          <Button className="rounded-full mx-2">Connect to Gitea</Button>
+        </OauthPopup>
       </div>
       <ConnectAccountTabPanel />
     </div>

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

@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
 
 import { Button, Typography } from '@material-tailwind/react';
@@ -7,6 +7,7 @@ import { DeployStep, DeployStatus } from './DeployStep';
 import { Stopwatch, setStopWatchOffset } from '../../StopWatch';
 import ConfirmDialog from '../../shared/ConfirmDialog';
 
+const INTERVAL_DURATION = 5000;
 const Deploy = () => {
   const [searchParams] = useSearchParams();
   const projectId = searchParams.get('projectId');
@@ -21,6 +22,14 @@ const Deploy = () => {
     navigate(`/${orgSlug}/projects/create`);
   }, []);
 
+  useEffect(() => {
+    const timerID = setTimeout(() => {
+      navigate(`/${orgSlug}/projects/create/success/${projectId}`);
+    }, INTERVAL_DURATION);
+
+    return () => clearInterval(timerID);
+  }, []);
+
   return (
     <div>
       <div className="flex justify-between mb-6">
@@ -74,14 +83,6 @@ const Deploy = () => {
         status={DeployStatus.NOT_STARTED}
         step="4"
       />
-
-      <Button
-        onClick={() => {
-          navigate(`/${orgSlug}/projects/create/success/${projectId}`);
-        }}
-      >
-        VIEW DEMO
-      </Button>
     </div>
   );
 };

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

@@ -1,7 +1,8 @@
 import React, { useCallback } from 'react';
+import toast from 'react-hot-toast';
 import { useNavigate, useParams } from 'react-router-dom';
 
-import { Chip, IconButton } from '@material-tailwind/react';
+import { Chip, IconButton, Spinner } from '@material-tailwind/react';
 
 import { relativeTimeISO } from '../../../utils/time';
 import { GitRepositoryDetails } from '../../../types';
@@ -14,6 +15,7 @@ interface ProjectRepoCardProps {
 const ProjectRepoCard: React.FC<ProjectRepoCardProps> = ({ repository }) => {
   const client = useGQLClient();
   const navigate = useNavigate();
+  const [isLoading, setIsLoading] = React.useState(false);
 
   const { orgSlug } = useParams();
 
@@ -22,6 +24,7 @@ const ProjectRepoCard: React.FC<ProjectRepoCardProps> = ({ repository }) => {
       return;
     }
 
+    setIsLoading(true);
     const { addProject } = await client.addProject(orgSlug!, {
       name: `${repository.owner!.login}-${repository.name}`,
       prodBranch: repository.default_branch!,
@@ -30,7 +33,13 @@ const ProjectRepoCard: React.FC<ProjectRepoCardProps> = ({ repository }) => {
       template: 'webapp',
     });
 
-    navigate(`import?projectId=${addProject.id}`);
+    if (Boolean(addProject)) {
+      setIsLoading(false);
+      navigate(`import?projectId=${addProject.id}`);
+    } else {
+      setIsLoading(false);
+      toast.error('Failed to create project');
+    }
   }, [client, repository]);
 
   return (
@@ -53,9 +62,13 @@ const ProjectRepoCard: React.FC<ProjectRepoCardProps> = ({ repository }) => {
         </div>
         <p>{repository.updated_at && relativeTimeISO(repository.updated_at)}</p>
       </div>
-      <div className="hidden group-hover:block">
-        <IconButton size="sm">{'>'}</IconButton>
-      </div>
+      {isLoading ? (
+        <Spinner className="h-4 w-4" />
+      ) : (
+        <div className="hidden group-hover:block">
+          <IconButton size="sm">{'>'}</IconButton>
+        </div>
+      )}
     </div>
   );
 };

packages/frontend/src/components/projects/project/ActivityCard.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Typography, IconButton } from '@material-tailwind/react';
+import { Typography, IconButton, Avatar } from '@material-tailwind/react';
 
 import { relativeTimeISO } from '../../../utils/time';
 import { GitCommitWithBranch } from '../../../types';
@@ -11,9 +11,10 @@ interface ActivityCardProps {
 
 const ActivityCard = ({ activity }: ActivityCardProps) => {
   return (
-    <div className="group flex hover:bg-gray-200 rounded mt-1">
-      <div className="w-4">^</div>
-
+    <div className="group flex gap-2 hover:bg-gray-200 rounded mt-1">
+      <div className="w-8">
+        <Avatar src={activity.author?.avatar_url} variant="rounded" size="sm" />
+      </div>
       <div className="grow">
         <Typography>{activity.commit.author?.name}</Typography>
         <Typography variant="small" color="gray">

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

@@ -16,6 +16,7 @@ import {
   Typography,
   Chip,
   ChipProps,
+  Tooltip,
 } from '@material-tailwind/react';
 
 import { relativeTimeMs } from '../../../../utils/time';
@@ -24,6 +25,7 @@ import DeploymentDialogBodyCard from './DeploymentDialogBodyCard';
 import AssignDomainDialog from './AssignDomainDialog';
 import { useGQLClient } from '../../../../context/GQLClientContext';
 import { SHORT_COMMIT_HASH_LENGTH } from '../../../../constants';
+import { formatAddress } from '../../../../utils/format';
 
 interface DeployDetailsCardProps {
   deployment: Deployment;
@@ -87,18 +89,12 @@ const DeploymentDetailsCard = ({
   };
 
   return (
-    <div className="grid grid-cols-4 gap-2 border-b border-gray-300 p-3 my-2">
-      <div className="col-span-2">
+    <div className="grid grid-cols-8 gap-2 border-b border-gray-300 p-3 my-2">
+      <div className="col-span-3">
         <div className="flex">
           {deployment.url && (
             <Typography className=" basis-3/4">{deployment.url}</Typography>
           )}
-          <Chip
-            value={deployment.status}
-            color={STATUS_COLORS[deployment.status] ?? 'gray'}
-            variant="ghost"
-            icon={<i>^</i>}
-          />
         </div>
         <Typography color="gray">
           {deployment.environment === Environment.Production
@@ -107,15 +103,26 @@ const DeploymentDetailsCard = ({
         </Typography>
       </div>
       <div className="col-span-1">
+        <Chip
+          value={deployment.status}
+          color={STATUS_COLORS[deployment.status] ?? 'gray'}
+          variant="ghost"
+          icon={<i>^</i>}
+        />
+      </div>
+      <div className="col-span-2">
         <Typography color="gray">^ {deployment.branch}</Typography>
         <Typography color="gray">
           ^ {deployment.commitHash.substring(0, SHORT_COMMIT_HASH_LENGTH)}{' '}
           {deployment.commitMessage}
         </Typography>
       </div>
-      <div className="col-span-1 flex items-center">
+      <div className="col-span-2 flex items-center">
         <Typography color="gray" className="grow">
-          ^ {relativeTimeMs(deployment.createdAt)} ^ {deployment.createdBy.name}
+          ^ {relativeTimeMs(deployment.createdAt)} ^{' '}
+          <Tooltip content={deployment.createdBy.name}>
+            {formatAddress(deployment.createdBy.name ?? '')}
+          </Tooltip>
         </Typography>
         <Menu placement="bottom-start">
           <MenuHandler>

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

@@ -5,6 +5,7 @@ import { Typography, Chip, Card } from '@material-tailwind/react';
 import { color } from '@material-tailwind/react/types/components/chip';
 import { relativeTimeMs } from '../../../../utils/time';
 import { SHORT_COMMIT_HASH_LENGTH } from '../../../../constants';
+import { formatAddress } from '../../../../utils/format';
 
 interface DeploymentDialogBodyCardProps {
   deployment: Deployment;
@@ -39,7 +40,8 @@ const DeploymentDialogBodyCard = ({
         {deployment.commitMessage}
       </Typography>
       <Typography variant="small">
-        ^ {relativeTimeMs(deployment.createdAt)} ^ {deployment.createdBy.name}
+        ^ {relativeTimeMs(deployment.createdAt)} ^{' '}
+        {formatAddress(deployment.createdBy.name ?? '')}
       </Typography>
     </Card>
   );

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

@@ -44,18 +44,18 @@ const FilterForm = ({ value, onChange }: FilterFormProps) => {
   }, [value]);
 
   return (
-    <div className="grid grid-cols-4 gap-2 text-sm text-gray-600">
-      <div className="col-span-2">
+    <div className="grid grid-cols-8 gap-2 text-sm text-gray-600">
+      <div className="col-span-4">
         <SearchBar
           placeholder="Search branches"
           value={searchedBranch}
           onChange={(event) => setSearchedBranch(event.target.value)}
         />
       </div>
-      <div className="col-span-1">
+      <div className="col-span-2">
         <DatePicker mode="range" selected={dateRange} onSelect={setDateRange} />
       </div>
-      <div className="col-span-1 relative">
+      <div className="col-span-2 relative">
         <Select
           value={selectedStatus}
           onChange={(value) => setSelectedStatus(value as StatusOptions)}

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

@@ -1,8 +1,9 @@
 import React, { useState } from 'react';
 import { Card, Collapse, Typography } from '@material-tailwind/react';
 
+import { Environment, EnvironmentVariable } from 'gql-client/dist/src/types';
+
 import EditEnvironmentVariableRow from './EditEnvironmentVariableRow';
-import { Environment, EnvironmentVariable } from 'gql-client';
 
 interface DisplayEnvironmentVariablesProps {
   environment: Environment;

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

@@ -7,9 +7,11 @@ import {
   Option,
   Chip,
   IconButton,
+  Tooltip,
 } from '@material-tailwind/react';
 
 import ConfirmDialog from '../../../shared/ConfirmDialog';
+import { formatAddress } from '../../../../utils/format';
 
 const PERMISSION_OPTIONS = [
   {
@@ -48,6 +50,7 @@ const MemberCard = ({
   onRemoveProjectMember,
   onUpdateProjectMember,
 }: MemberCardProps) => {
+  const [ethAddress, emailDomain] = member.email.split('@');
   const [selectedPermission, setSelectedPermission] = useState(
     permissions.join('+'),
   );
@@ -79,8 +82,16 @@ const MemberCard = ({
     >
       <div>^</div>
       <div className="basis-1/2">
-        {member.name && <Typography variant="small">{member.name}</Typography>}
-        <Typography variant="small">{member.email}</Typography>
+        {member.name && (
+          <Tooltip content={member.name}>
+            {formatAddress(member.name ?? '')}
+          </Tooltip>
+        )}
+        <Tooltip content={member.email}>
+          <p>
+            {formatAddress(ethAddress)}@{emailDomain}
+          </p>
+        </Tooltip>
       </div>
       <div className="basis-1/2">
         {!isPending ? (
@@ -142,8 +153,9 @@ const MemberCard = ({
         color="red"
       >
         <Typography variant="small">
-          Once removed, {member.name} ({member.email}) will not be able to
-          access this project.
+          Once removed, {formatAddress(member.name ?? '')} (
+          {formatAddress(ethAddress)}@{emailDomain}) will not be able to access
+          this project.
         </Typography>
       </ConfirmDialog>
     </div>

packages/frontend/src/components/shared/Avatar/Avatar.theme.ts

@@ -1,71 +0,0 @@
-import { tv, type VariantProps } from 'tailwind-variants';
-
-export const avatarTheme = tv(
-  {
-    base: ['relative', 'block', 'rounded-full', 'overflow-hidden'],
-    slots: {
-      image: [
-        'h-full',
-        'w-full',
-        'rounded-[inherit]',
-        'object-cover',
-        'object-center',
-      ],
-      fallback: [
-        'grid',
-        'select-none',
-        'place-content-center',
-        'h-full',
-        'w-full',
-        'rounded-[inherit]',
-        'font-medium',
-      ],
-    },
-    variants: {
-      type: {
-        gray: {
-          fallback: ['text-elements-highEm', 'bg-base-bg-emphasized'],
-        },
-        orange: {
-          fallback: ['text-elements-warning', 'bg-base-bg-emphasized-warning'],
-        },
-        blue: {
-          fallback: ['text-elements-info', 'bg-base-bg-emphasized-info'],
-        },
-      },
-      size: {
-        18: {
-          base: ['rounded-md', 'h-[18px]', 'w-[18px]', 'text-[0.625rem]'],
-        },
-        20: {
-          base: ['rounded-md', 'h-5', 'w-5', 'text-[0.625rem]'],
-        },
-        24: {
-          base: ['rounded-md', 'h-6', 'w-6', 'text-[0.625rem]'],
-        },
-        28: {
-          base: ['rounded-lg', 'h-[28px]', 'w-[28px]', 'text-[0.625rem]'],
-        },
-        32: {
-          base: ['rounded-lg', 'h-8', 'w-8', 'text-xs'],
-        },
-        36: {
-          base: ['rounded-xl', 'h-[36px]', 'w-[36px]', 'text-xs'],
-        },
-        40: {
-          base: ['rounded-xl', 'h-10', 'w-10', 'text-sm'],
-        },
-        44: {
-          base: ['rounded-xl', 'h-[44px]', 'w-[44px]', 'text-sm'],
-        },
-      },
-    },
-    defaultVariants: {
-      size: 24,
-      type: 'gray',
-    },
-  },
-  { responsiveVariants: true },
-);
-
-export type AvatarVariants = VariantProps<typeof avatarTheme>;

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

@@ -1,40 +0,0 @@
-import React from 'react';
-import { type ComponentPropsWithoutRef, type ComponentProps } from 'react';
-import { avatarTheme, type AvatarVariants } from './Avatar.theme';
-import * as PrimitiveAvatar from '@radix-ui/react-avatar';
-
-export type AvatarProps = ComponentPropsWithoutRef<'div'> & {
-  imageSrc?: string | null;
-  initials?: string;
-  imageProps?: ComponentProps<typeof PrimitiveAvatar.Image>;
-  fallbackProps?: ComponentProps<typeof PrimitiveAvatar.Fallback>;
-} & AvatarVariants;
-
-export const Avatar = ({
-  className,
-  size,
-  type,
-  imageSrc,
-  imageProps,
-  fallbackProps,
-  initials,
-}: AvatarProps) => {
-  const { base, image, fallback } = avatarTheme({ size, type });
-
-  return (
-    <PrimitiveAvatar.Root className={base({ className })}>
-      {imageSrc && (
-        <PrimitiveAvatar.Image
-          {...imageProps}
-          className={image({ className: imageProps?.className })}
-          src={imageSrc}
-        />
-      )}
-      <PrimitiveAvatar.Fallback asChild {...fallbackProps}>
-        <div className={fallback({ className: fallbackProps?.className })}>
-          {initials}
-        </div>
-      </PrimitiveAvatar.Fallback>
-    </PrimitiveAvatar.Root>
-  );
-};

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

@@ -1,2 +0,0 @@
-export * from './Avatar';
-export * from './Avatar.theme';

packages/frontend/src/components/shared/Badge/Badge.theme.ts

@@ -1,43 +0,0 @@
-import { VariantProps, tv } from 'tailwind-variants';
-
-export const badgeTheme = tv({
-  slots: {
-    wrapper: ['rounded-full', 'grid', 'place-content-center'],
-  },
-  variants: {
-    variant: {
-      primary: {
-        wrapper: ['bg-controls-primary', 'text-elements-on-primary'],
-      },
-      secondary: {
-        wrapper: ['bg-controls-secondary', 'text-elements-on-secondary'],
-      },
-      tertiary: {
-        wrapper: [
-          'bg-controls-tertiary',
-          'border',
-          'border-border-interactive/10',
-          'text-elements-high-em',
-          'shadow-button',
-        ],
-      },
-      inset: {
-        wrapper: ['bg-controls-inset', 'text-elements-high-em'],
-      },
-    },
-    size: {
-      sm: {
-        wrapper: ['h-5', 'w-5', 'text-xs'],
-      },
-      xs: {
-        wrapper: ['h-4', 'w-4', 'text-2xs', 'font-medium'],
-      },
-    },
-  },
-  defaultVariants: {
-    variant: 'primary',
-    size: 'sm',
-  },
-});
-
-export type BadgeTheme = VariantProps<typeof badgeTheme>;

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

@@ -1,33 +0,0 @@
-import React from 'react';
-import { ComponentPropsWithoutRef } from 'react';
-import { BadgeTheme, badgeTheme } from './Badge.theme';
-
-export interface BadgeProps
-  extends ComponentPropsWithoutRef<'div'>,
-    BadgeTheme {}
-
-/**
- * A badge is a small status descriptor for UI elements.
- * It can be used to indicate a status, a count, or a category.
- * It is typically used in lists, tables, or navigation elements.
- *
- * @example
- * ```tsx
- * <Badge variant="primary" size="sm">1</Badge
- * ```
- */
-export const Badge = ({
-  className,
-  children,
-  variant,
-  size,
-  ...props
-}: BadgeProps) => {
-  const { wrapper } = badgeTheme();
-
-  return (
-    <div {...props} className={wrapper({ className, variant, size })}>
-      {children}
-    </div>
-  );
-};

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

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

packages/frontend/src/components/shared/Button/Button.theme.ts

@@ -1,185 +0,0 @@
-import { tv } from 'tailwind-variants';
-import type { VariantProps } from 'tailwind-variants';
-
-/**
- * Defines the theme for a button component.
- */
-export const buttonTheme = tv(
-  {
-    base: [
-      'h-fit',
-      'inline-flex',
-      'items-center',
-      'justify-center',
-      'whitespace-nowrap',
-      'focus-ring',
-      'disabled:cursor-not-allowed',
-    ],
-    variants: {
-      size: {
-        lg: ['gap-2', 'py-3.5', 'px-5', 'text-base', 'tracking-[-0.011em]'],
-        md: ['gap-2', 'py-3.25', 'px-5', 'text-sm', 'tracking-[-0.006em]'],
-        sm: ['gap-1', 'py-2', 'px-3', 'text-xs'],
-        xs: ['gap-1', 'py-1', 'px-2', 'text-xs'],
-      },
-      fullWidth: {
-        true: 'w-full',
-      },
-      shape: {
-        default: '',
-        rounded: 'rounded-full',
-      },
-      iconOnly: {
-        true: '',
-      },
-      variant: {
-        primary: [
-          'text-elements-on-primary',
-          'border',
-          'border-transparent',
-          'bg-controls-primary',
-          'shadow-button',
-          'hover:bg-controls-primary-hovered',
-          'focus-visible:bg-controls-primary-hovered',
-          'disabled:text-elements-on-disabled',
-          'disabled:bg-controls-disabled',
-          'disabled:border-transparent',
-          'disabled:shadow-none',
-        ],
-        secondary: [
-          'text-elements-on-secondary',
-          'border',
-          'border-transparent',
-          'bg-controls-secondary',
-          'hover:bg-controls-secondary-hovered',
-          'focus-visible:bg-controls-secondary-hovered',
-          'disabled:text-elements-on-disabled',
-          'disabled:bg-controls-disabled',
-          'disabled:border-transparent',
-          'disabled:shadow-none',
-        ],
-        tertiary: [
-          'text-elements-on-tertiary',
-          'border',
-          'border-border-interactive/10',
-          'bg-transparent',
-          'hover:bg-controls-tertiary-hovered',
-          'hover:border-border-interactive-hovered',
-          'hover:border-border-interactive-hovered/[0.14]',
-          'focus-visible:bg-controls-tertiary-hovered',
-          'focus-visible:border-border-interactive-hovered',
-          'focus-visible:border-border-interactive-hovered/[0.14]',
-          'disabled:text-elements-on-disabled',
-          'disabled:bg-controls-disabled',
-          'disabled:border-transparent',
-          'disabled:shadow-none',
-        ],
-        ghost: [
-          'text-elements-on-tertiary',
-          'border',
-          'border-transparent',
-          'bg-transparent',
-          'hover:bg-controls-tertiary-hovered',
-          'hover:border-border-interactive-hovered',
-          'hover:border-border-interactive-hovered/[0.14]',
-          'focus-visible:bg-controls-tertiary-hovered',
-          'focus-visible:border-border-interactive-hovered',
-          'focus-visible:border-border-interactive-hovered/[0.14]',
-          'disabled:text-elements-on-disabled',
-          'disabled:bg-controls-disabled',
-          'disabled:border-transparent',
-          'disabled:shadow-none',
-        ],
-        danger: [
-          'text-elements-on-danger',
-          'border',
-          'border-transparent',
-          'bg-border-danger',
-          'hover:bg-controls-danger-hovered',
-          'focus-visible:bg-controls-danger-hovered',
-          'disabled:text-elements-on-disabled',
-          'disabled:bg-controls-disabled',
-          'disabled:border-transparent',
-          'disabled:shadow-none',
-        ],
-        'danger-ghost': [
-          'text-elements-danger',
-          'border',
-          'border-transparent',
-          'bg-transparent',
-          'hover:bg-controls-tertiary-hovered',
-          'hover:border-border-interactive-hovered',
-          'hover:border-border-interactive-hovered/[0.14]',
-          'focus-visible:bg-controls-tertiary-hovered',
-          'focus-visible:border-border-interactive-hovered',
-          'focus-visible:border-border-interactive-hovered/[0.14]',
-          'disabled:text-elements-on-disabled',
-          'disabled:bg-controls-disabled',
-          'disabled:border-transparent',
-          'disabled:shadow-none',
-        ],
-        link: [
-          'p-0',
-          'gap-1.5',
-          'text-elements-link',
-          'rounded',
-          'focus-ring',
-          'hover:underline',
-          'hover:text-elements-link-hovered',
-          'disabled:text-controls-disabled',
-          'disabled:hover:no-underline',
-        ],
-        'link-emphasized': [
-          'p-0',
-          'gap-1.5',
-          'text-elements-high-em',
-          'rounded',
-          'underline',
-          'focus-ring',
-          'hover:text-elements-link-hovered',
-          'disabled:text-controls-disabled',
-          'disabled:hover:no-underline',
-          'dark:text-elements-on-high-contrast',
-        ],
-        unstyled: [],
-      },
-    },
-    compoundVariants: [
-      {
-        size: 'lg',
-        iconOnly: true,
-        class: ['py-3.5', 'px-3.5'],
-      },
-      {
-        size: 'md',
-        iconOnly: true,
-        class: ['py-3.25', 'px-3.25'],
-      },
-      {
-        size: 'sm',
-        iconOnly: true,
-        class: ['py-2', 'px-2'],
-      },
-      {
-        size: 'xs',
-        iconOnly: true,
-        class: ['py-1', 'px-1'],
-      },
-    ],
-    defaultVariants: {
-      size: 'md',
-      variant: 'primary',
-      fullWidth: false,
-      iconOnly: false,
-      shape: 'rounded',
-    },
-  },
-  {
-    responsiveVariants: true,
-  },
-);
-
-/**
- * Represents the type of a button theme, which is derived from the `buttonTheme` variant props.
- */
-export type ButtonTheme = VariantProps<typeof buttonTheme>;

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

@@ -1,186 +0,0 @@
-import React, { forwardRef, useCallback } from 'react';
-import type { ComponentPropsWithoutRef, ReactNode } from 'react';
-
-import { buttonTheme } from './Button.theme';
-import type { ButtonTheme } from './Button.theme';
-import { Link } from 'react-router-dom';
-import { cloneIcon } from 'utils/cloneIcon';
-
-/**
- * Represents the properties of a base button component.
- */
-interface ButtonBaseProps {
-  /**
-   * The optional left icon element for a component.
-   * @type {ReactNode}
-   */
-  leftIcon?: ReactNode;
-  /**
-   * The optional right icon element to display.
-   * @type {ReactNode}
-   */
-  rightIcon?: ReactNode;
-}
-
-/**
- * Interface for the props of a button link component.
- */
-export interface ButtonLinkProps
-  extends Omit<ComponentPropsWithoutRef<'a'>, 'color'> {
-  /**
-   * Specifies the optional property `as` with a value of `'a'`.
-   * @type {'a'}
-   */
-  as?: 'a';
-  /**
-   * Indicates whether the item is external or not.
-   * @type {boolean}
-   */
-  external?: boolean;
-  /**
-   * The URL of a web page or resource.
-   * @type {string}
-   */
-  href: string;
-}
-
-export interface ButtonProps
-  extends Omit<ComponentPropsWithoutRef<'button'>, 'color'> {
-  /**
-   * Specifies the optional property `as` with a value of `'button'`.
-   * @type {'button'}
-   */
-  as?: 'button';
-}
-
-/**
- * Interface representing the props for a button component.
- * Extends the ComponentPropsWithoutRef<'button'> and ButtonTheme interfaces.
- */
-export type ButtonOrLinkProps = (ButtonLinkProps | ButtonProps) &
-  ButtonBaseProps &
-  ButtonTheme;
-
-/**
- * A custom button component that can be used in React applications.
- */
-const Button = forwardRef<
-  HTMLButtonElement | HTMLAnchorElement,
-  ButtonOrLinkProps
->(
-  (
-    {
-      children,
-      className,
-      leftIcon,
-      rightIcon,
-      fullWidth,
-      iconOnly,
-      shape,
-      variant,
-      ...props
-    },
-    ref,
-  ) => {
-    // Conditionally render between <NextLink>, <a> or <button> depending on props
-    // useCallback to prevent unnecessary re-rendering
-    const Component = useCallback(
-      ({ children: _children, ..._props }: ButtonOrLinkProps) => {
-        if (_props.as === 'a') {
-          // eslint-disable-next-line @typescript-eslint/no-unused-vars
-          const { external, href, as, ...baseLinkProps } = _props;
-
-          // External link
-          if (external) {
-            const externalLinkProps = {
-              target: '_blank',
-              rel: 'noopener',
-              href,
-              ...baseLinkProps,
-            };
-            return (
-              // @ts-expect-error - ref
-              <a ref={ref} {...externalLinkProps}>
-                {_children}
-              </a>
-            );
-          }
-
-          // Internal link
-          return (
-            // @ts-expect-error - ref
-            <Link ref={ref} {...baseLinkProps} to={href}>
-              {_children}
-            </Link>
-          );
-        } else {
-          const { ...buttonProps } = _props;
-          return (
-            // @ts-expect-error - as prop is not a valid prop for button elements
-            <button ref={ref} {...buttonProps}>
-              {_children}
-            </button>
-          );
-        }
-      },
-      [],
-    );
-
-    /**
-     * Extracts specific style properties from the given props object and returns them as a new object.
-     */
-    const styleProps = (({
-      variant = 'primary',
-      size = 'md',
-      fullWidth = false,
-      iconOnly = false,
-      shape = 'rounded',
-      as,
-    }) => ({
-      variant,
-      size,
-      fullWidth,
-      iconOnly,
-      shape,
-      as,
-    }))({ ...props, fullWidth, iconOnly, shape, variant });
-
-    /**
-     * Validates that a button component has either children or an aria-label prop.
-     */
-    if (typeof children === 'undefined' && !props['aria-label']) {
-      throw new Error(
-        'Button components must have either children or an aria-label prop',
-      );
-    }
-
-    const iconSize = useCallback(() => {
-      switch (styleProps.size) {
-        case 'lg':
-          return { width: 20, height: 20 };
-        case 'sm':
-        case 'xs':
-          return { width: 16, height: 16 };
-        case 'md':
-        default: {
-          return { width: 18, height: 18 };
-        }
-      }
-    }, [styleProps.size])();
-
-    return (
-      <Component
-        {...props}
-        className={buttonTheme({ ...styleProps, class: className })}
-      >
-        {cloneIcon(leftIcon, { ...iconSize })}
-        {children}
-        {cloneIcon(rightIcon, { ...iconSize })}
-      </Component>
-    );
-  },
-);
-
-Button.displayName = 'Button';
-
-export { Button };

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

@@ -1,2 +0,0 @@
-export * from './Button';
-export * from './Button.theme';

packages/frontend/src/components/shared/Calendar/Calendar.css

@@ -1,128 +0,0 @@
-/*  React Calendar */
-.react-calendar {
-  @apply border-none font-sans;
-}
-
-/* Weekdays -- START */
-.react-calendar__month-view__weekdays {
-  @apply p-0 flex items-center justify-center;
-}
-
-.react-calendar__month-view__weekdays__weekday {
-  @apply h-8 w-12 flex items-center justify-center p-0 font-medium text-xs text-elements-disabled mb-2;
-}
-
-abbr[title] {
-  text-decoration: none;
-}
-/* Weekdays -- END  */
-
-/* Days -- START */
-.react-calendar__month-view__days {
-  @apply p-0 gap-0;
-}
-
-.react-calendar__month-view__days__day--neighboringMonth {
-  @apply !text-elements-disabled;
-}
-
-.react-calendar__month-view__days__day--neighboringMonth:hover {
-  @apply !text-elements-disabled !bg-transparent;
-}
-
-.react-calendar__month-view__days__day--neighboringMonth {
-  @apply !text-elements-disabled !bg-transparent;
-}
-
-/* For weekend days */
-.react-calendar__month-view__days__day--weekend {
-  /* color: ${colors.grey[950]} !important; */
-}
-
-.react-calendar__tile {
-  @apply h-12 w-12 text-elements-high-em;
-}
-
-.react-calendar__tile:hover {
-  @apply bg-base-bg-emphasized rounded-lg;
-}
-
-.react-calendar__tile:focus-visible {
-  @apply bg-base-bg-emphasized rounded-lg focus-ring z-10;
-}
-
-.react-calendar__tile--now {
-  @apply bg-base-bg-emphasized text-elements-high-em rounded-lg;
-}
-
-.react-calendar__tile--now:hover {
-  @apply bg-base-bg-emphasized text-elements-high-em rounded-lg;
-}
-
-.react-calendar__tile--now:focus-visible {
-  @apply bg-base-bg-emphasized text-elements-high-em rounded-lg focus-ring;
-}
-
-.react-calendar__tile--active {
-  @apply bg-controls-primary text-elements-on-primary rounded-lg;
-}
-
-.react-calendar__tile--active:hover {
-  @apply bg-controls-primary-hovered;
-}
-
-.react-calendar__tile--active:focus-visible {
-  @apply bg-controls-primary-hovered focus-ring;
-}
-
-/* Range -- START */
-.react-calendar__tile--range {
-  @apply bg-controls-secondary text-elements-on-secondary rounded-none;
-}
-
-.react-calendar__tile--range:hover {
-  @apply bg-controls-secondary-hovered text-elements-on-secondary rounded-none;
-}
-
-.react-calendar__tile--range:focus-visible {
-  @apply bg-controls-secondary-hovered text-elements-on-secondary rounded-lg;
-}
-
-.react-calendar__tile--rangeStart {
-  @apply bg-controls-primary text-elements-on-primary rounded-lg;
-}
-
-.react-calendar__tile--rangeStart:hover {
-  @apply bg-controls-primary-hovered text-elements-on-primary rounded-lg;
-}
-
-.react-calendar__tile--rangeStart:focus-visible {
-  @apply bg-controls-primary-hovered text-elements-on-primary rounded-lg focus-ring;
-}
-
-.react-calendar__tile--rangeEnd {
-  @apply bg-controls-primary text-elements-on-primary rounded-lg;
-}
-
-.react-calendar__tile--rangeEnd:hover {
-  @apply bg-controls-primary-hovered text-elements-on-primary rounded-lg;
-}
-
-.react-calendar__tile--rangeEnd:focus-visible {
-  @apply bg-controls-primary-hovered text-elements-on-primary rounded-lg focus-ring;
-}
-/* Range -- END */
-/* Days -- END  */
-
-/* Months -- START */
-.react-calendar__tile--hasActive {
-  @apply bg-controls-primary text-elements-on-primary rounded-lg;
-}
-
-.react-calendar__tile--hasActive:hover {
-  @apply bg-controls-primary-hovered text-elements-on-primary rounded-lg;
-}
-
-.react-calendar__tile--hasActive:focus-visible {
-  @apply bg-controls-primary-hovered text-elements-on-primary rounded-lg focus-ring;
-}

packages/frontend/src/components/shared/Calendar/Calendar.theme.ts

@@ -1,49 +0,0 @@
-import { VariantProps, tv } from 'tailwind-variants';
-
-export const calendarTheme = tv({
-  slots: {
-    wrapper: [
-      'max-w-[352px]',
-      'bg-surface-floating',
-      'shadow-calendar',
-      'rounded-xl',
-    ],
-    calendar: ['flex', 'flex-col', 'py-2', 'px-2', 'gap-2'],
-    navigation: [
-      'flex',
-      'items-center',
-      'justify-between',
-      'gap-3',
-      'py-2.5',
-      'px-1',
-    ],
-    actions: ['flex', 'items-center', 'justify-center', 'gap-1.5', 'flex-1'],
-    button: [
-      'flex',
-      'items-center',
-      'gap-2',
-      'px-2',
-      'py-2',
-      'rounded-lg',
-      'border',
-      'border-border-interactive',
-      'text-elements-high-em',
-      'shadow-field',
-      'bg-white',
-      'hover:bg-base-bg-alternate',
-      'focus-visible:bg-base-bg-alternate',
-    ],
-    footer: [
-      'flex',
-      'items-center',
-      'justify-end',
-      'py-3',
-      'px-2',
-      'gap-3',
-      'border-t',
-      'border-border-separator',
-    ],
-  },
-});
-
-export type CalendarTheme = VariantProps<typeof calendarTheme>;

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

@@ -1,298 +0,0 @@
-import React, {
-  ComponentPropsWithRef,
-  MouseEvent,
-  ReactNode,
-  useCallback,
-  useState,
-} from 'react';
-import {
-  Calendar as ReactCalendar,
-  CalendarProps as ReactCalendarProps,
-} from 'react-calendar';
-import { Value } from 'react-calendar/dist/cjs/shared/types';
-import { CalendarTheme, calendarTheme } from './Calendar.theme';
-import { Button } from 'components/shared/Button';
-import {
-  ChevronGrabberHorizontal,
-  ChevronLeft,
-  ChevronRight,
-} from 'components/shared/CustomIcon';
-
-import './Calendar.css';
-import { format } from 'date-fns';
-
-const CALENDAR_VIEW = ['month', 'year', 'decade'] as const;
-export type CalendarView = (typeof CALENDAR_VIEW)[number];
-
-/**
- * Defines a custom set of props for a React calendar component by excluding specific props
- * from the original ReactCalendarProps type.
- * @type {CustomReactCalendarProps}
- */
-type CustomReactCalendarProps = Omit<
-  ReactCalendarProps,
-  'view' | 'showNavigation' | 'onClickMonth' | 'onClickYear'
->;
-
-export interface CalendarProps extends CustomReactCalendarProps, CalendarTheme {
-  /**
-   * Optional props for wrapping a component with a div element.
-   */
-  wrapperProps?: ComponentPropsWithRef<'div'>;
-  /**
-   * Props for the calendar wrapper component.
-   */
-  calendarWrapperProps?: ComponentPropsWithRef<'div'>;
-  /**
-   * Optional props for the footer component.
-   */
-  footerProps?: ComponentPropsWithRef<'div'>;
-  /**
-   * Optional custom actions to be rendered.
-   */
-  actions?: ReactNode;
-  /**
-   * Optional callback function that is called when a value is selected.
-   * @param {Value} value - The selected value
-   * @returns None
-   */
-  onSelect?: (value: Value) => void;
-  /**
-   * Optional callback function that is called when a cancel action is triggered.
-   * @returns None
-   */
-  onCancel?: () => void;
-}
-
-/**
- * Calendar component that allows users to select dates and navigate through months and years.
- * @param {Object} CalendarProps - Props for the Calendar component.
- * @returns {JSX.Element} A calendar component with navigation, date selection, and actions.
- */
-export const Calendar = ({
-  selectRange,
-  activeStartDate: activeStartDateProp,
-  value: valueProp,
-  wrapperProps,
-  calendarWrapperProps,
-  footerProps,
-  actions,
-  onSelect,
-  onCancel,
-  onChange: onChangeProp,
-  ...props
-}: CalendarProps): JSX.Element => {
-  const {
-    wrapper,
-    calendar,
-    navigation,
-    actions: actionsClass,
-    button,
-    footer,
-  } = calendarTheme();
-
-  const today = new Date();
-  const currentMonth = format(today, 'MMM');
-  const currentYear = format(today, 'yyyy');
-
-  const [view, setView] = useState<CalendarView>('month');
-  const [activeDate, setActiveDate] = useState<Date>(
-    activeStartDateProp ?? today,
-  );
-  const [value, setValue] = useState<Value>(valueProp as Value);
-  const [month, setMonth] = useState(currentMonth);
-  const [year, setYear] = useState(currentYear);
-
-  /**
-   * Update the navigation label based on the active date
-   */
-  const changeNavigationLabel = useCallback(
-    (date: Date) => {
-      setMonth(format(date, 'MMM'));
-      setYear(format(date, 'yyyy'));
-    },
-    [setMonth, setYear],
-  );
-
-  /**
-   * Change the active date base on the action and range
-   */
-  const handleNavigate = useCallback(
-    (action: 'previous' | 'next', view: CalendarView) => {
-      setActiveDate((date) => {
-        const newDate = new Date(date);
-        switch (view) {
-          case 'month':
-            newDate.setMonth(
-              action === 'previous' ? date.getMonth() - 1 : date.getMonth() + 1,
-            );
-            break;
-          case 'year':
-            newDate.setFullYear(
-              action === 'previous'
-                ? date.getFullYear() - 1
-                : date.getFullYear() + 1,
-            );
-            break;
-          case 'decade':
-            newDate.setFullYear(
-              action === 'previous'
-                ? date.getFullYear() - 10
-                : date.getFullYear() + 10,
-            );
-            break;
-        }
-        changeNavigationLabel(newDate);
-        return newDate;
-      });
-    },
-    [setActiveDate, changeNavigationLabel],
-  );
-
-  /**
-   * Change the view of the calendar
-   */
-  const handleChangeView = useCallback(
-    (view: CalendarView) => {
-      setView(view);
-    },
-    [setView],
-  );
-
-  /**
-   * Change the active date and set the view to the selected type
-   * and also update the navigation label
-   */
-  const handleChangeNavigation = useCallback(
-    (view: 'month' | 'year', date: Date) => {
-      setActiveDate(date);
-      changeNavigationLabel(date);
-      setView(view);
-    },
-    [setActiveDate, changeNavigationLabel, setView],
-  );
-
-  const handlePrevious = useCallback(() => {
-    switch (view) {
-      case 'month':
-        return handleNavigate('previous', 'month');
-      case 'year':
-        return handleNavigate('previous', 'year');
-      case 'decade':
-        return handleNavigate('previous', 'decade');
-    }
-  }, [view]);
-
-  const handleNext = useCallback(() => {
-    switch (view) {
-      case 'month':
-        return handleNavigate('next', 'month');
-      case 'year':
-        return handleNavigate('next', 'year');
-      case 'decade':
-        return handleNavigate('next', 'decade');
-    }
-  }, [view]);
-
-  const handleChange = useCallback(
-    (newValue: Value, event: MouseEvent<HTMLButtonElement>) => {
-      setValue(newValue);
-
-      // Call the onChange prop if it exists
-      onChangeProp?.(newValue, event);
-
-      /**
-       * Update the active date and navigation label
-       *
-       * NOTE:
-       * For range selection, the active date is not updated
-       * The user only can select multiple dates within the same month
-       */
-      if (!selectRange) {
-        setActiveDate(newValue as Date);
-        changeNavigationLabel(newValue as Date);
-      }
-    },
-    [setValue, setActiveDate, changeNavigationLabel, selectRange],
-  );
-
-  return (
-    <div
-      {...wrapperProps}
-      className={wrapper({ className: wrapperProps?.className })}
-    >
-      {/* Calendar wrapper */}
-      <div
-        {...calendarWrapperProps}
-        className={calendar({ className: calendarWrapperProps?.className })}
-      >
-        {/* Navigation */}
-        <div className={navigation()}>
-          <Button iconOnly size="sm" variant="ghost" onClick={handlePrevious}>
-            <ChevronLeft />
-          </Button>
-          <div className={actionsClass()}>
-            <Button
-              variant="unstyled"
-              className={button()}
-              rightIcon={
-                <ChevronGrabberHorizontal className="text-elements-low-em" />
-              }
-              onClick={() => handleChangeView('year')}
-            >
-              {month}
-            </Button>
-            <Button
-              variant="unstyled"
-              className={button()}
-              rightIcon={
-                <ChevronGrabberHorizontal className="text-elements-low-em" />
-              }
-              onClick={() => handleChangeView('decade')}
-            >
-              {year}
-            </Button>
-          </div>
-          <Button iconOnly size="sm" variant="ghost" onClick={handleNext}>
-            <ChevronRight />
-          </Button>
-        </div>
-
-        {/* Calendar */}
-        <ReactCalendar
-          {...props}
-          activeStartDate={activeDate}
-          view={view}
-          value={value}
-          showNavigation={false}
-          selectRange={selectRange}
-          onChange={handleChange}
-          onClickMonth={(date) => handleChangeNavigation('month', date)}
-          onClickYear={(date) => handleChangeNavigation('year', date)}
-        />
-      </div>
-
-      {/* Footer or CTA */}
-      <div
-        {...footerProps}
-        className={footer({ className: footerProps?.className })}
-      >
-        {actions ? (
-          actions
-        ) : (
-          <>
-            <Button variant="tertiary" onClick={onCancel}>
-              Cancel
-            </Button>
-            <Button
-              disabled={!value}
-              onClick={() => (value ? onSelect?.(value) : null)}
-            >
-              Select
-            </Button>
-          </>
-        )}
-      </div>
-    </div>
-  );
-};

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

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

packages/frontend/src/components/shared/Checkbox/Checkbox.theme.ts

@@ -1,68 +0,0 @@
-import { tv, type VariantProps } from 'tailwind-variants';
-
-export const getCheckboxVariant = tv({
-  slots: {
-    wrapper: ['group', 'flex', 'gap-3'],
-    indicator: [
-      'grid',
-      'place-content-center',
-      'text-transparent',
-      'group-hover:text-controls-disabled',
-      'focus-visible:text-controls-disabled',
-      'group-focus-visible:text-controls-disabled',
-      'data-[state=checked]:text-elements-on-primary',
-      'data-[state=checked]:group-focus-visible:text-elements-on-primary',
-      'data-[state=indeterminate]:text-elements-on-primary',
-      'data-[state=checked]:data-[disabled]:text-elements-on-disabled-active',
-    ],
-    icon: ['w-3', 'h-3', 'stroke-current', 'text-current'],
-    input: [
-      'h-5',
-      'w-5',
-      'group',
-      'border',
-      'border-border-interactive/10',
-      'bg-controls-tertiary',
-      'rounded-md',
-      'transition-all',
-      'duration-150',
-      'focus-ring',
-      'shadow-button',
-      'group-hover:border-border-interactive/[0.14]',
-      'group-hover:bg-controls-tertiary',
-      'data-[state=checked]:bg-controls-primary',
-      'data-[state=checked]:hover:bg-controls-primary-hovered',
-      'data-[state=checked]:focus-visible:bg-controls-primary-hovered',
-      'data-[disabled]:bg-controls-disabled',
-      'data-[disabled]:shadow-none',
-      'data-[disabled]:hover:border-border-interactive/10',
-      'data-[disabled]:cursor-not-allowed',
-      'data-[state=checked]:data-[disabled]:bg-controls-disabled-active',
-    ],
-    label: [
-      'text-sm',
-      'tracking-[-0.006em]',
-      'text-elements-high-em',
-      'flex',
-      'flex-col',
-      'gap-1',
-      'px-1',
-    ],
-    description: ['text-xs', 'text-elements-low-em'],
-  },
-  variants: {
-    disabled: {
-      true: {
-        wrapper: ['cursor-not-allowed'],
-        indicator: ['group-hover:text-transparent'],
-        input: [
-          'group-hover:border-border-interactive/[0.14]',
-          'group-hover:bg-controls-disabled',
-        ],
-        label: ['cursor-not-allowed'],
-      },
-    },
-  },
-});
-
-export type CheckboxVariants = VariantProps<typeof getCheckboxVariant>;

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

@@ -1,76 +0,0 @@
-import React from 'react';
-import * as CheckboxRadix from '@radix-ui/react-checkbox';
-import { type CheckboxProps as CheckboxRadixProps } from '@radix-ui/react-checkbox';
-
-import { getCheckboxVariant, type CheckboxVariants } from './Checkbox.theme';
-import { CheckIcon } from 'components/shared/CustomIcon';
-
-interface CheckBoxProps extends CheckboxRadixProps, CheckboxVariants {
-  /**
-   * The label of the checkbox.
-   */
-  label?: string;
-  /**
-   * The description of the checkbox.
-   */
-  description?: string;
-}
-
-/**
- * Checkbox component is used to allow users to select one or more items from a set.
- * It is a wrapper around the `@radix-ui/react-checkbox` component.
- *
- * It accepts all the props from `@radix-ui/react-checkbox` component and the variants from the theme.
- *
- * It also accepts `label` and `description` props to display the label and description of the checkbox.
- *
- * @example
- * ```tsx
- * <Checkbox
- *  id="checkbox"
- *  label="Checkbox"
- *  description="This is a checkbox"
- * />
- * ```
- */
-export const Checkbox = ({
-  id,
-  className,
-  label,
-  description,
-  onCheckedChange,
-  ...props
-}: CheckBoxProps) => {
-  const {
-    wrapper: wrapperStyle,
-    indicator: indicatorStyle,
-    icon: iconStyle,
-    input: inputStyle,
-    label: labelStyle,
-    description: descriptionStyle,
-  } = getCheckboxVariant({
-    disabled: props?.disabled,
-  });
-  return (
-    <div className={wrapperStyle()}>
-      <CheckboxRadix.Root
-        {...props}
-        className={inputStyle({ className })}
-        id={id}
-        onCheckedChange={onCheckedChange}
-      >
-        <CheckboxRadix.Indicator forceMount className={indicatorStyle()}>
-          <CheckIcon className={iconStyle()} />
-        </CheckboxRadix.Indicator>
-      </CheckboxRadix.Root>
-      {label && (
-        <label className={labelStyle()} htmlFor={id}>
-          {label}
-          {description && (
-            <span className={descriptionStyle()}>{description}</span>
-          )}
-        </label>
-      )}
-    </div>
-  );
-};

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

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

packages/frontend/src/components/shared/CustomIcon/CheckIcon.tsx

@@ -1,22 +0,0 @@
-import React from 'react';
-import { CustomIcon, CustomIconProps } from './CustomIcon';
-
-export const CheckIcon = (props: CustomIconProps) => {
-  return (
-    <CustomIcon
-      width="12"
-      height="12"
-      viewBox="0 0 12 12"
-      fill="none"
-      {...props}
-    >
-      <path
-        d="M1.5 7.5L4.64706 10L10.5 2"
-        stroke="currentColor"
-        strokeWidth="2"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-      />
-    </CustomIcon>
-  );
-};

packages/frontend/src/components/shared/CustomIcon/ChevronGrabberHorizontal.tsx

@@ -1,20 +0,0 @@
-import React from 'react';
-import { CustomIcon, CustomIconProps } from './CustomIcon';
-
-export const ChevronGrabberHorizontal = (props: CustomIconProps) => {
-  return (
-    <CustomIcon
-      width="20"
-      height="20"
-      viewBox="0 0 20 20"
-      fill="none"
-      {...props}
-    >
-      <path
-        d="M6.66666 12.5L9.99999 15.8333L13.3333 12.5M6.66666 7.5L9.99999 4.16666L13.3333 7.5"
-        stroke="currentColor"
-        strokeLinecap="square"
-      />
-    </CustomIcon>
-  );
-};

packages/frontend/src/components/shared/CustomIcon/ChevronLeft.tsx

@@ -1,21 +0,0 @@
-import React from 'react';
-import { CustomIcon, CustomIconProps } from './CustomIcon';
-
-export const ChevronLeft = (props: CustomIconProps) => {
-  return (
-    <CustomIcon
-      width="16"
-      height="16"
-      viewBox="0 0 16 16"
-      fill="none"
-      {...props}
-    >
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M10.7071 2.66666L5.37378 8.00001L10.7071 13.3333L10 14.0404L3.95956 8.00001L10 1.95956L10.7071 2.66666Z"
-        fill="currentColor"
-      />
-    </CustomIcon>
-  );
-};

packages/frontend/src/components/shared/CustomIcon/ChevronRight.tsx

@@ -1,21 +0,0 @@
-import React from 'react';
-import { CustomIcon, CustomIconProps } from './CustomIcon';
-
-export const ChevronRight = (props: CustomIconProps) => {
-  return (
-    <CustomIcon
-      width="16"
-      height="16"
-      viewBox="0 0 16 16"
-      fill="none"
-      {...props}
-    >
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M6.00001 1.95956L12.0405 7.99998L6.00001 14.0404L5.29291 13.3333L10.6262 7.99999L5.29291 2.66666L6.00001 1.95956Z"
-        fill="currentColor"
-      />
-    </CustomIcon>
-  );
-};

packages/frontend/src/components/shared/CustomIcon/CrossIcon.tsx

@@ -1,21 +0,0 @@
-import React from 'react';
-import { CustomIcon, CustomIconProps } from './CustomIcon';
-
-export const CrossIcon = (props: CustomIconProps) => {
-  return (
-    <CustomIcon
-      width="24"
-      height="24"
-      viewBox="0 0 24 24"
-      fill="none"
-      {...props}
-    >
-      <path
-        d="M5 5L19 19M19 5L5 19"
-        stroke="currentColor"
-        strokeWidth="2"
-        strokeLinecap="round"
-      />
-    </CustomIcon>
-  );
-};

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

@@ -1,30 +0,0 @@
-import React, { ComponentPropsWithoutRef } from 'react';
-
-export interface CustomIconProps extends ComponentPropsWithoutRef<'svg'> {
-  size?: number | string; // width and height will both be set as the same value
-  name?: string;
-}
-
-export const CustomIcon = ({
-  children,
-  width = 24,
-  height = 24,
-  size,
-  viewBox = '0 0 24 24',
-  name,
-  ...rest
-}: CustomIconProps) => {
-  return (
-    <svg
-      aria-labelledby={name}
-      height={size || height}
-      role="presentation"
-      viewBox={viewBox}
-      width={size || width}
-      xmlns="http://www.w3.org/2000/svg"
-      {...rest}
-    >
-      {children}
-    </svg>
-  );
-};

packages/frontend/src/components/shared/CustomIcon/GlobeIcon.tsx

@@ -1,20 +0,0 @@
-import React from 'react';
-import { CustomIcon, CustomIconProps } from './CustomIcon';
-
-export const GlobeIcon = (props: CustomIconProps) => {
-  return (
-    <CustomIcon
-      width="20"
-      height="20"
-      viewBox="0 0 20 20"
-      fill="none"
-      {...props}
-    >
-      <path
-        d="M10 17.9167C14.3723 17.9167 17.9167 14.3723 17.9167 10C17.9167 5.62776 14.3723 2.08334 10 2.08334M10 17.9167C5.62776 17.9167 2.08334 14.3723 2.08334 10C2.08334 5.62776 5.62776 2.08334 10 2.08334M10 17.9167C8.15906 17.9167 6.66668 14.3723 6.66668 10C6.66668 5.62776 8.15906 2.08334 10 2.08334M10 17.9167C11.841 17.9167 13.3333 14.3723 13.3333 10C13.3333 5.62776 11.841 2.08334 10 2.08334M17.5 10H2.50001"
-        stroke="currentColor"
-        strokeLinecap="square"
-      />
-    </CustomIcon>
-  );
-};

packages/frontend/src/components/shared/CustomIcon/InfoSquareIcon.tsx

@@ -1,21 +0,0 @@
-import React from 'react';
-import { CustomIcon, CustomIconProps } from './CustomIcon';
-
-export const InfoSquareIcon = (props: CustomIconProps) => {
-  return (
-    <CustomIcon
-      width="20"
-      height="20"
-      viewBox="0 0 20 20"
-      fill="none"
-      {...props}
-    >
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M5.96786 2.5C5.52858 2.49999 5.14962 2.49997 4.83748 2.52548C4.50802 2.55239 4.18034 2.61182 3.86503 2.77249C3.39462 3.01217 3.01217 3.39462 2.77249 3.86503C2.61182 4.18034 2.55239 4.50802 2.52548 4.83748C2.49997 5.14962 2.49999 5.52857 2.5 5.96785V14.0321C2.49999 14.4714 2.49997 14.8504 2.52548 15.1625C2.55239 15.492 2.61182 15.8197 2.77249 16.135C3.01217 16.6054 3.39462 16.9878 3.86503 17.2275C4.18034 17.3882 4.50802 17.4476 4.83748 17.4745C5.14962 17.5 5.52858 17.5 5.96786 17.5H14.0321C14.4714 17.5 14.8504 17.5 15.1625 17.4745C15.492 17.4476 15.8197 17.3882 16.135 17.2275C16.6054 16.9878 16.9878 16.6054 17.2275 16.135C17.3882 15.8197 17.4476 15.492 17.4745 15.1625C17.5 14.8504 17.5 14.4714 17.5 14.0321V5.96786C17.5 5.52858 17.5 5.14962 17.4745 4.83748C17.4476 4.50802 17.3882 4.18034 17.2275 3.86503C16.9878 3.39462 16.6054 3.01217 16.135 2.77249C15.8197 2.61182 15.492 2.55239 15.1625 2.52548C14.8504 2.49997 14.4714 2.49999 14.0322 2.5H5.96786ZM8.33333 9.16667C8.33333 8.70643 8.70643 8.33333 9.16667 8.33333H10C10.4602 8.33333 10.8333 8.70643 10.8333 9.16667V13.3333C10.8333 13.7936 10.4602 14.1667 10 14.1667C9.53976 14.1667 9.16667 13.7936 9.16667 13.3333V10C8.70643 10 8.33333 9.6269 8.33333 9.16667ZM10 5.83333C9.53976 5.83333 9.16667 6.20643 9.16667 6.66667C9.16667 7.1269 9.53976 7.5 10 7.5C10.4602 7.5 10.8333 7.1269 10.8333 6.66667C10.8333 6.20643 10.4602 5.83333 10 5.83333Z"
-        fill="currentColor"
-      />
-    </CustomIcon>
-  );
-};

packages/frontend/src/components/shared/CustomIcon/PlusIcon.tsx

@@ -1,21 +0,0 @@
-import React from 'react';
-import { CustomIcon, CustomIconProps } from './CustomIcon';
-
-export const PlusIcon = (props: CustomIconProps) => {
-  return (
-    <CustomIcon
-      width="20"
-      height="20"
-      viewBox="0 0 20 20"
-      fill="none"
-      {...props}
-    >
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M1.66666 9.99999C1.66666 5.39762 5.39762 1.66666 9.99999 1.66666C14.6024 1.66666 18.3333 5.39762 18.3333 9.99999C18.3333 14.6024 14.6024 18.3333 9.99999 18.3333C5.39762 18.3333 1.66666 14.6024 1.66666 9.99999ZM10.625 6.46483C10.625 6.11966 10.3452 5.83983 9.99999 5.83983C9.65481 5.83983 9.37499 6.11966 9.37499 6.46483V9.37537H6.46446C6.11928 9.37537 5.83946 9.65519 5.83946 10.0004C5.83946 10.3455 6.11928 10.6254 6.46446 10.6254H9.37499V13.5359C9.37499 13.8811 9.65481 14.1609 9.99999 14.1609C10.3452 14.1609 10.625 13.8811 10.625 13.5359V10.6254H13.5355C13.8807 10.6254 14.1605 10.3455 14.1605 10.0004C14.1605 9.65519 13.8807 9.37537 13.5355 9.37537H10.625V6.46483Z"
-        fill="currentColor"
-      />
-    </CustomIcon>
-  );
-};

packages/frontend/src/components/shared/CustomIcon/README.md

@@ -1,24 +0,0 @@
-# 1. What icons are compatible with this component?
-
-- Viewbox "0 0 24 24": From where you're exporting from, please make sure the icon is using viewBox="0 0 24 24" before downloading/exporting. Not doing so will result in incorrect icon scaling
-
-# 2. How to add a new icon?
-
-**2.1 Sanitising the icon**
-
-1. Duplicate a current icon e.g. CrossIcon and rename it accordingly.
-2. Rename the function inside the new file you duplicated too
-3. Replace the markup with your SVG markup (make sure it complies with the above section's rule)
-4. Depending on the svg you pasted...
-   A. If the `<svg>` has only 1 child, remove the `<svg>` parent entirely so you only have the path left
-   B. If your component has more than 1 paths, rename `<svg>` tag with the `<g>` tag. Then, remove all attributes of this `<g>` tag so that it's just `<g>`
-5. Usually, icons are single colored. If that's the case, replace all fill/stroke color with `currentColor`. E.g. <path d="..." fill="currentColor">. Leave the other attributes without removing them.
-6. If your icon has more than one colour, then it's up to you to decide whether we want to use tailwind to help set the fill and stroke colors
-7. Lastly, export your icon in `index.ts` by following what was done for CrossIcon
-8. Make sure to provide a name to the `<CustomIcon>` component for accessibility sake
-9. Done!
-
-**2.3 Use your newly imported icon**
-
-1. You can change simply use `<BellIcon size="32" />` to quickly change both width and height with the same value (square). For custom viewBox, width and height, simply provide all three props.
-2. Coloring the icon: Simply add a className with text color. E.g. `<BellIcon className="text-gray-500" />`

packages/frontend/src/components/shared/CustomIcon/SearchIcon.tsx

@@ -1,21 +0,0 @@
-import React from 'react';
-import { CustomIcon, CustomIconProps } from './CustomIcon';
-
-export const SearchIcon = (props: CustomIconProps) => {
-  return (
-    <CustomIcon
-      width="24"
-      height="24"
-      viewBox="0 0 24 24"
-      fill="none"
-      {...props}
-    >
-      <path
-        d="M20 20L16.05 16.05M18 11C18 14.866 14.866 18 11 18C7.13401 18 4 14.866 4 11C4 7.13401 7.13401 4 11 4C14.866 4 18 7.13401 18 11Z"
-        stroke="currentColor"
-        strokeWidth="2"
-        strokeLinecap="round"
-      />
-    </CustomIcon>
-  );
-};

packages/frontend/src/components/shared/CustomIcon/WarningIcon.tsx

@@ -1,21 +0,0 @@
-import React from 'react';
-import { CustomIcon, CustomIconProps } from './CustomIcon';
-
-export const WarningIcon = (props: CustomIconProps) => {
-  return (
-    <CustomIcon
-      width="16"
-      height="16"
-      viewBox="0 0 24 24"
-      fill="none"
-      {...props}
-    >
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M10.4902 2.84406C11.1661 1.69 12.8343 1.69 13.5103 2.84406L22.0156 17.3654C22.699 18.5321 21.8576 19.9999 20.5056 19.9999H3.49483C2.14281 19.9999 1.30147 18.5321 1.98479 17.3654L10.4902 2.84406ZM12 9C12.4142 9 12.75 9.33579 12.75 9.75V13.25C12.75 13.6642 12.4142 14 12 14C11.5858 14 11.25 13.6642 11.25 13.25V9.75C11.25 9.33579 11.5858 9 12 9ZM13 15.75C13 16.3023 12.5523 16.75 12 16.75C11.4477 16.75 11 16.3023 11 15.75C11 15.1977 11.4477 14.75 12 14.75C12.5523 14.75 13 15.1977 13 15.75Z"
-        fill="currentColor"
-      />
-    </CustomIcon>
-  );
-};

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

@@ -1,11 +0,0 @@
-export * from './PlusIcon';
-export * from './CustomIcon';
-export * from './CheckIcon';
-export * from './ChevronGrabberHorizontal';
-export * from './ChevronLeft';
-export * from './ChevronRight';
-export * from './InfoSquareIcon';
-export * from './WarningIcon';
-export * from './SearchIcon';
-export * from './CrossIcon';
-export * from './GlobeIcon';

packages/frontend/src/components/shared/InlineNotification/InlineNotification.theme.ts

@@ -1,78 +0,0 @@
-import { VariantProps, tv } from 'tailwind-variants';
-
-export const inlineNotificationTheme = tv({
-  slots: {
-    wrapper: ['rounded-xl', 'flex', 'gap-2', 'items-start', 'w-full', 'border'],
-    content: ['flex', 'flex-col', 'gap-1'],
-    title: [],
-    description: [],
-    icon: ['flex', 'items-start'],
-  },
-  variants: {
-    variant: {
-      info: {
-        wrapper: ['border-border-info-light', 'bg-base-bg-emphasized-info'],
-        title: ['text-elements-on-emphasized-info'],
-        description: ['text-elements-on-emphasized-info'],
-        icon: ['text-elements-info'],
-      },
-      danger: {
-        wrapper: ['border-border-danger-light', 'bg-base-bg-emphasized-danger'],
-        title: ['text-elements-on-emphasized-danger'],
-        description: ['text-elements-on-emphasized-danger'],
-        icon: ['text-elements-danger'],
-      },
-      warning: {
-        wrapper: [
-          'border-border-warning-light',
-          'bg-base-bg-emphasized-warning',
-        ],
-        title: ['text-elements-on-emphasized-warning'],
-        description: ['text-elements-on-emphasized-warning'],
-        icon: ['text-elements-warning'],
-      },
-      success: {
-        wrapper: [
-          'border-border-success-light',
-          'bg-base-bg-emphasized-success',
-        ],
-        title: ['text-elements-on-emphasized-success'],
-        description: ['text-elements-on-emphasized-success'],
-        icon: ['text-elements-success'],
-      },
-      generic: {
-        wrapper: ['border-border-separator', 'bg-base-bg-emphasized'],
-        title: ['text-elements-high-em'],
-        description: ['text-elements-on-emphasized-info'],
-        icon: ['text-elements-high-em'],
-      },
-    },
-    size: {
-      sm: {
-        wrapper: ['px-2', 'py-2'],
-        title: ['leading-4', 'text-xs'],
-        description: ['leading-4', 'text-xs'],
-        icon: ['h-4', 'w-4'],
-      },
-      md: {
-        wrapper: ['px-3', 'py-3'],
-        title: ['leading-5', 'tracking-[-0.006em]', 'text-sm'],
-        description: ['leading-5', 'tracking-[-0.006em]', 'text-sm'],
-        icon: ['h-5', 'w-5'],
-      },
-    },
-    hasDescription: {
-      true: {
-        title: ['font-medium'],
-      },
-    },
-  },
-  defaultVariants: {
-    variant: 'generic',
-    size: 'md',
-  },
-});
-
-export type InlineNotificationTheme = VariantProps<
-  typeof inlineNotificationTheme
->;

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

@@ -1,68 +0,0 @@
-import React, { ReactNode, useCallback } from 'react';
-import { ComponentPropsWithoutRef } from 'react';
-import {
-  InlineNotificationTheme,
-  inlineNotificationTheme,
-} from './InlineNotification.theme';
-import { InfoSquareIcon } from 'components/shared/CustomIcon';
-import { cloneIcon } from 'utils/cloneIcon';
-
-export interface InlineNotificationProps
-  extends ComponentPropsWithoutRef<'div'>,
-    InlineNotificationTheme {
-  /**
-   * The title of the notification
-   */
-  title: string;
-  /**
-   * The description of the notification
-   */
-  description?: string;
-  /**
-   * The icon to display in the notification
-   * @default <InfoSquareIcon />
-   */
-  icon?: ReactNode;
-}
-
-/**
- * A notification that is displayed inline with the content
- *
- * @example
- * ```tsx
- * <InlineNotification title="Notification title goes here" />
- * ```
- */
-export const InlineNotification = ({
-  className,
-  title,
-  description,
-  size,
-  variant,
-  icon,
-  ...props
-}: InlineNotificationProps) => {
-  const {
-    wrapper,
-    content,
-    title: titleClass,
-    description: descriptionClass,
-    icon: iconClass,
-  } = inlineNotificationTheme({ size, variant, hasDescription: !!description });
-
-  // Render custom icon or default icon
-  const renderIcon = useCallback(() => {
-    if (!icon) return <InfoSquareIcon className={iconClass()} />;
-    return cloneIcon(icon, { className: iconClass() });
-  }, [icon]);
-
-  return (
-    <div {...props} className={wrapper({ className })}>
-      {renderIcon()}
-      <div className={content()}>
-        <p className={titleClass()}>{title}</p>
-        {description && <p className={descriptionClass()}>{description}</p>}
-      </div>
-    </div>
-  );
-};

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

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

packages/frontend/src/components/shared/Input/Input.theme.ts

@@ -1,85 +0,0 @@
-import { VariantProps, tv } from 'tailwind-variants';
-
-export const inputTheme = tv(
-  {
-    slots: {
-      container: [
-        'flex',
-        'items-center',
-        'rounded-lg',
-        'relative',
-        'placeholder:text-elements-disabled',
-        'disabled:cursor-not-allowed',
-        'disabled:bg-controls-disabled',
-      ],
-      label: ['text-sm', 'text-elements-high-em'],
-      description: ['text-xs', 'text-elements-low-em'],
-      input: [
-        'focus-ring',
-        'block',
-        'w-full',
-        'h-full',
-        'rounded-lg',
-        'text-elements-mid-em',
-        'shadow-sm',
-        'border',
-        'border-border-interactive',
-        'disabled:shadow-none',
-        'disabled:border-none',
-      ],
-      icon: ['text-elements-mid-em'],
-      iconContainer: [
-        'absolute',
-        'inset-y-0',
-        'flex',
-        'items-center',
-        'z-10',
-        'cursor-pointer',
-      ],
-      helperIcon: [],
-      helperText: ['flex', 'gap-2', 'items-center', 'text-elements-danger'],
-    },
-    variants: {
-      state: {
-        default: {
-          input: '',
-        },
-        error: {
-          input: [
-            'outline',
-            'outline-offset-0',
-            'outline-border-danger',
-            'shadow-none',
-            'focus:outline-border-danger',
-          ],
-          helperText: 'text-elements-danger',
-        },
-      },
-      size: {
-        md: {
-          container: 'h-11',
-          input: ['text-sm pl-4 pr-4'],
-          icon: ['h-[18px] w-[18px]'],
-          helperText: 'text-sm',
-          helperIcon: ['h-5 w-5'],
-        },
-        sm: {
-          container: 'h-8',
-          input: ['text-xs pl-3 pr-3'],
-          icon: ['h-4 w-4'],
-          helperText: 'text-xs',
-          helperIcon: ['h-4 w-4'],
-        },
-      },
-    },
-    defaultVariants: {
-      size: 'md',
-      state: 'default',
-    },
-  },
-  {
-    responsiveVariants: true,
-  },
-);
-
-export type InputTheme = VariantProps<typeof inputTheme>;

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

@@ -1,100 +0,0 @@
-import React, { ReactNode, useMemo } from 'react';
-import { ComponentPropsWithoutRef } from 'react';
-import { InputTheme, inputTheme } from './Input.theme';
-import { WarningIcon } from 'components/shared/CustomIcon';
-import { cloneIcon } from 'utils/cloneIcon';
-import { cn } from 'utils/classnames';
-
-export interface InputProps
-  extends InputTheme,
-    Omit<ComponentPropsWithoutRef<'input'>, 'size'> {
-  label?: string;
-  description?: string;
-  leftIcon?: ReactNode;
-  rightIcon?: ReactNode;
-  helperText?: string;
-}
-
-export const Input = ({
-  className,
-  label,
-  description,
-  leftIcon,
-  rightIcon,
-  helperText,
-  size,
-  state,
-  ...props
-}: InputProps) => {
-  const styleProps = (({ size = 'md', state }) => ({
-    size,
-    state,
-  }))({ size, state });
-
-  const {
-    container: containerCls,
-    label: labelCls,
-    description: descriptionCls,
-    input: inputCls,
-    icon: iconCls,
-    iconContainer: iconContainerCls,
-    helperText: helperTextCls,
-    helperIcon: helperIconCls,
-  } = inputTheme({ ...styleProps });
-
-  const renderLabels = useMemo(
-    () => (
-      <div className="space-y-1">
-        <p className={labelCls()}>{label}</p>
-        <p className={descriptionCls()}>{description}</p>
-      </div>
-    ),
-    [labelCls, descriptionCls, label, description],
-  );
-
-  const renderLeftIcon = useMemo(() => {
-    return (
-      <div className={iconContainerCls({ class: 'left-0 pl-4' })}>
-        {cloneIcon(leftIcon, { className: iconCls(), ariaHidden: true })}
-      </div>
-    );
-  }, [cloneIcon, iconCls, iconContainerCls, leftIcon]);
-
-  const renderRightIcon = useMemo(() => {
-    return (
-      <div className={iconContainerCls({ class: 'pr-4 right-0' })}>
-        {cloneIcon(rightIcon, { className: iconCls(), ariaHidden: true })}
-      </div>
-    );
-  }, [cloneIcon, iconCls, iconContainerCls, rightIcon]);
-
-  const renderHelperText = useMemo(
-    () => (
-      <div className={helperTextCls()}>
-        {state &&
-          cloneIcon(<WarningIcon className={helperIconCls()} />, {
-            ariaHidden: true,
-          })}
-        <p>{helperText}</p>
-      </div>
-    ),
-    [cloneIcon, state, helperIconCls, helperText, helperTextCls],
-  );
-
-  return (
-    <div className="space-y-2">
-      {renderLabels}
-      <div className={containerCls({ class: className })}>
-        {leftIcon && renderLeftIcon}
-        <input
-          className={cn(inputCls({ class: 'w-80' }), {
-            'pl-10': leftIcon,
-          })}
-          {...props}
-        />
-        {rightIcon && renderRightIcon}
-      </div>
-      {renderHelperText}
-    </div>
-  );
-};

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

@@ -1,2 +0,0 @@
-export * from './Input';
-export * from './Input.theme';

packages/frontend/src/components/shared/Radio/Radio.theme.ts

@@ -1,54 +0,0 @@
-import { VariantProps, tv } from 'tailwind-variants';
-
-export const radioTheme = tv({
-  slots: {
-    root: ['flex', 'gap-3', 'flex-wrap'],
-    wrapper: ['flex', 'items-center', 'gap-2', 'group'],
-    label: ['text-sm', 'tracking-[-0.006em]', 'text-elements-high-em'],
-    radio: [
-      'w-5',
-      'h-5',
-      'rounded-full',
-      'border',
-      'group',
-      'border-border-interactive/10',
-      'shadow-button',
-      'group-hover:border-border-interactive/[0.14]',
-      'focus-ring',
-      // Checked
-      'data-[state=checked]:bg-controls-primary',
-      'data-[state=checked]:group-hover:bg-controls-primary-hovered',
-    ],
-    indicator: [
-      'flex',
-      'items-center',
-      'justify-center',
-      'relative',
-      'w-full',
-      'h-full',
-      'after:content-[""]',
-      'after:block',
-      'after:w-2.5',
-      'after:h-2.5',
-      'after:rounded-full',
-      'after:bg-transparent',
-      'after:group-hover:bg-controls-disabled',
-      'after:group-focus-visible:bg-controls-disabled',
-      // Checked
-      'after:data-[state=checked]:bg-elements-on-primary',
-      'after:data-[state=checked]:group-hover:bg-elements-on-primary',
-      'after:data-[state=checked]:group-focus-visible:bg-elements-on-primary',
-    ],
-  },
-  variants: {
-    orientation: {
-      vertical: { root: ['flex-col'] },
-      horizontal: { root: ['flex-row'] },
-    },
-  },
-  defaultVariants: {
-    orientation: 'vertical',
-  },
-});
-
-export type RadioTheme = VariantProps<typeof radioTheme>;

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

@@ -1,63 +0,0 @@
-import React from 'react';
-import {
-  Root as RadixRoot,
-  RadioGroupProps,
-} from '@radix-ui/react-radio-group';
-import { RadioTheme, radioTheme } from './Radio.theme';
-import { RadioItem, RadioItemProps } from './RadioItem';
-
-export interface RadioOption extends RadioItemProps {
-  /**
-   * The label of the radio option.
-   */
-  label: string;
-  /**
-   * The value of the radio option.
-   */
-  value: string;
-}
-
-export interface RadioProps extends RadioGroupProps, RadioTheme {
-  /**
-   * The options of the radio.
-   * @default []
-   * @example
-   * ```tsx
-   * const options = [
-   *  {
-   *    label: 'Label 1',
-   *    value: '1',
-   *  },
-   *  {
-   *    label: 'Label 2',
-   *    value: '2',
-   *  },
-   *  {
-   *    label: 'Label 3',
-   *    value: '3',
-   *  },
-   * ];
-   * ```
-   */
-  options: RadioOption[];
-}
-
-/**
- * The Radio component is used to select one option from a list of options.
- */
-export const Radio = ({
-  className,
-  options,
-  orientation,
-  ...props
-}: RadioProps) => {
-  const { root } = radioTheme({ orientation });
-
-  return (
-    <RadixRoot {...props} className={root({ className })}>
-      {options.map((option) => (
-        <RadioItem key={option.value} {...option} />
-      ))}
-    </RadixRoot>
-  );
-};