From dc82267cbc7c6b1661b75213619cecf94e4063b8 Mon Sep 17 00:00:00 2001
From: LilleBRG <lillebrg@gmail.com>
Date: Thu, 20 Mar 2025 11:40:48 +0100
Subject: [PATCH] changed frontend structure
---
frontend/index.html | 1 +
frontend/pages/{home => }/home.html | 4 ++--
frontend/pages/{login => }/login.html | 6 +++---
frontend/pages/{profile => }/profile.html | 0
frontend/pages/{register => }/register.html | 6 +++---
frontend/{pages/home => scripts}/home.js | 2 +-
frontend/{pages/login => scripts}/login.js | 7 ++-----
.../{pages/profile => scripts}/profile.js | 0
.../{pages/register => scripts}/register.js | 0
.../{ => scripts}/services/devices.service.js | 19 ++++++++++++++++---
.../{ => scripts}/services/users.service.js | 11 ++++++-----
frontend/services/temperature-logs.service.js | 14 --------------
frontend/shared/constants.js | 1 +
frontend/{pages/home => styles}/home.css | 0
frontend/{pages/login => styles}/login.css | 0
.../{pages/profile => styles}/profile.css | 0
.../{pages/register => styles}/register.css | 0
17 files changed, 35 insertions(+), 36 deletions(-)
create mode 100644 frontend/index.html
rename frontend/pages/{home => }/home.html (89%)
rename frontend/pages/{login => }/login.html (81%)
rename frontend/pages/{profile => }/profile.html (100%)
rename frontend/pages/{register => }/register.html (84%)
rename frontend/{pages/home => scripts}/home.js (95%)
rename frontend/{pages/login => scripts}/login.js (58%)
rename frontend/{pages/profile => scripts}/profile.js (100%)
rename frontend/{pages/register => scripts}/register.js (100%)
rename frontend/{ => scripts}/services/devices.service.js (57%)
rename frontend/{ => scripts}/services/users.service.js (84%)
delete mode 100644 frontend/services/temperature-logs.service.js
create mode 100644 frontend/shared/constants.js
rename frontend/{pages/home => styles}/home.css (100%)
rename frontend/{pages/login => styles}/login.css (100%)
rename frontend/{pages/profile => styles}/profile.css (100%)
rename frontend/{pages/register => styles}/register.css (100%)
diff --git a/frontend/index.html b/frontend/index.html
new file mode 100644
index 0000000..9911433
--- /dev/null
+++ b/frontend/index.html
@@ -0,0 +1 @@
+<meta http-equiv="refresh" content="0; url=/pages/login.html" />
diff --git a/frontend/pages/home/home.html b/frontend/pages/home.html
similarity index 89%
rename from frontend/pages/home/home.html
rename to frontend/pages/home.html
index c3727a5..ab234ca 100644
--- a/frontend/pages/home/home.html
+++ b/frontend/pages/home.html
@@ -33,6 +33,6 @@
</table>
</div>
</body>
- <link rel="stylesheet" href="home.css" />
- <script type="module" src="home.js"></script>
+ <link rel="stylesheet" href="/styles/home.css" />
+ <script type="module" src="/scripts/home.js"></script>
</html>
diff --git a/frontend/pages/login/login.html b/frontend/pages/login.html
similarity index 81%
rename from frontend/pages/login/login.html
rename to frontend/pages/login.html
index c0d7fe6..e3b0533 100644
--- a/frontend/pages/login/login.html
+++ b/frontend/pages/login.html
@@ -23,14 +23,14 @@
<input type="checkbox" name="remember"> Remember me
</label>
<label>
- Dont have an account? <a href="../register/register.html">Register</a>
+ Dont have an account? <a href="./login.html">Register</a>
</label>
</div>
</div>
</form>
</div>
</body>
-<link rel="stylesheet" href="login.css">
-<script type="module" src="login.js"></script>
+<link rel="stylesheet" href="/styles/login.css">
+<script type="module" src="/scripts/login.js"></script>
</html>
\ No newline at end of file
diff --git a/frontend/pages/profile/profile.html b/frontend/pages/profile.html
similarity index 100%
rename from frontend/pages/profile/profile.html
rename to frontend/pages/profile.html
diff --git a/frontend/pages/register/register.html b/frontend/pages/register.html
similarity index 84%
rename from frontend/pages/register/register.html
rename to frontend/pages/register.html
index cc8e996..ad17e55 100644
--- a/frontend/pages/register/register.html
+++ b/frontend/pages/register.html
@@ -25,7 +25,7 @@
<button type="submit">Register</button>
<div class="loginText">
<label>
- Already have an account? <a href="../login/login.html">Login</a>
+ Already have an account? <a href="./home.html">Login</a>
</label>
</div>
</div>
@@ -33,7 +33,7 @@
</div>
</body>
-<link rel="stylesheet" href="register.css">
-<script type="module" src="register.js"></script>
+<link rel="stylesheet" href="/styles/register.css">
+<script type="module" src="/scripts/register.js"></script>
</html>
\ No newline at end of file
diff --git a/frontend/pages/home/home.js b/frontend/scripts/home.js
similarity index 95%
rename from frontend/pages/home/home.js
rename to frontend/scripts/home.js
index d8f59dc..8538bbb 100644
--- a/frontend/pages/home/home.js
+++ b/frontend/scripts/home.js
@@ -1,4 +1,4 @@
-import { mockTemperatureLogs } from "../../mockdata/temperature-logs.mockdata.js"; // Import data
+import { mockTemperatureLogs } from "../mockdata/temperature-logs.mockdata.js"; // Import data
const xValues = mockTemperatureLogs.map((log) =>
new Date(log.date).toLocaleString()
diff --git a/frontend/pages/login/login.js b/frontend/scripts/login.js
similarity index 58%
rename from frontend/pages/login/login.js
rename to frontend/scripts/login.js
index 55e303b..6160bca 100644
--- a/frontend/pages/login/login.js
+++ b/frontend/scripts/login.js
@@ -1,13 +1,10 @@
-import { login } from "../../services/users.service.js";
+import { login } from "./services/users.service.js";
document.getElementById("loginForm").addEventListener("submit", function(event) {
- event.preventDefault(); // Prevents default form submission
+ event.preventDefault();
- // Get form values
const emailOrUsername = document.getElementById("emailorusn").value;
const password = document.getElementById("psw").value;
-
- // Call function with form values
login(emailOrUsername, password);
});
\ No newline at end of file
diff --git a/frontend/pages/profile/profile.js b/frontend/scripts/profile.js
similarity index 100%
rename from frontend/pages/profile/profile.js
rename to frontend/scripts/profile.js
diff --git a/frontend/pages/register/register.js b/frontend/scripts/register.js
similarity index 100%
rename from frontend/pages/register/register.js
rename to frontend/scripts/register.js
diff --git a/frontend/services/devices.service.js b/frontend/scripts/services/devices.service.js
similarity index 57%
rename from frontend/services/devices.service.js
rename to frontend/scripts/services/devices.service.js
index 299fe1d..b2b18d8 100644
--- a/frontend/services/devices.service.js
+++ b/frontend/scripts/services/devices.service.js
@@ -1,6 +1,6 @@
-const address = "http://10.135.51.116/temperature-alarm-webapi/devices"
+import { address } from "../../shared/constants";
-function getDevicesOnUserId(id) {
+export function getDevicesOnUserId(id) {
fetch(`${address}/get-on-user-id`, {
method: "GET",
headers: {
@@ -13,7 +13,7 @@ function getDevicesOnUserId(id) {
.catch(error => console.error("Error:", error));
}
-function update(ids) {
+export function update(ids) {
fetch(`${address}/get-on-user-id`, {
method: "PATCH",
headers: {
@@ -24,4 +24,17 @@ function update(ids) {
.then(response => response.json())
.then(data => console.log("Success:", data))
.catch(error => console.error("Error:", error));
+}
+
+export function getLogsOnDeviceIds(id) {
+ fetch(`${address}/get-on-device-ids`, {
+ method: "GET",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify({ ids: id })
+ })
+ .then(response => response.json())
+ .then(data => console.log("Success:", data))
+ .catch(error => console.error("Error:", error));
}
\ No newline at end of file
diff --git a/frontend/services/users.service.js b/frontend/scripts/services/users.service.js
similarity index 84%
rename from frontend/services/users.service.js
rename to frontend/scripts/services/users.service.js
index d53f238..06f0936 100644
--- a/frontend/services/users.service.js
+++ b/frontend/scripts/services/users.service.js
@@ -1,10 +1,11 @@
-const address = "http://10.135.51.116/temperature-alarm-webapi/users"
+import { address } from "../../shared/constants";
+
export function login(usernameOrEmail, password) {
console.log(usernameOrEmail);
console.log(password);
- fetch(`${address}/login`, {
+ fetch(`${address}/user/login`, {
method: "POST",
headers: {
"Content-Type": "application/json"
@@ -17,7 +18,7 @@ export function login(usernameOrEmail, password) {
}
export function create(email, username, password, repeatPassword){
- fetch(`${address}/create`, {
+ fetch(`${address}/user/create`, {
method: "POST",
headers: {
"Content-Type": "application/json"
@@ -29,8 +30,8 @@ export function create(email, username, password, repeatPassword){
.catch(error => console.error("Error:", error));
}
-export function update(email, username, password){
- fetch(`${address}/update`, {
+ function update(email, username, password){
+ fetch(`${address}/user/update`, {
method: "PATCH",
headers: {
"Content-Type": "application/json"
diff --git a/frontend/services/temperature-logs.service.js b/frontend/services/temperature-logs.service.js
deleted file mode 100644
index 579e852..0000000
--- a/frontend/services/temperature-logs.service.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const address = "http://10.135.51.116/temperature-alarm-webapi/temperature-logs"
-
-function getOnDeviceIds(ids) {
- fetch(`${address}/get-on-device-ids`, {
- method: "GET",
- headers: {
- "Content-Type": "application/json"
- },
- body: JSON.stringify({ ids: ids })
- })
- .then(response => response.json())
- .then(data => console.log("Success:", data))
- .catch(error => console.error("Error:", error));
-}
\ No newline at end of file
diff --git a/frontend/shared/constants.js b/frontend/shared/constants.js
new file mode 100644
index 0000000..a21da0c
--- /dev/null
+++ b/frontend/shared/constants.js
@@ -0,0 +1 @@
+export const address = "hhttps://temperature.mercantec.tech/api"
diff --git a/frontend/pages/home/home.css b/frontend/styles/home.css
similarity index 100%
rename from frontend/pages/home/home.css
rename to frontend/styles/home.css
diff --git a/frontend/pages/login/login.css b/frontend/styles/login.css
similarity index 100%
rename from frontend/pages/login/login.css
rename to frontend/styles/login.css
diff --git a/frontend/pages/profile/profile.css b/frontend/styles/profile.css
similarity index 100%
rename from frontend/pages/profile/profile.css
rename to frontend/styles/profile.css
diff --git a/frontend/pages/register/register.css b/frontend/styles/register.css
similarity index 100%
rename from frontend/pages/register/register.css
rename to frontend/styles/register.css