Skip to content

Commit

Permalink
Release 1.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Luligu committed Jan 3, 2025
1 parent 723f90e commit 5788eee
Show file tree
Hide file tree
Showing 26 changed files with 771 additions and 330 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Matterbridge edge is now released. The default mode is still the normal mode to
The frontend has a new dark and light mode. The dark mode is now the default mode.
It is possible to change the mode (Classic, Dark or Light) in Settings, Matterbridge settings.

## [1.6.8-dev.22] - 2025-01-01
## [1.7.0] - 2025-01-03

### Added

Expand All @@ -36,6 +36,7 @@ It is possible to change the mode (Classic, Dark or Light) in Settings, Matterbr
- [unregister]: Added unregister for Matterbridge edge.
- [reset]: Added reset for Matterbridge edge.
- [factoryreset]: Added factoryreset for Matterbridge edge.
- [websocket]: Added /api/clusters and removed all fetch calls from frontend.

### Changed

Expand Down
12 changes: 6 additions & 6 deletions frontend/build/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "./static/css/main.c6d8f9ea.css",
"main.js": "./static/js/main.04b8a114.js",
"main.css": "./static/css/main.3ff5987b.css",
"main.js": "./static/js/main.4b4bec98.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",
Expand Down Expand Up @@ -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.c6d8f9ea.css.map": "./static/css/main.c6d8f9ea.css.map",
"main.04b8a114.js.map": "./static/js/main.04b8a114.js.map",
"main.3ff5987b.css.map": "./static/css/main.3ff5987b.css.map",
"main.4b4bec98.js.map": "./static/js/main.4b4bec98.js.map",
"453.abd36b29.chunk.js.map": "./static/js/453.abd36b29.chunk.js.map"
},
"entrypoints": [
"static/css/main.c6d8f9ea.css",
"static/js/main.04b8a114.js"
"static/css/main.3ff5987b.css",
"static/js/main.4b4bec98.js"
]
}
2 changes: 1 addition & 1 deletion frontend/build/index.html
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.04b8a114.js"></script><link href="./static/css/main.c6d8f9ea.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.4b4bec98.js"></script><link href="./static/css/main.3ff5987b.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion frontend/build/static/js/main.04b8a114.js.map

This file was deleted.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions frontend/build/static/js/main.4b4bec98.js.map

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions frontend/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
--primary-color: #1976d2;
--secondary-color: #a58827;

--header-bg-color: #1b1d21;
--header-bg-color: var(--div-bg-color);
--header-text-color: var(--primary-color);

--footer-bg-color: var(--div-bg-color);
Expand Down Expand Up @@ -98,7 +98,7 @@

/* Light Mode */
[frontend-theme="light"] {
--main-bg-color: #fafafa;
--main-bg-color: #f0f0f0;
--main-text-color: #212121;
--main-grey-color: #616161;
--main-light-color: #363636;
Expand All @@ -108,7 +108,7 @@
--main-button-bg-color: var(--primary-color);
--main-menu-color: var(--main-text-color);
--main-menu-bg-color: #ffffff;
--main-menu-hover-color: #e6f4fe;
--main-menu-hover-color: #85c0d8;
--main-label-color: var(--main-grey-color);

--primary-color: #2196f3;
Expand All @@ -127,8 +127,8 @@
--table-text-color: var(--main-light-color);
--table-even-bg-color: var(--div-bg-color);
--table-odd-bg-color: var(--div-bg-color);
--table-hover-bg-color: #e6f4fe;
--table-selected-bg-color: #e6f4fe;
--table-hover-bg-color: #85c0d8;
--table-selected-bg-color: #85c0d8;

--div-bg-color: #ffffff;
--div-text-color: #212121;
Expand Down
33 changes: 15 additions & 18 deletions frontend/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import Settings from './components/Settings';
import Test from './components/Test';
import Logs from './components/Logs';
import { WebSocketProvider } from './components/WebSocketProvider';
import { OnlineProvider } from './components/OnlineProvider';
import { createMuiTheme, getCssVariable } from './components/muiTheme';

// Create a context for the authentication state
Expand Down Expand Up @@ -131,23 +130,21 @@ function LoginForm() {
if (loggedIn) {
return (
<WebSocketProvider>
<OnlineProvider>
<ThemeProvider theme={theme}>
<Router basename={baseName}>
<div className="MbfScreen">
<Header />
<Routes>
<Route path="/" element={<Home />} />
<Route path="/devices" element={<Devices />} />
<Route path="/log" element={<Logs />} />
<Route path="/settings" element={<Settings />} />
<Route path="/test" element={<Test />} />
<Route path="*" element={<Navigate to="/" />} />
</Routes>
</div>
</Router>
</ThemeProvider>
</OnlineProvider>
<ThemeProvider theme={theme}>
<Router basename={baseName}>
<div className="MbfScreen">
<Header />
<Routes>
<Route path="/" element={<Home />} />
<Route path="/devices" element={<Devices />} />
<Route path="/log" element={<Logs />} />
<Route path="/settings" element={<Settings />} />
<Route path="/test" element={<Test />} />
<Route path="*" element={<Navigate to="/" />} />
</Routes>
</div>
</Router>
</ThemeProvider>
</WebSocketProvider>
);
} else {
Expand Down
9 changes: 5 additions & 4 deletions frontend/src/components/ConfirmCancelForm.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// @mui
import { Dialog, DialogTitle, DialogContent, Button } from '@mui/material';
// @mui/material
import Dialog from '@mui/material/Dialog';
import DialogTitle from '@mui/material/DialogTitle';
import DialogContent from '@mui/material/DialogContent';
import Button from '@mui/material/Button';

// Create a component for confirming or canceling an action
export function ConfirmCancelForm({ open, title, message, onConfirm, onCancel }) {
Expand Down Expand Up @@ -36,5 +39,3 @@ export function ConfirmCancelForm({ open, title, message, onConfirm, onCancel })
</Dialog>
)
}
/*
*/
Loading

0 comments on commit 5788eee

Please sign in to comment.