Merge pull request #296 from kthcloud/main

Finalize v2 migration
kthcloud · May 31, 2024 · 2064ff4 · 2064ff4
2 parents c64d515 + 3dbe00a
commit 2064ff4
Show file tree

Hide file tree

Showing 48 changed files with 244 additions and 606 deletions.
diff --git a/.env b/.env
@@ -1,5 +1,3 @@
-VITE_API_URL="https://api.cloud.cbh.kth.se"
-VITE_DEPLOY_API_URL="https://api.cloud.cbh.kth.se/deploy/v1"
-VITE_DEPLOY_V2_API_URL="https://api.cloud.cbh.kth.se/deploy/v2"
+VITE_DEPLOY_API_URL="https://api.cloud.cbh.kth.se/deploy/v2"
 VITE_ALERT_API_URL="https://alert.app.cloud.cbh.kth.se/"
 GENERATE_SOURCEMAP=false 
diff --git a/.prettierignore b/.prettierignore
@@ -10,4 +10,5 @@ LICENSE
 public/_redirects
 package.json
 package-lock.json
-bun.lockb
+bun.lockb
+*.xcf
diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,7 @@ ENV VITE_RELEASE_DATE=${RELEASE_DATE}
 ENV VITE_RELEASE_COMMIT=${RELEASE_COMMIT}
 
 ENV VITE_API_URL="https://api.cloud.cbh.kth.se"
-ENV VITE_DEPLOY_API_URL="https://api.cloud.cbh.kth.se/deploy/v1"
+ENV VITE_DEPLOY_API_URL="https://api.cloud.cbh.kth.se/deploy/v2"
 ENV NODE_ENV="production"
 
 WORKDIR /app

diff --git a/bun.lockb b/bun.lockb
diff --git a/index.html b/index.html
@@ -35,9 +35,29 @@
     <body>
         <noscript>
             <h1>cbhcloud</h1>
-            To experience this page properly, please enable JavaScript.
+            Welcome to kthcloud. The console is built in React, meaning you have to enable JavaScript to use it.<br />
+            If you prefer to use the API or Python SDK, find information in the
+            <a href="https://docs.cloud.cbh.kth.se/usage/api/">docs</a>.
         </noscript>
         <div id="root"></div>
+        <script>
+            function updateFaviconPaths() {
+                if (
+                    window.location.hostname === "beta.app.cloud.cbh.kth.se" ||
+                    window.location.hostname === "localhost"
+                ) {
+                    var linkElements = document.querySelectorAll('link[rel*="icon"]');
+
+                    linkElements.forEach(function (link) {
+                        var href = link.getAttribute("href");
+                        if (href && href.startsWith("/favicon/")) {
+                            link.setAttribute("href", href.replace("/favicon/", "/favicon/beta/"));
+                        }
+                    });
+                }
+            }
+            updateFaviconPaths();
+        </script>
         <script type="module" src="/src/main.tsx"></script>
     </body>
 </html>
diff --git a/public/favicon/beta/apple-touch-icon.png b/public/favicon/beta/apple-touch-icon.png
diff --git a/public/favicon/beta/favicon-16x16.png b/public/favicon/beta/favicon-16x16.png
diff --git a/public/favicon/beta/favicon-32x32.png b/public/favicon/beta/favicon-32x32.png
diff --git a/public/favicon/beta/icon.xcf b/public/favicon/beta/icon.xcf
diff --git a/public/favicon/beta/safari-pinned-tab.svg b/public/favicon/beta/safari-pinned-tab.svg
diff --git a/src/api/deploy/discover.ts b/src/api/deploy/discover.ts
@@ -1,4 +1,4 @@
-import { DiscoverRead } from "@kthcloud/go-deploy-types/types/v1/body";
+import { DiscoverRead } from "@kthcloud/go-deploy-types/types/v2/body";
 
 export const discover = async (): Promise<DiscoverRead> => {
   const res = await fetch(import.meta.env.VITE_DEPLOY_API_URL + "/discover", {

diff --git a/src/api/deploy/v2/gpuGroups.ts → src/api/deploy/gpuGroups.ts b/src/api/deploy/v2/gpuGroups.ts → src/api/deploy/gpuGroups.ts
@@ -1,8 +1,8 @@
-import { Jwt } from "../../../types";
+import { Jwt } from "../../types";
 
 export const listGpuGroups = async (token: Jwt, vmId?: string) => {
   const vmIdQuery = vmId ? `?vmId=${encodeURIComponent(vmId)}` : "";
-  const url = `${import.meta.env.VITE_DEPLOY_V2_API_URL}/gpuGroups${vmIdQuery}`;
+  const url = `${import.meta.env.VITE_DEPLOY_API_URL}/gpuGroups${vmIdQuery}`;
   const response = await fetch(url, {
     method: "GET",
     headers: {
@@ -24,7 +24,7 @@ export const listGpuGroups = async (token: Jwt, vmId?: string) => {
 };
 
 export const getGpuGroup = async (token: Jwt, gpuGroupId: string) => {
-  const url = `${import.meta.env.VITE_DEPLOY_V2_API_URL}/gpuGroups/${gpuGroupId}`;
+  const url = `${import.meta.env.VITE_DEPLOY_API_URL}/gpuGroups/${gpuGroupId}`;
   const response = await fetch(url, {
     method: "GET",
     headers: {

diff --git a/src/api/deploy/v2/gpuLeases.ts → src/api/deploy/gpuLeases.ts b/src/api/deploy/v2/gpuLeases.ts → src/api/deploy/gpuLeases.ts
@@ -1,9 +1,9 @@
 import { GpuLeaseCreate } from "@kthcloud/go-deploy-types/types/v2/body";
-import { Jwt, Uuid } from "../../../types";
+import { Jwt, Uuid } from "../../types";
 
 export const listGpuLeases = async (token: Jwt, vmId?: Uuid) => {
   const vmIdQuery = vmId ? `?vmId=${encodeURIComponent(vmId)}` : "";
-  const url = `${import.meta.env.VITE_DEPLOY_V2_API_URL}/gpuLeases${vmIdQuery}`;
+  const url = `${import.meta.env.VITE_DEPLOY_API_URL}/gpuLeases${vmIdQuery}`;
   const response = await fetch(url, {
     method: "GET",
     headers: {
@@ -18,7 +18,7 @@ export const listGpuLeases = async (token: Jwt, vmId?: Uuid) => {
 };
 
 export const createGpuLease = async (token: Jwt, body: GpuLeaseCreate) => {
-  const url = `${import.meta.env.VITE_DEPLOY_V2_API_URL}/gpuLeases`;
+  const url = `${import.meta.env.VITE_DEPLOY_API_URL}/gpuLeases`;
   const response = await fetch(url, {
     method: "POST",
     headers: {
@@ -35,7 +35,7 @@ export const createGpuLease = async (token: Jwt, body: GpuLeaseCreate) => {
 };
 
 export const getGpuLease = async (token: Jwt, gpuLeaseId: Uuid) => {
-  const url = `${import.meta.env.VITE_DEPLOY_V2_API_URL}/gpuLeases/${gpuLeaseId}`;
+  const url = `${import.meta.env.VITE_DEPLOY_API_URL}/gpuLeases/${gpuLeaseId}`;
   const response = await fetch(url, {
     method: "GET",
     headers: {
@@ -54,7 +54,7 @@ export const updateGpuLease = async (
   gpuLeaseId: Uuid,
   body: any
 ) => {
-  const url = `${import.meta.env.VITE_DEPLOY_V2_API_URL}/gpuLeases/${gpuLeaseId}`;
+  const url = `${import.meta.env.VITE_DEPLOY_API_URL}/gpuLeases/${gpuLeaseId}`;
   const response = await fetch(url, {
     method: "POST",
     headers: {
@@ -71,7 +71,7 @@ export const updateGpuLease = async (
 };
 
 export const deleteGpuLease = async (token: Jwt, gpuLeaseId: Uuid) => {
-  const url = `${import.meta.env.VITE_DEPLOY_V2_API_URL}/gpuLeases/${gpuLeaseId}`;
+  const url = `${import.meta.env.VITE_DEPLOY_API_URL}/gpuLeases/${gpuLeaseId}`;
   const response = await fetch(url, {
     method: "DELETE",
     headers: {

diff --git a/src/api/deploy/resourceMigrations.ts b/src/api/deploy/resourceMigrations.ts
@@ -1,4 +1,4 @@
-import { ResourceMigrationCreate } from "@kthcloud/go-deploy-types/types/v1/body";
+import { ResourceMigrationCreate } from "@kthcloud/go-deploy-types/types/v2/body";
 import { Jwt } from "../../types";
 
 export const createResourceMigration = async (

diff --git a/src/api/deploy/v2/snapshots.ts → src/api/deploy/snapshots.ts b/src/api/deploy/v2/snapshots.ts → src/api/deploy/snapshots.ts
@@ -1,7 +1,7 @@
-import { Jwt } from "../../../types";
+import { Jwt } from "../../types";
 
 export const listVMSnapshots = async (token: Jwt, vmId: string) => {
-  const url = `${import.meta.env.VITE_DEPLOY_V2_API_URL}/vms/${vmId}/snapshots`;
+  const url = `${import.meta.env.VITE_DEPLOY_API_URL}/vms/${vmId}/snapshots`;
   const response = await fetch(url, {
     method: "GET",
     headers: {
@@ -16,7 +16,7 @@ export const listVMSnapshots = async (token: Jwt, vmId: string) => {
 };
 
 export const createVMSnapshot = async (token: Jwt, vmId: string) => {
-  const url = `${import.meta.env.VITE_DEPLOY_V2_API_URL}/vms/${vmId}/snapshots`;
+  const url = `${import.meta.env.VITE_DEPLOY_API_URL}/vms/${vmId}/snapshots`;
   const response = await fetch(url, {
     method: "POST",
     headers: {
@@ -35,7 +35,7 @@ export const getVMSnapshot = async (
   vmId: string,
   snapshotId: string
 ) => {
-  const url = `${import.meta.env.VITE_DEPLOY_V2_API_URL}/vms/${vmId}/snapshot/${snapshotId}`;
+  const url = `${import.meta.env.VITE_DEPLOY_API_URL}/vms/${vmId}/snapshot/${snapshotId}`;
   const response = await fetch(url, {
     method: "POST",
     headers: {
@@ -54,7 +54,7 @@ export const deleteVMSnapshot = async (
   vmId: string,
   snapshotId: string
 ) => {
-  const url = `${import.meta.env.VITE_DEPLOY_V2_API_URL}/vms/${vmId}/snapshot/${snapshotId}`;
+  const url = `${import.meta.env.VITE_DEPLOY_API_URL}/vms/${vmId}/snapshot/${snapshotId}`;
   const response = await fetch(url, {
     method: "DELETE",
     headers: {

diff --git a/src/api/deploy/users.ts b/src/api/deploy/users.ts
@@ -2,7 +2,7 @@ import {
   ApiKeyCreated,
   UserRead,
   UserUpdate,
-} from "@kthcloud/go-deploy-types/types/v1/body";
+} from "@kthcloud/go-deploy-types/types/v2/body";
 import { Jwt, Uuid } from "../../types";
 
 export const getUser = async (

diff --git a/src/api/deploy/v2/vms.ts b/src/api/deploy/v2/vms.ts