From 1054e78077342a9b9565f796b4e8af5e2656b1c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Quentin=20Guid=C3=A9e?= <git@arra.red>
Date: Wed, 31 Jan 2024 08:04:44 -0500
Subject: [PATCH] Remove all /app in the pathname
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Quentin Guidée <git@arra.red>
---
 cypress/e2e/apps/vx-instances.cy.ts           | 18 +++---
 src/App.tsx                                   | 64 +++++++++----------
 .../AdminSettings/SettingsApp/SettingsApp.tsx | 10 +--
 .../Containers/pages/Container/Container.tsx  | 16 ++---
 .../pages/ContainersApp/ContainersApp.tsx     |  4 +-
 .../MonitoringApp/MonitoringApp.tsx           |  4 +-
 .../ReverseProxyApp/ReverseProxyApp.tsx       |  2 +-
 src/apps/Sql/SqlApp/SqlApp.tsx                |  4 +-
 src/apps/Sql/SqlDatabase/SqlDatabase.tsx      |  2 +-
 src/apps/Tunnels/TunnelsApp/TunnelsApp.tsx    |  2 +-
 .../ContainerInstaller/ContainerInstaller.tsx |  2 +-
 src/components/Dock/Dock.tsx                  |  2 +-
 src/components/Dock/DockDrawer.tsx            |  2 +-
 src/components/Header/Header.tsx              | 10 +--
 14 files changed, 66 insertions(+), 76 deletions(-)

diff --git a/cypress/e2e/apps/vx-instances.cy.ts b/cypress/e2e/apps/vx-instances.cy.ts
index cb1ed0eb..9d2e218b 100644
--- a/cypress/e2e/apps/vx-instances.cy.ts
+++ b/cypress/e2e/apps/vx-instances.cy.ts
@@ -1,41 +1,41 @@
 const createContainerAndNavigate = (to: string) => {
-    cy.visit("/app/containers");
+    cy.visit("/containers");
     cy.request(
         "POST",
         "http://localhost:6130/api/service/postgres/install"
     ).then((res: any) => {
-        cy.visit(`/app/containers/${res.body.uuid}${to}`);
+        cy.visit(`/containers/${res.body.uuid}${to}`);
     });
 };
 
 describe("The Vertex Containers app", () => {
     it("loads", () => {
-        cy.visit("/app/containers");
+        cy.visit("/containers");
     });
 
     it("can create a new container", () => {
         // Navigate to the create container page
-        cy.visit("/app/containers");
+        cy.visit("/containers");
         cy.contains("Create container").click();
-        cy.url().should("include", "/app/containers/add");
+        cy.url().should("include", "/containers/add");
 
         // Create an container
         cy.contains("Postgres").click();
         cy.get("button").contains("Create container").click();
 
         // Go back
-        cy.visit("/app/containers");
+        cy.visit("/containers");
         cy.contains("Postgres");
     });
 
     it("can navigate to an container", () => {
         cy.request(
             "POST",
-            "http://localhost:6130/api/app/containers/service/postgres/install"
+            "http://localhost:6130/api/containers/service/postgres/install"
         );
 
         // Navigate to
-        cy.visit("/app/containers");
+        cy.visit("/containers");
         cy.contains("Postgres").click();
     });
 
@@ -72,7 +72,7 @@ describe("The Vertex Containers app", () => {
 
     it("can delete an container", () => {
         // Go to the containers page
-        cy.visit("/app/containers");
+        cy.visit("/containers");
 
         // Create an container
         createContainerAndNavigate("/");
diff --git a/src/App.tsx b/src/App.tsx
index 83d20c26..f23474fe 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -113,115 +113,109 @@ function AllRoutes() {
                         </Route>
                         <Route
                             path="/"
-                            element={<Navigate to="/app/containers" />}
+                            element={<Navigate to="/containers" />}
                             index
                         />
+                        <Route path="/containers" element={<ContainersApp />} />
                         <Route
-                            path="/app/containers"
-                            element={<ContainersApp />}
-                        />
-                        <Route
-                            path="/app/containers/add"
+                            path="/containers/add"
                             element={<ContainersStore />}
                         />
                         <Route
-                            path="/app/devtools-service-editor"
+                            path="/devtools-service-editor"
                             element={<ServiceEditor />}
                         />
-                        <Route path="/app/sql" element={<SqlApp />}>
+                        <Route path="/sql" element={<SqlApp />}>
                             <Route
-                                path="/app/sql/install"
+                                path="/sql/install"
                                 element={<SqlInstaller />}
                             />
                             <Route
-                                path="/app/sql/db/:uuid"
+                                path="/sql/db/:uuid"
                                 element={<SqlDatabase />}
                             />
                         </Route>
-                        <Route
-                            path="/app/monitoring"
-                            element={<MonitoringApp />}
-                        >
+                        <Route path="/monitoring" element={<MonitoringApp />}>
                             <Route
-                                path="/app/monitoring/prometheus"
+                                path="/monitoring/prometheus"
                                 element={<Prometheus />}
                             />
                             <Route
-                                path="/app/monitoring/grafana"
+                                path="/monitoring/grafana"
                                 element={<Grafana />}
                             />
                         </Route>
-                        <Route path="/app/tunnels" element={<TunnelsApp />}>
+                        <Route path="/tunnels" element={<TunnelsApp />}>
                             <Route
-                                path="/app/tunnels/cloudflare"
+                                path="/tunnels/cloudflare"
                                 element={<CloudflareTunnels />}
                             />
                         </Route>
                         <Route
-                            path="/app/reverse-proxy"
+                            path="/reverse-proxy"
                             element={<ReverseProxyApp />}
                         >
                             <Route
-                                path="/app/reverse-proxy/vertex"
+                                path="/reverse-proxy/vertex"
                                 element={<VertexReverseProxy />}
                             />
                         </Route>
                         <Route
-                            path="/app/containers/:uuid/"
+                            path="/containers/:uuid/"
                             element={<ContainerDetails />}
                         >
                             <Route
-                                path="/app/containers/:uuid/home"
+                                path="/containers/:uuid/home"
                                 element={<ContainerHome />}
                             />
                             <Route
-                                path="/app/containers/:uuid/docker"
+                                path="/containers/:uuid/docker"
                                 element={<ContainerDocker />}
                             />
                             <Route
-                                path="/app/containers/:uuid/logs"
+                                path="/containers/:uuid/logs"
                                 element={<ContainerLogs />}
                             />
                             <Route
-                                path="/app/containers/:uuid/environment"
+                                path="/containers/:uuid/environment"
                                 element={<ContainerEnv />}
                             />
                             <Route
-                                path="/app/containers/:uuid/database"
+                                path="/containers/:uuid/database"
                                 element={<ContainerDetailsDatabase />}
                             />
                             <Route
-                                path="/app/containers/:uuid/update"
+                                path="/containers/:uuid/update"
                                 element={<ContainerUpdate />}
                             />
                             <Route
-                                path="/app/containers/:uuid/settings"
+                                path="/containers/:uuid/settings"
                                 element={<ContainerSettings />}
                             />
                         </Route>
-                        <Route path="/app/admin" element={<SettingsApp />}>
+                        <Route path="/admin" element={<SettingsApp />}>
                             <Route
-                                path="/app/admin/theme"
+                                path="/admin/theme"
                                 element={<SettingsTheme />}
                             />
                             <Route
-                                path="/app/admin/notifications"
+                                path="/admin/notifications"
                                 element={<SettingsNotifications />}
                             />
                             <Route
-                                path="/app/admin/database"
+                                path="/admin/database"
                                 element={<SettingsDb />}
                             />
                             <Route
-                                path="/app/admin/updates"
+                                path="/admin/updates"
                                 element={<SettingsUpdates />}
                             />
                             <Route
-                                path="/app/admin/checks"
+                                path="/admin/checks"
                                 element={<SettingsChecks />}
                             />
                             <Route
-                                path="/app/admin/about"
+                                path="/admin/about"
                                 element={<SettingsAbout />}
                             />
                         </Route>
diff --git a/src/apps/AdminSettings/SettingsApp/SettingsApp.tsx b/src/apps/AdminSettings/SettingsApp/SettingsApp.tsx
index 84cc2b9f..2c36b728 100644
--- a/src/apps/AdminSettings/SettingsApp/SettingsApp.tsx
+++ b/src/apps/AdminSettings/SettingsApp/SettingsApp.tsx
@@ -12,29 +12,29 @@ export default function SettingsApp() {
                 <Sidebar.Item
                     label="Theme"
                     icon={<MaterialIcon icon="palette" />}
-                    link={l("/app/admin/theme")}
+                    link={l("/admin/theme")}
                 />
             </Sidebar.Group>
             <Sidebar.Group title="Administration">
                 <Sidebar.Item
                     label="Notifications"
                     icon={<MaterialIcon icon="notifications" />}
-                    link={l("/app/admin/notifications")}
+                    link={l("/admin/notifications")}
                 />
                 <Sidebar.Item
                     label="Updates"
                     icon={<MaterialIcon icon="update" />}
-                    link={l("/app/admin/updates")}
+                    link={l("/admin/updates")}
                 />
                 <Sidebar.Item
                     label="Checks"
                     icon={<MaterialIcon icon="checklist" />}
-                    link={l("/app/admin/checks")}
+                    link={l("/admin/checks")}
                 />
                 <Sidebar.Item
                     label="About"
                     icon={<MaterialIcon icon="info" />}
-                    link={l("/app/admin/about")}
+                    link={l("/admin/about")}
                 />
             </Sidebar.Group>
         </Sidebar>
diff --git a/src/apps/Containers/pages/Container/Container.tsx b/src/apps/Containers/pages/Container/Container.tsx
index 9e5a9f83..95aa502e 100644
--- a/src/apps/Containers/pages/Container/Container.tsx
+++ b/src/apps/Containers/pages/Container/Container.tsx
@@ -59,7 +59,7 @@ export default function ContainerDetails() {
 
     const mutationDeleteContainer = useMutation({
         mutationFn: () => API.deleteContainer(uuid),
-        onSuccess: () => navigate("/app/containers"),
+        onSuccess: () => navigate("/containers"),
     });
     const {
         isLoading: isDeleting,
@@ -78,38 +78,38 @@ export default function ContainerDetails() {
                 <Sidebar.Item
                     label="Home"
                     icon={<MaterialIcon icon="home" />}
-                    link={l(`/app/containers/${uuid}/home`)}
+                    link={l(`/containers/${uuid}/home`)}
                 />
             </Sidebar.Group>
             <Sidebar.Group title="Analyze">
                 <Sidebar.Item
                     label="Logs"
                     icon={<MaterialIcon icon="terminal" />}
-                    link={l(`/app/containers/${uuid}/logs`)}
+                    link={l(`/containers/${uuid}/logs`)}
                 />
                 <Sidebar.Item
                     label="Docker"
                     icon={<SiDocker size={20} />}
-                    link={l(`/app/containers/${uuid}/docker`)}
+                    link={l(`/containers/${uuid}/docker`)}
                 />
             </Sidebar.Group>
             <Sidebar.Group title="Manage">
                 <Sidebar.Item
                     label="Environment"
                     icon={<MaterialIcon icon="tune" />}
-                    link={l(`/app/containers/${uuid}/environment`)}
+                    link={l(`/containers/${uuid}/environment`)}
                 />
                 {container?.databases && (
                     <Sidebar.Item
                         label="Database"
                         icon={<MaterialIcon icon="database" />}
-                        link={l(`/app/containers/${uuid}/database`)}
+                        link={l(`/containers/${uuid}/database`)}
                     />
                 )}
                 <Sidebar.Item
                     icon={<MaterialIcon icon="update" />}
                     label="Update"
-                    link={l(`/app/containers/${uuid}/update`)}
+                    link={l(`/containers/${uuid}/update`)}
                     notifications={
                         container?.service_update?.available ? 1 : undefined
                     }
@@ -117,7 +117,7 @@ export default function ContainerDetails() {
                 <Sidebar.Item
                     label="Settings"
                     icon={<MaterialIcon icon="settings" />}
-                    link={l(`/app/containers/${uuid}/settings`)}
+                    link={l(`/containers/${uuid}/settings`)}
                 />
                 <Sidebar.Item
                     label="Delete"
diff --git a/src/apps/Containers/pages/ContainersApp/ContainersApp.tsx b/src/apps/Containers/pages/ContainersApp/ContainersApp.tsx
index 5a206fe9..861e2ea6 100644
--- a/src/apps/Containers/pages/ContainersApp/ContainersApp.tsx
+++ b/src/apps/Containers/pages/ContainersApp/ContainersApp.tsx
@@ -37,7 +37,7 @@ const ToolbarContainers = (props: ToolbarProps) => {
             <Spacer />
             <Button
                 variant="colored"
-                onClick={() => navigate("/app/containers/add")}
+                onClick={() => navigate("/containers/add")}
                 rightIcon={<MaterialIcon icon="add" />}
             >
                 Create container
@@ -111,7 +111,7 @@ export default function ContainersApp() {
                                 key={c.id}
                                 container={{
                                     value: c,
-                                    to: `/app/containers/${c.id}/`,
+                                    to: `/containers/${c.id}/`,
                                     onPower: async () =>
                                         mutationPower.mutate(c.id),
                                 }}
diff --git a/src/apps/Monitoring/MonitoringApp/MonitoringApp.tsx b/src/apps/Monitoring/MonitoringApp/MonitoringApp.tsx
index 9e52b7ec..0d8a8c26 100644
--- a/src/apps/Monitoring/MonitoringApp/MonitoringApp.tsx
+++ b/src/apps/Monitoring/MonitoringApp/MonitoringApp.tsx
@@ -42,7 +42,7 @@ export default function MonitoringApp() {
                 <Sidebar.Item
                     label="Prometheus"
                     icon={<SiPrometheus size={20} />}
-                    link={l("/app/monitoring/prometheus")}
+                    link={l("/monitoring/prometheus")}
                     trailing={
                         prometheusContainer && (
                             <ContainerLed
@@ -57,7 +57,7 @@ export default function MonitoringApp() {
                 <Sidebar.Item
                     label="Grafana"
                     icon={<SiGrafana size={20} />}
-                    link={l("/app/monitoring/grafana")}
+                    link={l("/monitoring/grafana")}
                     trailing={
                         grafanaContainer && (
                             <ContainerLed
diff --git a/src/apps/ReverseProxy/ReverseProxyApp/ReverseProxyApp.tsx b/src/apps/ReverseProxy/ReverseProxyApp/ReverseProxyApp.tsx
index 62390b37..a3e3dd92 100644
--- a/src/apps/ReverseProxy/ReverseProxyApp/ReverseProxyApp.tsx
+++ b/src/apps/ReverseProxy/ReverseProxyApp/ReverseProxyApp.tsx
@@ -13,7 +13,7 @@ export default function ReverseProxyApp() {
                 <Sidebar.Item
                     label="Vertex Reverse Proxy"
                     icon={<MaterialIcon icon="router" />}
-                    link={l("/app/reverse-proxy/vertex")}
+                    link={l("/reverse-proxy/vertex")}
                 />
             </Sidebar.Group>
         </Sidebar>
diff --git a/src/apps/Sql/SqlApp/SqlApp.tsx b/src/apps/Sql/SqlApp/SqlApp.tsx
index 271e9f04..2d3b972a 100644
--- a/src/apps/Sql/SqlApp/SqlApp.tsx
+++ b/src/apps/Sql/SqlApp/SqlApp.tsx
@@ -36,7 +36,7 @@ export default function SqlApp() {
                                 key={c?.id}
                                 label={c?.name}
                                 icon={icon}
-                                link={l(`/app/sql/db/${c?.id}`)}
+                                link={l(`/sql/db/${c?.id}`)}
                                 trailing={
                                     c && (
                                         <ContainerLed
@@ -54,7 +54,7 @@ export default function SqlApp() {
                 <Sidebar.Item
                     label="Installer"
                     icon={<MaterialIcon icon="download" />}
-                    link={l("/app/sql/install")}
+                    link={l("/sql/install")}
                 />
             </Sidebar.Group>
         </Sidebar>
diff --git a/src/apps/Sql/SqlDatabase/SqlDatabase.tsx b/src/apps/Sql/SqlDatabase/SqlDatabase.tsx
index 0b86b89a..0fb682a3 100644
--- a/src/apps/Sql/SqlDatabase/SqlDatabase.tsx
+++ b/src/apps/Sql/SqlDatabase/SqlDatabase.tsx
@@ -98,7 +98,7 @@ export default function SqlDatabase() {
                         value: container ?? {
                             id: uuidv4(),
                         },
-                        to: `/app/containers/${container?.id}`,
+                        to: `/containers/${container?.id}`,
                         onPower: () => onPower(container),
                     }}
                 />
diff --git a/src/apps/Tunnels/TunnelsApp/TunnelsApp.tsx b/src/apps/Tunnels/TunnelsApp/TunnelsApp.tsx
index 905f1e45..c8e36a1f 100644
--- a/src/apps/Tunnels/TunnelsApp/TunnelsApp.tsx
+++ b/src/apps/Tunnels/TunnelsApp/TunnelsApp.tsx
@@ -36,7 +36,7 @@ export default function TunnelsApp() {
                 <Sidebar.Item
                     label="Cloudflare Tunnel"
                     icon={<SiCloudflare size={20} />}
-                    link={l("/app/tunnels/cloudflare")}
+                    link={l("/tunnels/cloudflare")}
                     trailing={
                         container && (
                             <ContainerLed small status={container?.status} />
diff --git a/src/components/ContainerInstaller/ContainerInstaller.tsx b/src/components/ContainerInstaller/ContainerInstaller.tsx
index a325ead4..afcce916 100644
--- a/src/components/ContainerInstaller/ContainerInstaller.tsx
+++ b/src/components/ContainerInstaller/ContainerInstaller.tsx
@@ -93,7 +93,7 @@ export default function ContainerInstaller(props: Readonly<Props>) {
                     container={{
                         value: container,
                         to: container?.id
-                            ? `/app/containers/${container?.id}`
+                            ? `/containers/${container?.id}`
                             : undefined,
                         onInstall: onInstall,
                         onPower: () => onPower(container),
diff --git a/src/components/Dock/Dock.tsx b/src/components/Dock/Dock.tsx
index 47243865..92b4cb99 100644
--- a/src/components/Dock/Dock.tsx
+++ b/src/components/Dock/Dock.tsx
@@ -82,7 +82,7 @@ export default function Dock() {
                                 ?.map((app) => (
                                     <DockApp
                                         key={app.id}
-                                        to={`/app/${app.id}`}
+                                        to={`/${app.id}`}
                                         {...app}
                                         onClick={() => setDrawerOpen(false)}
                                     />
diff --git a/src/components/Dock/DockDrawer.tsx b/src/components/Dock/DockDrawer.tsx
index 93d691e2..a9d74a7a 100644
--- a/src/components/Dock/DockDrawer.tsx
+++ b/src/components/Dock/DockDrawer.tsx
@@ -60,7 +60,7 @@ export default function DockDrawer(props: Props) {
                     ?.map((app) => (
                         <DrawerApp
                             key={app.id}
-                            to={`/app/${app.id}`}
+                            to={`/${app.id}`}
                             {...app}
                             onClick={onClose}
                         />
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index 1e15435f..ebc4dd28 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -28,14 +28,10 @@ export default function (props: Readonly<Props>) {
     const navigate = useNavigate();
     const location = useLocation();
 
-    let to = "/app/containers";
-    let app = undefined;
-    if (location.pathname.startsWith("/app/")) {
-        app = apps?.find((app) => location.pathname.includes(`/app/${app.id}`));
-    }
-
+    let to = "/containers";
+    let app = apps?.find((app) => location.pathname.includes(`/${app.id}`));
     if (app) {
-        to = `/app/${app.id}`;
+        to = `/${app.id}`;
     }
 
     const linkLogo: LinkProps<RouterLinkProps> = {