Merge pull request #2796 from bluewave-labs/develop

develop -> demo

client/src/Pages/Logs/Logs/index.jsx

@@ -51,34 +51,14 @@ const Logs = () => {
 	];
 	return (
 		<Stack gap={theme.spacing(4)}>
-			<Box
-				sx={{
-					position: "sticky",
-					top: theme.spacing(17),
-					backdropFilter: "blur(10px)",
-					paddingY: theme.spacing(5),
-					paddingLeft: theme.spacing(6),
-				}}
-			>
-				<Typography variant="h2">{t("logsPage.description")}</Typography>
-			</Box>
-			<Divider
-				color={theme.palette.accent.main}
-				sx={{
-					position: "sticky",
-					top: theme.spacing(33),
-					backdropFilter: "blur(10px)",
-				}}
-			/>
 
 			<Stack
 				direction="row"
 				alignItems="center"
 				gap={theme.spacing(4)}
-				mt={theme.spacing(10)}
 				sx={{
 					position: "sticky",
-					top: theme.spacing(34),
+					top: theme.spacing(17),
 					backdropFilter: "blur(10px)",
 					paddingTop: theme.spacing(4),
 					paddingLeft: theme.spacing(6),

client/src/Pages/Logs/Queue/index.jsx

@@ -29,8 +29,6 @@ const QueueDetails = () => {
 
 	return (
 		<Stack gap={theme.spacing(4)}>
-			<Typography variant="h2">{t("queuePage.metricsTable.title")}</Typography>
-			<Divider color={theme.palette.accent.main} />
 			<Stack
 				gap={theme.spacing(20)}
 				mt={theme.spacing(10)}

client/src/Pages/Logs/index.jsx

@@ -15,7 +15,7 @@ const Logs = () => {
 	const theme = useTheme();
 
 	// Local state
-	const [value, setValue] = useState(2);
+	const [value, setValue] = useState(0);
 
 	// Handlers
 	const handleChange = (event, newValue) => {

docker/dist-mono/build_images.sh

@@ -5,7 +5,7 @@ cd "$(dirname "$0")"
 cd ../..
 
 # Define service names and their corresponding Dockerfiles in parallel arrays
-services=("mono_mongo" "mono_redis" "mono_server")
+services=("mono_mongo"  "mono_server")
 dockerfiles=(
   "./docker/dist-mono/mongoDB.Dockerfile"
   "./docker/dist-mono/server.Dockerfile"

server/src/index.js

@@ -18,7 +18,7 @@ const startApp = async () => {
 	const __filename = fileURLToPath(import.meta.url);
 	const __dirname = path.dirname(__filename);
 	const openApiSpec = JSON.parse(fs.readFileSync(path.join(__dirname, "../openapi.json"), "utf8"));
-	const frontendPath = path.join(__dirname, "public");
+	const frontendPath = path.join(__dirname, "..", "public");
 
 	// Create services
 	const settingsService = new SettingsService(AppSettings);