diff --git a/changelog.md b/changelog.md
index 49352b5..722e468 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,7 @@
+## Version 0.8.0
+ - Stop showing Docker not connected when first loading status
+ - Add privacy settings to external links
+
## Version 0.7.1 -> 0.7.10
- Fix issue where multiple DBs get created at the setup
- Add more special characters to be used for password validation
diff --git a/client/src/App.jsx b/client/src/App.jsx
index 6d22200..b83485a 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -4,23 +4,68 @@ import * as React from 'react';
import ThemeCustomization from './themes';
import ScrollTop from './components/ScrollTop';
import Snackbar from '@mui/material/Snackbar';
-import {Alert} from '@mui/material';
+import {Alert, Box} from '@mui/material';
+import logo from './assets/images/icons/cosmos.png';
+
+import * as API from './api';
import { setSnackit } from './api/wrap';
// ==============================|| APP - THEME, ROUTER, LOCAL ||============================== //
+const LoadingAnimation = () => (
+
+ );
+
+export let SetPrimaryColor = () => {};
+export let SetSecondaryColor = () => {};
+export let GlobalPrimaryColor = '';
+export let GlobalSecondaryColor = '';
+
const App = () => {
const [open, setOpen] = React.useState(false);
const [message, setMessage] = React.useState('');
const [severity, setSeverity] = React.useState('error');
+ const [statusLoaded, setStatusLoaded] = React.useState(false);
+ const [PrimaryColor, setPrimaryColor] = React.useState(API.PRIMARY_COLOR);
+ const [SecondaryColor, setSecondaryColor] = React.useState(API.SECONDARY_COLOR);
+
+ SetPrimaryColor = (color) => {
+ setPrimaryColor(color);
+ GlobalPrimaryColor = color;
+ }
+
+ SetSecondaryColor = (color) => {
+ setSecondaryColor(color);
+ GlobalSecondaryColor = color;
+ }
+
+ React.useEffect(() => {
+ API.getStatus(true).then((r) => {
+ if(r) {
+ setStatusLoaded(true);
+ }
+ setPrimaryColor(API.PRIMARY_COLOR);
+ setSecondaryColor(API.SECONDARY_COLOR);
+ }).catch(() => {
+ setStatusLoaded(true);
+ setPrimaryColor(API.PRIMARY_COLOR);
+ setSecondaryColor(API.SECONDARY_COLOR);
+ });
+ }, []);
+
setSnackit((message, severity='error') => {
setMessage(message);
setOpen(true);
setSeverity(severity);
})
- return (
-
+
+ return statusLoaded ?
+
{
- )
+
+ :
+
+ {/*
+
Cosmos
);
diff --git a/client/src/components/fileUpload.jsx b/client/src/components/fileUpload.jsx
index eca1932..a7ba9fc 100644
--- a/client/src/components/fileUpload.jsx
+++ b/client/src/components/fileUpload.jsx
@@ -2,7 +2,7 @@ import React from 'react';
import { Button } from '@mui/material';
import { UploadOutlined } from '@ant-design/icons';
-export default function UploadButtons({OnChange, accept}) {
+export default function UploadButtons({OnChange, accept, label}) {
return (
diff --git a/client/src/index.css b/client/src/index.css
index 5c5b5bc..3c6d9ab 100644
--- a/client/src/index.css
+++ b/client/src/index.css
@@ -21,6 +21,58 @@
}
+@keyframes pulsing {
+ 0% { -webkit-transform: scale(1); }
+ 50% { -webkit-transform: scale(1.1); }
+ 100% { -webkit-transform: scale(1); }
+}
+
+@keyframes bounce {
+ 0%, 80%, 100% {
+ transform: scale(0);
+ }
+ 40% {
+ transform: scale(1.0);
+ }
+}
+
+.dot {
+ background-color: #222;
+ border-radius: 100%;
+ width: 1.5rem;
+ height: 1.5rem;
+ margin: 0 0.25rem;
+
+ /* Animation */
+ animation: bounce 1.4s infinite;
+ animation-fill-mode: both;
+}
+
+@media (prefers-color-scheme: dark) {
+ .dot {
+ background-color: #eee;
+ }
+}
+
+.dot:nth-child(1) {
+ animation-delay: -0.32s;
+}
+
+.dot:nth-child(2) {
+ animation-delay: -0.16s;
+}
+
+.dot:nth-child(3) {
+ animation-delay: 0s;
+}
+
+.loader {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100%;
+}
+
.shinyButton {
overflow: hidden;
}
@@ -87,4 +139,8 @@
.raw-table table th, .raw-table table td {
padding: 5px;
border: 1px solid #ccc;
+}
+
+.pulsing {
+ animation: pulsing 2s ease-in-out infinite;
}
\ No newline at end of file
diff --git a/client/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavItem.jsx b/client/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavItem.jsx
index 2be4088..c0750e8 100644
--- a/client/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavItem.jsx
+++ b/client/src/layout/MainLayout/Drawer/DrawerContent/Navigation/NavItem.jsx
@@ -23,7 +23,9 @@ const NavItem = ({ item, level }) => {
itemTarget = '_blank';
}
- let listItemProps = { component: forwardRef((props, ref) => 
*/}
+