diff --git a/frontend/home/index.html b/frontend/home/index.html index 36b1193..ae98704 100644 --- a/frontend/home/index.html +++ b/frontend/home/index.html @@ -4,9 +4,10 @@ Temperature-Alarm-Web - - + + + @@ -33,6 +34,7 @@ +
diff --git a/frontend/login/index.html b/frontend/login/index.html index 4b22dea..fef2c91 100644 --- a/frontend/login/index.html +++ b/frontend/login/index.html @@ -4,6 +4,7 @@ Login - Temperature alarm + @@ -28,7 +29,7 @@ -
+
diff --git a/frontend/register/index.html b/frontend/register/index.html index 666fe02..921cea8 100644 --- a/frontend/register/index.html +++ b/frontend/register/index.html @@ -4,6 +4,7 @@ Register - Temperature Alarm + @@ -33,7 +34,7 @@ -
+
diff --git a/frontend/scripts/home.js b/frontend/scripts/home.js index 44aca18..e51e563 100644 --- a/frontend/scripts/home.js +++ b/frontend/scripts/home.js @@ -1,8 +1,6 @@ import { getLogsOnDeviceId } from "./services/devices.service.js"; -async function buildChart() { - // TODO change device id - const data = await getLogsOnDeviceId(1); +async function buildChart(data) { data.sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime()); const xValues = data.map((log) => @@ -74,4 +72,12 @@ function buildTable(data) { }); } -buildChart(); +// TODO change device id +getLogsOnDeviceId(1) + .then(buildChart) + .catch(err => { + document.getElementById("error").innerText = err; + document.getElementById("error").style.display = "block"; + document.getElementById("container").style.display = "none"; + }); + diff --git a/frontend/styles/auth.css b/frontend/styles/auth.css index bb7a66a..7ddf7ce 100644 --- a/frontend/styles/auth.css +++ b/frontend/styles/auth.css @@ -39,16 +39,6 @@ button:hover { margin-top: 0.5rem; } -#form-error { - display: none; - background-color: #FFCDD2; - color: #C62828; - border: 1px solid #C62828; - border-radius: 4px; - padding: 1rem 2rem; - margin-top: 1rem; -} - button{ border-radius: 20px; } diff --git a/frontend/styles/common.css b/frontend/styles/common.css index a4742c3..4de8cbb 100644 --- a/frontend/styles/common.css +++ b/frontend/styles/common.css @@ -1,3 +1,10 @@ .error { - background-color: #EF9A9A; + display: none; + background-color: #FFCDD2; + color: #C62828; + border: 1px solid #C62828; + border-radius: 4px; + padding: 1rem 2rem; + margin-top: 1rem; } + diff --git a/frontend/styles/home.css b/frontend/styles/home.css index a90bd7a..0f1fd03 100644 --- a/frontend/styles/home.css +++ b/frontend/styles/home.css @@ -104,3 +104,7 @@ table tr:not(:last-child) .temperature { box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.1); } +#error { + margin: 2rem; +} +