ReiMerc/temperature-alarm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ReiMerc:28cffcfb42b70df61c448854b85b61bc33b6398d
Branches Tags
ReiMerc:master
ReiMerc:profileanddevices
ReiMerc:Jeppe
..
compare: ReiMerc:9529d2cdc8ea3b7d6bb70e2275647db7769e62cb
Branches Tags
ReiMerc:master
ReiMerc:profileanddevices
ReiMerc:Jeppe

No commits in common. "28cffcfb42b70df61c448854b85b61bc33b6398d" and "9529d2cdc8ea3b7d6bb70e2275647db7769e62cb" have entirely different histories.
28cffcfb42 ... 9529d2cdc8

4 changed files with 20 additions and 37 deletions
Show Stats Expand all files Collapse all files

2
frontend/home/index.html
View File

@ -15,7 +15,7 @@
<body> <body>
<div class="topnav"> <div class="topnav">
<a class="active" href="/home">Home</a> <a class="active" href="/home/index.html">Home</a>
<div style="display: flex; justify-content: flex-end;"> <div style="display: flex; justify-content: flex-end;">
<a href="/devices">Devices</a> <a href="/devices">Devices</a>
<a href="/profile">Profile</a> <a href="/profile">Profile</a>

7
frontend/index.html
View File

@ -4,13 +4,6 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<title>Temperature Alarm</title> <title>Temperature Alarm</title>
<link rel="stylesheet" href="/styles/frontpage.css"> <link rel="stylesheet" href="/styles/frontpage.css">
<script type="module">
import { isLoggedIn } from "./shared/utils.js";
if (isLoggedIn()) {
location.href = "/home";
}
</script>
</head> </head>
<body> <body>
<main> <main>

4
frontend/scripts/home.js
View File

@ -115,10 +115,10 @@ async function init() {
x: new Date(log.date).getTime(), x: new Date(log.date).getTime(),
y: log.temperature, y: log.temperature,
})), })),
parsing: false,
})), })),
}, },
options: { options: {
parsing: false,
plugins: { plugins: {
tooltip: { tooltip: {
callbacks: { callbacks: {
@ -127,8 +127,6 @@ async function init() {
}, },
decimation: { decimation: {
enabled: true, enabled: true,
algorithm: "lttb",
samples: window.innerWidth / 2,
}, },
}, },
scales: { scales: {

8
frontend/shared/utils.js
View File

@ -16,10 +16,6 @@ export async function request(method, path, body = null) {
body: body ? JSON.stringify(body) : undefined, body: body ? JSON.stringify(body) : undefined,
}) })
.then(async response => { .then(async response => {
if (response.status === 401) {
location.href = "/login";
}
try { try {
const json = await response.json(); const json = await response.json();
@ -50,7 +46,3 @@ export function getUser() {
return JSON.parse(localStorage.getItem("user")); return JSON.parse(localStorage.getItem("user"));
} }
export function isLoggedIn() {
return document.cookie.match(/\bauth-token=/) && localStorage.getItem("user");
}