Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/Luligu/matterbridge into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Luligu committed Feb 17, 2025
2 parents 52e5f3f + 3f45df2 commit 58d8fee
Show file tree
Hide file tree
Showing 10 changed files with 226 additions and 9 deletions.
6 changes: 3 additions & 3 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.cf25d33e.css",
"main.js": "./static/js/main.257513e8.js",
"main.js": "./static/js/main.141d3cfb.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 @@ -61,11 +61,11 @@
"static/media/roboto-greek-ext-400-normal.woff": "./static/media/roboto-greek-ext-400-normal.16eb83b4a3b1ea994243.woff",
"index.html": "./index.html",
"main.cf25d33e.css.map": "./static/css/main.cf25d33e.css.map",
"main.257513e8.js.map": "./static/js/main.257513e8.js.map",
"main.141d3cfb.js.map": "./static/js/main.141d3cfb.js.map",
"453.abd36b29.chunk.js.map": "./static/js/453.abd36b29.chunk.js.map"
},
"entrypoints": [
"static/css/main.cf25d33e.css",
"static/js/main.257513e8.js"
"static/js/main.141d3cfb.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.257513e8.js"></script><link href="./static/css/main.cf25d33e.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.141d3cfb.js"></script><link href="./static/css/main.cf25d33e.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
115 changes: 115 additions & 0 deletions frontend/build/static/js/main.141d3cfb.js

Large diffs are not rendered by default.

101 changes: 101 additions & 0 deletions frontend/build/static/js/main.141d3cfb.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */

/**
* @license React
* react-dom.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @license React
* react-is.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @license React
* react-jsx-runtime.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @license React
* react.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @license React
* scheduler.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/**
* @license qrcode.react
* Copyright (c) Paul O'Shannessy
* SPDX-License-Identifier: ISC
*/

/**
* @remix-run/router v1.21.0
*
* Copyright (c) Remix Software Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE.md file in the root directory of this source tree.
*
* @license MIT
*/

/**
* React Router DOM v6.28.0
*
* Copyright (c) Remix Software Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE.md file in the root directory of this source tree.
*
* @license MIT
*/

/**
* React Router v6.28.0
*
* Copyright (c) Remix Software Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE.md file in the root directory of this source tree.
*
* @license MIT
*/

/** @license React v16.13.1
* react-is.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

/** @license URI.js v4.4.1 (c) 2011 Gary Court. License: http://github.com/garycourt/uri-js */
1 change: 1 addition & 0 deletions frontend/build/static/js/main.141d3cfb.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ function LoginForm() {
<div style={containerStyle}>
<form onSubmit={handleSubmit} style={formStyle}>
<div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', gap: '20px' }}>
<img src="matterbridge 64x64.png" alt="Matterbridge Logo" style={{ height: '64px', width: '64px' }} />
<img src="matterbridge.svg" alt="Matterbridge Logo" style={{ height: '64px', width: '64px' }} />
<h3 style={{color: 'var(--div-text-color)' }}>Welcome to Matterbridge</h3>
</div>
<div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between', gap: '20px' }}>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/ConfirmCancelForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export function ConfirmCancelForm({ open, title, message, onConfirm, onCancel })
<Dialog open={open}>
<DialogTitle gap={'20px'}>
<div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', gap: '20px' }}>
<img src="matterbridge 32x32.png" alt="Matterbridge Logo" style={{ height: '32px', width: '32px' }} />
<img src="matterbridge.svg" alt="Matterbridge Logo" style={{ height: '32px', width: '32px' }} />
<h4 style={{ margin: 0 }}>{title}</h4>
</div>
</DialogTitle>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ function Header() {
return (
<div className="header">
<div className="sub-header">
<img src="matterbridge 64x64.png" alt="Matterbridge Logo" style={{ height: '30px' }} />
<img src="matterbridge.svg" alt="Matterbridge Logo" style={{ height: '30px' }} />
<h2 style={{ fontSize: '22px', color: 'var(--main-icon-color)', margin: '0px' }}>Matterbridge</h2>
<nav>
<Link to="/" className="nav-link">Home</Link>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ function Home() {
maxWidth='800px'>
<DialogTitle gap={'20px'}>
<div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', gap: '20px' }}>
<img src="matterbridge 64x64.png" alt="Matterbridge Logo" style={{ height: '64px', width: '64px' }} />
<img src="matterbridge.svg" alt="Matterbridge Logo" style={{ height: '64px', width: '64px' }} />
<h3>Matterbridge plugin configuration</h3>
</div>
</DialogTitle>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Test.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ function Test() {
</div>*/}

<div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '20px', width: '100%' }}>
<img src="matterbridge 64x64.png" alt="Matterbridge Logo" style={{ height: '64px', width: '64px' }} />
<img src="matterbridge.svg" alt="Matterbridge Logo" style={{ height: '64px', width: '64px' }} />
<p>Welcome to the Test page of the Matterbridge frontend</p>
{cpu && memory &&
<div>
Expand Down

0 comments on commit 58d8fee

Please sign in to comment.