Release 1.7.0

Luligu · Jan 3, 2025 · 08c9d40 · 08c9d40
1 parent 150768b
commit 08c9d40
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,7 @@ It is possible to change the mode (Classic, Dark or Light) in Settings, Matterbr
 - [frontend]: Added dark and light mode to the frontend. Dark mode is now the default mode. It is possible to change the mode in Settings, Matterbridge settings.
 - [frontend]: Custom rfjsreact-jsonschema-form for the config editor.
 - [frontend]: Added columns configuration to Devices.
+- [frontend]: Added clear logs button in Logs.
 - [unregister]: Added unregister for Matterbridge edge. 
 - [reset]: Added reset for Matterbridge edge. 
 - [factoryreset]: Added factoryreset for Matterbridge edge. 

diff --git a/frontend/build/asset-manifest.json b/frontend/build/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
-    "main.css": "./static/css/main.87836c07.css",
-    "main.js": "./static/js/main.3f966bc0.js",
+    "main.css": "./static/css/main.1360336f.css",
+    "main.js": "./static/js/main.5caad8c7.js",
     "static/js/453.abd36b29.chunk.js": "./static/js/453.abd36b29.chunk.js",
     "static/media/roboto-latin-700-normal.woff2": "./static/media/roboto-latin-700-normal.4535474e1cf8598695ad.woff2",
     "static/media/roboto-latin-500-normal.woff2": "./static/media/roboto-latin-500-normal.7077203b1982951ecf76.woff2",
@@ -60,12 +60,12 @@
     "static/media/roboto-greek-ext-300-normal.woff": "./static/media/roboto-greek-ext-300-normal.b590dbe5c639944366d1.woff",
     "static/media/roboto-greek-ext-400-normal.woff": "./static/media/roboto-greek-ext-400-normal.16eb83b4a3b1ea994243.woff",
     "index.html": "./index.html",
-    "main.87836c07.css.map": "./static/css/main.87836c07.css.map",
-    "main.3f966bc0.js.map": "./static/js/main.3f966bc0.js.map",
+    "main.1360336f.css.map": "./static/css/main.1360336f.css.map",
+    "main.5caad8c7.js.map": "./static/js/main.5caad8c7.js.map",
     "453.abd36b29.chunk.js.map": "./static/js/453.abd36b29.chunk.js.map"
   },
   "entrypoints": [
-    "static/css/main.87836c07.css",
-    "static/js/main.3f966bc0.js"
+    "static/css/main.1360336f.css",
+    "static/js/main.5caad8c7.js"
   ]
 }
diff --git a/frontend/build/index.html b/frontend/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.3f966bc0.js"></script><link href="./static/css/main.87836c07.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.5caad8c7.js"></script><link href="./static/css/main.1360336f.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/frontend/build/static/css/main.87836c07.css → frontend/build/static/css/main.1360336f.css b/frontend/build/static/css/main.87836c07.css → frontend/build/static/css/main.1360336f.css
diff --git a/...nd/build/static/css/main.87836c07.css.map → ...nd/build/static/css/main.1360336f.css.map b/...nd/build/static/css/main.87836c07.css.map → ...nd/build/static/css/main.1360336f.css.map
diff --git a/frontend/build/static/js/main.3f966bc0.js.map b/frontend/build/static/js/main.3f966bc0.js.map
diff --git a/frontend/build/static/js/main.3f966bc0.js → frontend/build/static/js/main.5caad8c7.js b/frontend/build/static/js/main.3f966bc0.js → frontend/build/static/js/main.5caad8c7.js
diff --git a/...ld/static/js/main.3f966bc0.js.LICENSE.txt → ...ld/static/js/main.5caad8c7.js.LICENSE.txt b/...ld/static/js/main.3f966bc0.js.LICENSE.txt → ...ld/static/js/main.5caad8c7.js.LICENSE.txt
diff --git a/frontend/build/static/js/main.5caad8c7.js.map b/frontend/build/static/js/main.5caad8c7.js.map
diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -59,9 +59,9 @@
   --main-log-color: var(--main-light-color);
   --main-button-color: #ffffff;
   --main-button-bg-color: var(--primary-color);
-  --main-menu-color: var(--main-bg-color);
-  --main-menu-bg-color: #e2e2e2;
-  --main-menu-hover-color: #959595;
+  --main-menu-color: var(--main-light-color);
+  --main-menu-bg-color: var(--main-bg-color);
+  --main-menu-hover-color: var(--div-bg-color);
   --main-label-color: var(--main-grey-color);
 
   --primary-color: #1976d2;
@@ -107,7 +107,7 @@
   --main-button-color: #ffffff;
   --main-button-bg-color: var(--primary-color);
   --main-menu-color: var(--main-text-color);
-  --main-menu-bg-color: #ffffff;
+  --main-menu-bg-color: var(--div-bg-color);
   --main-menu-hover-color: #85c0d8;
   --main-label-color: var(--main-grey-color);
 

diff --git a/frontend/src/components/Header.js b/frontend/src/components/Header.js
@@ -294,76 +294,76 @@ function Header() {
         <Menu id="command-menu" anchorEl={menuAnchorEl} keepMounted open={Boolean(menuAnchorEl)} onClose={() => handleMenuClose('')} >
           {settings.matterbridgeInformation && !settings.matterbridgeInformation.readOnly && 
             <MenuItem onClick={() => handleMenuClose('update')}>
-              <ListItemIcon><SystemUpdateAltIcon /></ListItemIcon>
+              <ListItemIcon><SystemUpdateAltIcon style={{ color: 'var(--main-icon-color)' }}/></ListItemIcon>
               <ListItemText primary="Update" />
             </MenuItem>
           }
           <MenuItem onClick={() => handleMenuClose('restart')}>
-            <ListItemIcon><RestartAltIcon /></ListItemIcon>
+            <ListItemIcon><RestartAltIcon style={{ color: 'var(--main-icon-color)' }}/></ListItemIcon>
             <ListItemText primary="Restart" />
           </MenuItem>
           {settings.matterbridgeInformation.restartMode === '' ? 
             <MenuItem onClick={() => handleMenuClose('shutdown')}>
-              <ListItemIcon><PowerSettingsNewIcon /></ListItemIcon>
+              <ListItemIcon><PowerSettingsNewIcon style={{ color: 'var(--main-icon-color)' }}/></ListItemIcon>
               <ListItemText primary="Shutdown" />
             </MenuItem>
           : null }
           <Divider />
           <MenuItem onClick={handleDownloadMenuOpen}>
-            <ListItemIcon><DownloadIcon /></ListItemIcon>
+            <ListItemIcon><DownloadIcon style={{ color: 'var(--main-icon-color)' }}/></ListItemIcon>
             <ListItemText primary="Download" />
           </MenuItem>
           <Menu id="sub-menu-download" anchorEl={downloadMenuAnchorEl} keepMounted open={Boolean(downloadMenuAnchorEl)} onClose={handleDownloadMenuClose} sx={{ '& .MuiPaper-root': { backgroundColor: '#e2e2e2' } }}>
             <MenuItem onClick={() => { handleMenuClose('download-mblog'); handleDownloadMenuClose(); }}>
-                <ListItemIcon><DownloadIcon /></ListItemIcon>
+                <ListItemIcon><DownloadIcon style={{ color: 'var(--main-icon-color)' }}/></ListItemIcon>
                 <ListItemText primary="Matterbridge log" />
             </MenuItem>
             <MenuItem onClick={() => { handleMenuClose('download-mjlog'); handleDownloadMenuClose(); }}>
-                <ListItemIcon><DownloadIcon /></ListItemIcon>
+                <ListItemIcon><DownloadIcon style={{ color: 'var(--main-icon-color)' }}/></ListItemIcon>
                 <ListItemText primary="Matter log" />
             </MenuItem>
             <MenuItem onClick={() => { handleMenuClose('download-mbstorage'); handleDownloadMenuClose(); }}>
-                <ListItemIcon><DownloadIcon /></ListItemIcon>
+                <ListItemIcon><DownloadIcon style={{ color: 'var(--main-icon-color)' }}/></ListItemIcon>
                 <ListItemText primary="Matterbridge storage" />
             </MenuItem>
             <MenuItem onClick={() => { handleMenuClose('download-mjstorage'); handleDownloadMenuClose(); }}>
-                <ListItemIcon><DownloadIcon /></ListItemIcon>
+                <ListItemIcon><DownloadIcon style={{ color: 'var(--main-icon-color)' }}/></ListItemIcon>
                 <ListItemText primary="Matter storage" />
             </MenuItem>
           </Menu>
 
           <Divider />
           <MenuItem onClick={handleBackupMenuOpen}>
-            <ListItemIcon><SaveIcon /></ListItemIcon>
+            <ListItemIcon><SaveIcon style={{ color: 'var(--main-icon-color)' }}/></ListItemIcon>
             <ListItemText primary="Backup" />
           </MenuItem>
           <Menu id="sub-menu-backup" anchorEl={backupMenuAnchorEl} keepMounted open={Boolean(backupMenuAnchorEl)} onClose={handleBackupMenuClose} sx={{ '& .MuiPaper-root': { backgroundColor: '#e2e2e2' } }}>
             <MenuItem onClick={() => { handleMenuClose('create-backup'); handleBackupMenuClose(); }}>
-              <ListItemIcon><SaveIcon /></ListItemIcon>
+              <ListItemIcon><SaveIcon style={{ color: 'var(--main-icon-color)' }}/></ListItemIcon>
               <ListItemText primary="Create backup" />
             </MenuItem>
             <MenuItem onClick={() => { handleMenuClose('download-backup'); handleBackupMenuClose(); }}>
-              <ListItemIcon><SaveIcon /></ListItemIcon>
+              <ListItemIcon><SaveIcon style={{ color: 'var(--main-icon-color)' }}/></ListItemIcon>
               <ListItemText primary="Download backup" />
             </MenuItem>
           </Menu>
 
           <Divider />
           <MenuItem onClick={handleResetMenuOpen}>
-            <ListItemIcon><ReportProblemIcon /></ListItemIcon>
+            <ListItemIcon><ReportProblemIcon style={{ color: 'var(--main-icon-color)' }}/></ListItemIcon>
             <ListItemText primary="Reset" />
           </MenuItem>
           <Menu id="sub-menu-reset" anchorEl={resetMenuAnchorEl} keepMounted open={Boolean(resetMenuAnchorEl)} onClose={handleResetMenuClose} sx={{ '& .MuiPaper-root': { backgroundColor: '#e2e2e2' } }}>
             <MenuItem onClick={() => { handleResetMenuClose(); handleActionWithConfirmCancel('Reset all devices and shutdown', 'Are you sure you want to unregister all devices? This will temporarily remove all devices from the controller and you may loose the controller configuration.', 'unregister'); }}>
-              <ListItemIcon><PowerSettingsNewIcon /></ListItemIcon>
+              <ListItemIcon><PowerSettingsNewIcon style={{ color: 'var(--main-icon-color)' }}/></ListItemIcon>
               <ListItemText primary="Reset all devices..." />
             </MenuItem>
             <MenuItem onClick={() => { handleResetMenuClose(); handleActionWithConfirmCancel('Reset commissioning and shutdown', 'Are you sure you want to reset the commissioning? You will have to manually remove Matterbridge from the controller.', 'reset'); }}>
-              <ListItemIcon><PowerSettingsNewIcon /></ListItemIcon>
+              <ListItemIcon><PowerSettingsNewIcon style={{ color: 'var(--main-icon-color)' }}/></ListItemIcon>
               <ListItemText primary="Reset commissioning..." />
             </MenuItem>
             <MenuItem onClick={() => { handleResetMenuClose(); handleActionWithConfirmCancel('Factory reset and shutdown', 'Are you sure you want to factory reset Matterbridge? You will have to manually remove Matterbridge from the controller.', 'factoryreset'); }}>
-              <ListItemIcon><PowerSettingsNewIcon /></ListItemIcon>
+              <ListItemIcon><PowerSettingsNewIcon style={{ color: 'var(--main-icon-color)' }}/></ListItemIcon>
               <ListItemText primary="Factory reset..." />
             </MenuItem>
           </Menu>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.3f966bc0.js"></script><link href="./static/css/main.87836c07.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><base href="./"><link rel="icon" href="./matterbridge 32x32.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><title>Matterbridge</title><link rel="manifest" href="./manifest.json"/><script defer="defer" src="./static/js/main.5caad8c7.js"></script><link href="./static/css/main.1360336f.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>