Merge pull request #18 from Luligu/dev

Release 1.2.12
Luligu · Apr 30, 2024 · 895a282 · 895a282
2 parents f0d5e65 + 3ee4fb9
commit 895a282
Show file tree

Hide file tree

Showing 18 changed files with 377 additions and 435 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,23 +2,29 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.2.12] - 2024-04-29
+## [1.2.12] - 2024-04-30
 
+### Added
+
+- [frontend]: Added the device child enpoints to the table in the Devices page
+- [docker]: Added architectures to the docker image on the docker hub: linux/amd64, linux/arm64
 - [frontend]: Frontend updated to 0.8.9.
 - [frontend]: Added error in the logger level on the Settings page.
+- [frontend]: Added unregister all devices in the Settings page. Matterbridge will shutdown to allow unregistering.
 - [frontend]: Added reset in the Settings page. Matterbridge will shutdown to allow the reset.
 - [frontend]: Added factoryreset in the Settings page. Matterbridge will shutdown to allow the factoryreset.
 
-### Added
-
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
 
 ## [1.2.11] - 2024-04-25
 
 ### Added
 
 - [matterbridge]: Added user to system information.
 - [frontend]: Persist the filter selection (debug level and search criteria) in the Logs route.
-- [frontend]: Added version and two badges for bridgeMode and restartMode.
+- [frontend]: Added on the header the version and two badges for bridgeMode and restartMode.
 - [frontend]: Frontend updated to 0.8.8.
 - [docker]: Added support for docker (BETA). The Matterbridge image is published on the docker hub.
 - [docker]: See the guidelines on https://github.com/Luligu/matterbridge?tab=readme-ov-file#Run-the-Docker-container-and-start-it.

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,8 @@
-# Use an official Node.js runtime as a parent image
+# Use an official Node.js runtime as a parent image for arm64 and amd64
 FROM node:20-alpine
+# Use an official Node.js runtime as a parent image for arm32v6 and arm32v7
+# FROM arm32v6/node:bullseye
+# FROM arm32v7/node:bullseye
 
 # Set the working directory in the container
 WORKDIR /usr/src/app

diff --git a/README.md b/README.md
@@ -381,9 +381,9 @@ sudo systemctl enable matterbridge.service
 sudo systemctl disable matterbridge.service
 ```
 
-## Run matterbridge with docker (Linux only) BETA
+## Run matterbridge with docker (Linux only)
 
-The Matterbridge docker image (architecture arm64) is published on the docker hub.
+The Matterbridge Docker image, which includes a manifest list for the linux/amd64 and linux/arm64 architectures, is published on Docker Hub.
 
 ### First create the Matterbridge directories
 
@@ -424,7 +424,7 @@ services:
 ```
 copy it in the home directory or edit the existing one to add the matterbridge service.
 
-Run with docker compose
+then run it
 
 ```
 docker compose up -d

diff --git a/docker.MD b/docker.MD
diff --git a/frontend/build/asset-manifest.json b/frontend/build/asset-manifest.json
@@ -1,15 +1,15 @@
 {
   "files": {
     "main.css": "/static/css/main.1880392b.css",
-    "main.js": "/static/js/main.1af93361.js",
+    "main.js": "/static/js/main.0c70c26b.js",
     "static/js/453.d855a71b.chunk.js": "/static/js/453.d855a71b.chunk.js",
     "index.html": "/index.html",
     "main.1880392b.css.map": "/static/css/main.1880392b.css.map",
-    "main.1af93361.js.map": "/static/js/main.1af93361.js.map",
+    "main.0c70c26b.js.map": "/static/js/main.0c70c26b.js.map",
     "453.d855a71b.chunk.js.map": "/static/js/453.d855a71b.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.1880392b.css",
-    "static/js/main.1af93361.js"
+    "static/js/main.0c70c26b.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"/><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.1af93361.js"></script><link href="/static/css/main.1880392b.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.0c70c26b.js"></script><link href="/static/css/main.1880392b.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/js/main.0c70c26b.js b/frontend/build/static/js/main.0c70c26b.js
diff --git a/...ld/static/js/main.1af93361.js.LICENSE.txt → ...ld/static/js/main.0c70c26b.js.LICENSE.txt b/...ld/static/js/main.1af93361.js.LICENSE.txt → ...ld/static/js/main.0c70c26b.js.LICENSE.txt
@@ -97,3 +97,5 @@
  * 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 */
diff --git a/frontend/build/static/js/main.0c70c26b.js.map b/frontend/build/static/js/main.0c70c26b.js.map
diff --git a/frontend/build/static/js/main.1af93361.js b/frontend/build/static/js/main.1af93361.js
diff --git a/frontend/build/static/js/main.1af93361.js.map b/frontend/build/static/js/main.1af93361.js.map
diff --git a/frontend/package.json b/frontend/package.json
@@ -7,6 +7,9 @@
     "@emotion/styled": "^11.11.0",
     "@mui/icons-material": "^5.15.13",
     "@mui/material": "^5.15.13",
+    "@rjsf/core": "^5.18.3",
+    "@rjsf/utils": "^5.18.3",
+    "@rjsf/validator-ajv8": "^5.18.3",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
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.1af93361.js"></script><link href="/static/css/main.1880392b.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.0c70c26b.js"></script><link href="/static/css/main.1880392b.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>