Skip to content

Commit

Permalink
Removed Shutdown button when Matterbridge runs as a service or with d…
Browse files Browse the repository at this point in the history
…ocker
  • Loading branch information
Luligu committed May 8, 2024
1 parent 9b21971 commit b474aa1
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 15 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
- [frontend]: Frontend updated to 0.9.0.
- [frontend]: Added Plugin config editor
- [frontend]: Added tool column to registered plugins with QRCode, Config, Remove and Enable/Disable
- [frontend]: Removed Shutdown button when Matterbridge runs as a service or with docker

<a href="https://www.buymeacoffee.com/luligugithub">
<img src="./yellow-button.png" alt="Buy me a coffee" width="120">
Expand Down
6 changes: 3 additions & 3 deletions frontend/build/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"files": {
"main.css": "/static/css/main.979e07d2.css",
"main.js": "/static/js/main.ab5e3bac.js",
"main.js": "/static/js/main.ed3f81ca.js",
"static/js/453.d855a71b.chunk.js": "/static/js/453.d855a71b.chunk.js",
"index.html": "/index.html",
"main.979e07d2.css.map": "/static/css/main.979e07d2.css.map",
"main.ab5e3bac.js.map": "/static/js/main.ab5e3bac.js.map",
"main.ed3f81ca.js.map": "/static/js/main.ed3f81ca.js.map",
"453.d855a71b.chunk.js.map": "/static/js/453.d855a71b.chunk.js.map"
},
"entrypoints": [
"static/css/main.979e07d2.css",
"static/js/main.ab5e3bac.js"
"static/js/main.ed3f81ca.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"/><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.ab5e3bac.js"></script><link href="/static/css/main.979e07d2.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"/><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.ed3f81ca.js"></script><link href="/static/css/main.979e07d2.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.

10 changes: 6 additions & 4 deletions frontend/src/components/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,12 @@ function Header() {
</Tooltip>
<Tooltip title="Restart matterbridge">
<Button theme={theme} color="primary" variant="contained" size="small" endIcon={<RestartAltIcon />} style={{ color: '#ffffff' }} onClick={handleRestartClick}>Restart</Button>
</Tooltip>
<Tooltip title="Shut down matterbridge">
<Button theme={theme} color="primary" variant="contained" size="small" endIcon={<PowerSettingsNewIcon />} style={{ color: '#ffffff' }} onClick={handleShutdownClick}>Shutdown</Button>
</Tooltip>
</Tooltip>
{matterbridgeInfo.restartMode === '' ? (
<Tooltip title="Shut down matterbridge">
<Button theme={theme} color="primary" variant="contained" size="small" endIcon={<PowerSettingsNewIcon />} style={{ color: '#ffffff' }} onClick={handleShutdownClick}>Shutdown</Button>
</Tooltip>
) : null}
<Backdrop sx={{ color: '#fff', zIndex: (theme) => theme.zIndex.drawer + 1 }} open={open} onClick={handleClose}>
<CircularProgress color="inherit" />
</Backdrop>
Expand Down
8 changes: 5 additions & 3 deletions frontend/src/components/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -425,13 +425,14 @@ function DialogConfigPlugin( { config, schema, handleCloseConfig }) {
"disabled": false,
},
"norender": false,
"submitText": "Save the changes to the config file and restart Matterbridge",
}
"submitText": "Save the changes to the config file",
},
'ui:globalOptions': { orderable: false },
};
const theme = createTheme({
palette: {
primary: {
main: '#4CAF50', // your custom primary color
main: '#4CAF50',
},
},
components: {
Expand Down Expand Up @@ -476,6 +477,7 @@ function DialogConfigPlugin( { config, schema, handleCloseConfig }) {
<ThemeProvider theme={theme}>
<div style={{ maxWidth: '800px' }}>
<Form schema={schema} formData={config} uiSchema={uiSchema} validator={validator} onSubmit={handleSaveChanges} />
<div style={{ paddingTop: '10px' }}>Restart Matterbridge to apply the changes</div>
</div>
</ThemeProvider>
);
Expand Down

0 comments on commit b474aa1

Please sign in to comment.