Skip to content

Commit

Permalink
feat: finish console rebrand (#259)
Browse files Browse the repository at this point in the history
  • Loading branch information
baktun14 authored Jul 4, 2024
1 parent d9aff75 commit ae272e8
Show file tree
Hide file tree
Showing 130 changed files with 115 additions and 5,888 deletions.
8 changes: 4 additions & 4 deletions .env.sandbox.docker-compose-dev
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Common
AkashSandboxDatabaseCS=postgres://postgres:password@db:5432/cloudmos-akash-sandbox
UserDatabaseCS=postgres://postgres:password@db:5432/cloudmos-users
AkashSandboxDatabaseCS=postgres://postgres:password@db:5432/console-akash-sandbox
UserDatabaseCS=postgres://postgres:password@db:5432/console-users
Network=sandbox
ActiveChain=akashSandbox

Expand All @@ -16,5 +16,5 @@ API_SANDBOX_BASE_URL: http://api:3080
# DB
POSTGRES_USER: postgres
POSTGRES_PASSWORD: password
POSTGRES_DBS_FOR_IMPORT: cloudmos-akash-sandbox
POSTGRES_USERS_DB: cloudmos-users
POSTGRES_DBS_FOR_IMPORT: console-akash-sandbox
POSTGRES_USERS_DB: console-users
27 changes: 0 additions & 27 deletions .github/workflows/docker-build-landing.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ build/Release
.grunt
.lock-wscript
.next
public/sw*
public/workbox-*
out
dist
build.ps1
Expand Down
2 changes: 1 addition & 1 deletion BUILD.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Cloudmos Monorepo
# Console Monorepo

## Projects

Expand Down
37 changes: 15 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<div align="left">

<a href="https://aimeos.org/">
<img src="./apps/deploy-web/public/android-chrome-192x192.png" alt="Cloudmos logo" title="Cloudmos" align="left" height="40" />
<img src="./apps/deploy-web/public/android-chrome-192x192.png" alt="Akash logo" title="Akash Console" align="left" height="40" />
</a>

# Cloudmos
# Akash Console

**Cloudmos** is an app that let's you deploy any [docker container](https://www.docker.com/) on the [Akash Network](https://akash.network) in a few clicks... 🛠
**Akash Console** is an app that let's you deploy any [docker container](https://www.docker.com/) on the [Akash Network](https://akash.network) in a few clicks... 🛠

![version](https://img.shields.io/github/stars/akash-network/cloudmos)
![license](https://img.shields.io/github/license/akash-network/cloudmos)
[![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/bukotsunikki.svg?style=social&label=Follow%20cloudmosio)](https://twitter.com/cloudmosio)
![version](https://img.shields.io/github/stars/akash-network/console)
![license](https://img.shields.io/github/license/akash-network/console)
[![X URL](https://img.shields.io/x/url/https/x.com/bukotsunikki.svg?style=social&label=Follow%20akashnet_)](https://x.com/akashnet_)
[![https://discord.gg/akash](https://img.shields.io/badge/discord-join-7289DA.svg?logo=discord&longCache=true&style=flat)](https://discord.gg/akash)

</div>
Expand All @@ -28,7 +28,7 @@
We use `docker` with `docker compose` to run the services. This is the easiest way to get started. For instance to run the deploy-web service:

```bash
git clone [email protected]:akash-network/cloudmos.git ./console
git clone [email protected]:akash-network/console.git ./console
cd console
npm run dc:up:dev -- deploy-web
```
Expand All @@ -49,7 +49,7 @@ Every services are nodejs applications written in typescript. They are deployed

Website to deploy on Akash. It is using the Next.js framework. The data shown in the website comes from a combination of our [API](#api) and akash nodes (REST).

Url: [deploy.cloudmos.io](https://deploy.cloudmos.io)
Url: [console.akash.network](https://console.akash.network)
Directory: [deploy-web](/deploy-web/)

## Provider Proxy
Expand All @@ -73,13 +73,6 @@ Fetch the latest blocks from RPC nodes. Saves the blocks & stats to our Indexer

Directory: [indexer](/indexer/)

## Landing Page

Small landing page with a button to "Launch App".

Url: [cloudmos.io](https://cloudmos.io/)
Directory: [landing](/landing/)

## Config

Directory containing public config file that are fetch by the deploy tool. This is to allow modifying some configurations on the spot without the need to redeploy the web interface.
Expand Down Expand Up @@ -180,13 +173,13 @@ The database schemas is defined using [sequelize-typescript](https://github.com/
|txCount|integer
|isProcessed|boolean|`false` when inserted into the database and then set to `true` once the indexers have processed every messages in the block.
|totalTxCount|bigint| Global tx count as of this height (for historical tx count graphs).
|totalUAktSpent|double|Cummulative uakt spent on deployments as of this block. ||[Graph](https://deploy.cloudmos.io/graph/total-akt-spent)
|activeLeaseCount|integer|Currently active lease count as of this block. [Graph](https://deploy.cloudmos.io/graph/active-deployment)
|totalLeaseCount|integer|Cummulative lease count as of this block. [Graph](https://deploy.cloudmos.io/graph/all-time-deployment-count)
|activeCPU|integer|Currently leased CPU as of this block. [Graph](https://deploy.cloudmos.io/graph/compute)
|activeMemory|bigint|Currently leased Memory as of this block. [Graph](https://deploy.cloudmos.io/graph/memory)
|activeEphemeralStorage|bigint|Currently leased Ephemeral Storage as of this block. [Graph](https://deploy.cloudmos.io/graph/storage)
|activePersistentStorage|bigint|Currently leased Persistent Storage as of this block. [Graph](https://deploy.cloudmos.io/graph/storage)
|totalUAktSpent|double|Cummulative uakt spent on deployments as of this block. ||[Graph](https://stats.akash.network/graph/total-akt-spent)
|activeLeaseCount|integer|Currently active lease count as of this block. [Graph](https://stats.akash.network/graph/active-deployment)
|totalLeaseCount|integer|Cummulative lease count as of this block. [Graph](https://stats.akash.network/graph/all-time-deployment-count)
|activeCPU|integer|Currently leased CPU as of this block. [Graph](https://stats.akash.network/graph/compute)
|activeMemory|bigint|Currently leased Memory as of this block. [Graph](https://stats.akash.network/graph/memory)
|activeEphemeralStorage|bigint|Currently leased Ephemeral Storage as of this block. [Graph](https://stats.akash.network/graph/storage)
|activePersistentStorage|bigint|Currently leased Persistent Storage as of this block. [Graph](https://stats.akash.network/graph/storage)
|activeProviderCount|integer|Provider count as of this block. This only consider on-chain data and does not include uptime checks.

## Transaction
Expand Down
2 changes: 1 addition & 1 deletion apps/api/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# Cloudmos API
# Console API

- [Environment Variables](#environment-variables)
- [How to run](#how-to-run)
Expand Down
6 changes: 3 additions & 3 deletions apps/api/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "cloudmos-api",
"name": "console-api",
"version": "2.18.6",
"description": "Api providing data to the deploy tool",
"repository": {
"type": "git",
"url": "git+https://github.com/akash-network/cloudmos"
"url": "git+https://github.com/akash-network/console"
},
"license": "Apache-2.0",
"author": "Cloudmos",
"author": "Akash Network",
"main": "server.js",
"scripts": {
"build": "webpack --config webpack.prod.js",
Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/routers/apiRouter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function registerApiVersion(version: string, baseRouter: OpenAPIHono, versionRou
openapi: "3.0.0",
servers: [{ url: `${env.ServerOrigin}/${version}` }],
info: {
title: "Cloudmos API",
title: "Console API",
description: "Access Akash data from our indexer",
version: version
}
Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/routers/internalRouter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ internalRouter.doc(`/doc`, {
openapi: "3.0.0",
servers: [{ url: `${env.ServerOrigin}/internal` }],
info: {
title: "Cloudmos Internal API",
title: "Console Internal API",
description: "APIs for internal use that are not part of the public API. There is no garantees of stability or backward compatibility.",
version: "test"
}
Expand Down
6 changes: 3 additions & 3 deletions apps/api/src/routes/v1/nodes/nodeClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export class NodeClient {

@Memoize()
async getMainnetNodes() {
return await this.get<Node[]>("cloudmos/main/config/mainnet-nodes.json");
return await this.get<Node[]>("console/main/config/mainnet-nodes.json");
}

@Memoize()
Expand All @@ -28,7 +28,7 @@ export class NodeClient {

@Memoize()
async getSandboxNodes() {
return await this.get<Node[]>("cloudmos/main/config/sandbox-nodes.json");
return await this.get<Node[]>("console/main/config/sandbox-nodes.json");
}

@Memoize()
Expand All @@ -38,7 +38,7 @@ export class NodeClient {

@Memoize()
async getTestnetNodes() {
return await this.get<Node[]>("cloudmos/main/config/testnet-nodes.json");
return await this.get<Node[]>("console/main/config/testnet-nodes.json");
}

@Memoize()
Expand Down
6 changes: 3 additions & 3 deletions apps/api/src/services/external/githubService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export function getOctokit() {

return new Octokit({
auth: githubPAT,
userAgent: "Cloudmos API",
userAgent: "Console API",
baseUrl: "https://api.github.com"
});
}
Expand All @@ -24,15 +24,15 @@ export const getProviderAttributesSchema = async (): Promise<ProviderAttributesS
const response = await cacheResponse(
30,
cacheKeys.getProviderAttributesSchema,
async () => await axios.get<ProviderAttributesSchema>("https://raw.githubusercontent.com/akash-network/cloudmos/main/config/provider-attributes.json")
async () => await axios.get<ProviderAttributesSchema>("https://raw.githubusercontent.com/akash-network/console/main/config/provider-attributes.json")
);

return response.data;
};

export async function getAuditors() {
const response = await cacheResponse(60 * 5, cacheKeys.getAuditors, async () => {
const res = await axios.get<Auditor[]>("https://raw.githubusercontent.com/akash-network/cloudmos/main/config/auditors.json");
const res = await axios.get<Auditor[]>("https://raw.githubusercontent.com/akash-network/console/main/config/auditors.json");
return res.data;
});

Expand Down
4 changes: 2 additions & 2 deletions apps/api/src/utils/coin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ export function coinToAsset(coin: Coin) {
if (coin.denom === "uakt") {
return {
symbol: "AKT",
logoUrl: "https://cloudmos.io/images/akash-logo.svg",
logoUrl: "https://console.akash.network/images/akash-logo.svg",
amount: parseInt(coin.amount) / 1_000_000
};
} else if (coin.denom === "akt") {
return {
symbol: "AKT",
logoUrl: "https://cloudmos.io/images/akash-logo.svg",
logoUrl: "https://console.akash.network/images/akash-logo.svg",
amount: parseFloat(coin.amount)
};
} else {
Expand Down
2 changes: 1 addition & 1 deletion apps/api/test/functional/nodes-v1.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ describe("Nodes API", () => {
describe("GET /nodes/*", () => {
it.each(["mainnet", "sandbox", "testnet"])("should return %s node", async network => {
const node = NodeSeeder.create();
interceptor.get(`/cloudmos/main/config/${network}-nodes.json`).times(1).reply(200, node);
interceptor.get(`/console/main/config/${network}-nodes.json`).times(1).reply(200, node);

const resInit = await app.request(`v1/nodes/${network}`);
expect(resInit.status).toBe(200);
Expand Down
18 changes: 8 additions & 10 deletions apps/deploy-web/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,28 @@ version: "2.0"

services:
web:
image: redm4x/cloudmos-deploy:<version>
image: redm4x/console-deploy:<version>
depends-on: proxy
env:
# - API_BASE_URL=<API_URL_OVERRIDE>
# - NEXT_PUBLIC_GA_MEASUREMENT_ID=<GA_MEASUREMENT_ID>
# - NEXT_PUBLIC_SENTRY_DSN=<SENTRY_DSN>
# - NEXT_PUBLIC_SENTRY_SERVER_NAME=<SERVER_NAME>
# - API_BASE_URL=<API_URL_OVERRIDE>
# - NEXT_PUBLIC_GA_MEASUREMENT_ID=<GA_MEASUREMENT_ID>
# - NEXT_PUBLIC_SENTRY_DSN=<SENTRY_DSN>
# - NEXT_PUBLIC_SENTRY_SERVER_NAME=<SERVER_NAME>
- MAINTENANCE_MODE=false
expose:
- port: 3001
as: 80
accept:
- deploybeta.cloudmos.io
- deploy.cloudmos.io
- console.akash.network
to:
- global: true
proxy:
image: redm4x/cloudmos-provider-proxy:1.0.0-test1
image: redm4x/console-provider-proxy:1.0.0-test1
expose:
- port: 3040
as: 80
accept:
- deployproxybeta.cloudmos.io
- providerproxy.cloudmos.io
- providerproxy.console.akash.network
to:
- global: true
profiles:
Expand Down
Loading

0 comments on commit ae272e8

Please sign in to comment.