- Welcome to the Connect Wizard. This interface will help you expose your ServApp securely to the internet.
+ Welcome to the URL Wizard. This interface will help you expose your ServApp securely to the internet by creating a new URL.
{openModal && !hasCosmosNetwork(openModal.Names[0]) &&
This ServApp does not appear to be connected to a Cosmos Network, so the hostname might not be accessible. The easiest way to fix this is to check the box "Force Secure Network" or manually create a sub-network in Docker.}
@@ -134,8 +134,8 @@ const ServeApps = () => {
Mode: "SERVAPP",
Name: openModal.Names[0].replace('/', ''),
Description: "Expose " + openModal.Names[0].replace('/', '') + " to the internet",
- UseHost: false,
- Host: '',
+ UseHost: true,
+ Host: openModal.Names[0].replace('/', '') + '.' + window.location.origin.split('://')[1],
UsePathPrefix: false,
PathPrefix: '',
Timeout: 30000,
@@ -177,7 +177,7 @@ const ServeApps = () => {
updateRoutes();
}
- }}>Connect
+ }}>Confirm
>}
@@ -278,13 +278,13 @@ const ServeApps = () => {
}
- Proxies
+ URLs
{getContainersRoutes(app.Names[0].replace('/', '')).map((route) => {
return <> {
if(route.UseHost)
@@ -293,21 +293,33 @@ const ServeApps = () => {
window.open(window.location.origin + route.PathPrefix, '_blank');
}}
onDelete={() => {
- window.open('/ui/config/proxy#'+route.Name, '_blank');
+ window.open('/ui/config-url#'+route.Name, '_blank');
}}
deleteIcon={}
/>
>
})}
- {getContainersRoutes(app.Names[0].replace('/', '')).length == 0 &&
- }
+ {/* {getContainersRoutes(app.Names[0].replace('/', '')).length == 0 && */}
+ }
+ onClick={() => {
+ setOpenModal(app);
+ }}
+ onDelete={() => {
+ setOpenModal(app);
+ }}
+ />
+ {/* } */}
-
+ {/*
-
+ */}
})
diff --git a/client/src/routes/MainRoutes.jsx b/client/src/routes/MainRoutes.jsx
index aab4463..f6e4188 100644
--- a/client/src/routes/MainRoutes.jsx
+++ b/client/src/routes/MainRoutes.jsx
@@ -41,15 +41,15 @@ const MainRoutes = {
element:
},
{
- path: '/ui/config/users',
+ path: '/ui/config-users',
element:
},
{
- path: '/ui/config/general',
+ path: '/ui/config-general',
element:
},
{
- path: '/ui/config/proxy',
+ path: '/ui/config-url',
element:
},
]
diff --git a/client/src/themes/theme/index.jsx b/client/src/themes/theme/index.jsx
index 03347aa..89f8540 100644
--- a/client/src/themes/theme/index.jsx
+++ b/client/src/themes/theme/index.jsx
@@ -1,6 +1,9 @@
// ==============================|| PRESET THEME - THEME SELECTOR ||============================== //
+import { purple, pink, deepPurple } from '@mui/material/colors';
+
const Theme = (colors) => {
+ console.log(colors)
const { blue, red, gold, cyan, green, grey } = colors;
const greyColors = {
0: grey[0],
@@ -25,33 +28,10 @@ const Theme = (colors) => {
return {
primary: {
- lighter: '#C8A2C8',
- 100: '#B785B7',
- 200: '#B785B7',
- light: '#A668A6',
- 400: '#A668A6',
- main: '#8D538D',
- dark: '#704270',
- 700: '#533153',
- darker:'#362036',
- 900: '#1A0E1A',
- contrastText
+ main: purple[400],
},
secondary: {
- lighter: greyColors[100],
- 100: greyColors[100],
- 200: greyColors[200],
- light: greyColors[300],
- 400: greyColors[400],
- main: greyColors[500],
- 600: greyColors[600],
- dark: greyColors[700],
- 800: greyColors[800],
- darker: greyColors[900],
- A100: greyColors[0],
- A200: greyColors.A400,
- A300: greyColors.A700,
- contrastText: greyColors[0]
+ main: deepPurple[100]
},
error: {
lighter: red[0],
diff --git a/package.json b/package.json
index dba5103..136c741 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cosmos-server",
- "version": "0.1.14",
+ "version": "0.1.15",
"description": "",
"main": "test-server.js",
"bugs": {