From c9155d582b6e268e9fd907c87ae9613a36ebbb6c Mon Sep 17 00:00:00 2001
From: LilleBRG <lillebrgmc@gmail.com>
Date: Mon, 31 Mar 2025 15:49:35 +0200
Subject: [PATCH] no errors after merge. update database please

---
 backend/Api/BusinessLogic/DeviceLogic.cs     | 11 +----------
 backend/Api/BusinessLogic/UserLogic.cs       |  2 +-
 backend/Api/Controllers/DeviceController.cs  |  8 --------
 backend/Api/Controllers/UserController.cs    | 10 ++++++----
 backend/Api/DBAccess/DBAccess.cs             |  7 -------
 frontend/devices/index.html                  | 18 +++++++++---------
 frontend/home/index.html                     | 10 +++++++---
 frontend/profile/index.html                  | 17 ++++++++++-------
 frontend/scripts/devices.js                  | 10 +++++-----
 frontend/scripts/services/devices.service.js | 14 ++------------
 frontend/scripts/services/users.service.js   | 13 ++-----------
 frontend/styles/common.css                   |  6 ++++++
 frontend/styles/profile.css                  |  9 +++++++++
 13 files changed, 58 insertions(+), 77 deletions(-)

diff --git a/backend/Api/BusinessLogic/DeviceLogic.cs b/backend/Api/BusinessLogic/DeviceLogic.cs
index 8bfa79a..ae4be2c 100644
--- a/backend/Api/BusinessLogic/DeviceLogic.cs
+++ b/backend/Api/BusinessLogic/DeviceLogic.cs
@@ -41,21 +41,12 @@ namespace Api.BusinessLogic
         /// <param name="device">The new device</param>
         /// <param name="userId">The user that owns the device</param>
         /// <returns>returns true in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason</returns>
-        public async Task<IActionResult> AddDevice(string referenceId, int userId)
+        public async Task<IActionResult> AddDevice(Device device, int userId)
         {
             var profile = await _dbAccess.ReadUser(userId);
 
             if (profile == null) { return new ConflictObjectResult(new { message = "Could not find user" }); }
 
-            Device device = new Device
-            {
-                Name = "Undefined",
-                TempHigh = 0,
-                TempLow = 0,
-                ReferenceId = referenceId,
-                Logs = new List<TemperatureLogs>(),
-            };
-
             return await _dbAccess.CreateDevice(device, userId);
         }
 
diff --git a/backend/Api/BusinessLogic/UserLogic.cs b/backend/Api/BusinessLogic/UserLogic.cs
index e63a0d9..4743cdd 100644
--- a/backend/Api/BusinessLogic/UserLogic.cs
+++ b/backend/Api/BusinessLogic/UserLogic.cs
@@ -102,7 +102,7 @@ namespace Api.BusinessLogic
         /// <returns>returns the updated user in a OkObjectResult and if there is some error it returns a ConflictObjectResult and a message that explain the reason</returns>
         public async Task<IActionResult> EditProfile(User user, int userId)
         {
-            return await _dbAccess.UpdateUser(userRequest, userId);
+            return await _dbAccess.UpdateUser(user, userId);
         }
 
         public async Task<IActionResult> changePassword(ChangePasswordRequest passwordRequest, int userId)
diff --git a/backend/Api/Controllers/DeviceController.cs b/backend/Api/Controllers/DeviceController.cs
index 6d99e04..67727b3 100644
--- a/backend/Api/Controllers/DeviceController.cs
+++ b/backend/Api/Controllers/DeviceController.cs
@@ -68,13 +68,5 @@ namespace Api.Controllers
         {
             return await _deviceLogic.EditDevice(device, deviceId);
         }
-
-
-        [Authorize]
-        [HttpDelete("Delete/{referenceId}")]
-        public async Task<IActionResult> EditDevice(string referenceId)
-        {
-            return await _deviceLogic.EditDevice(referenceId);
-        }
     }
 }
diff --git a/backend/Api/Controllers/UserController.cs b/backend/Api/Controllers/UserController.cs
index 55cdf5c..bec64c0 100644
--- a/backend/Api/Controllers/UserController.cs
+++ b/backend/Api/Controllers/UserController.cs
@@ -19,13 +19,15 @@ namespace Api.Controllers
         }
 
         //[Authorize]
-        [HttpGet("{userId}")]
-        public async Task<IActionResult> GetUSer(int userId)
+        [HttpGet("Get")]
+        public async Task<IActionResult> GetUSer()
         {
+            var claims = HttpContext.User.Claims;
+            string userIdString = claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value;
+            int userId = Convert.ToInt32(userIdString);
             return await _userLogic.getUser(userId);
         }
-        [HttpPost("login")]
-        // Sends the login to userLogic
+
         [HttpPost("Login")]
         public async Task<IActionResult> Login([FromBody] Login login)
         {
diff --git a/backend/Api/DBAccess/DBAccess.cs b/backend/Api/DBAccess/DBAccess.cs
index a154e7a..90baaf0 100644
--- a/backend/Api/DBAccess/DBAccess.cs
+++ b/backend/Api/DBAccess/DBAccess.cs
@@ -21,13 +21,6 @@ namespace Api.DBAccess
             return await _context.Users.FirstOrDefaultAsync(u => u.Id == userId);
         }
 
-
-        public async Task<User> getUser(int userId)
-        {
-            return await _context.Users.FirstOrDefaultAsync(u => u.Id == userId);
-        }
-
-
         /// <summary>
         /// Creates a user using entityframework core
         /// </summary>
diff --git a/frontend/devices/index.html b/frontend/devices/index.html
index 9fe9dcc..46e2327 100644
--- a/frontend/devices/index.html
+++ b/frontend/devices/index.html
@@ -13,16 +13,16 @@
 
   <body>
     <div id="container">
-        <div class="topnav">
-            <a href="/home/index.html">Home</a>
+      <div class="topnav">
+        <a href="/home/index.html">Home</a>
+        <div style="display: flex; justify-content: flex-end;">
             <a class="active" href="/devices/index.html">Devices</a>
-            <div style="display: flex; justify-content: flex-end;">
-              <a href="/profile/index.html">Profile</a>
-              <span class="logoutContainer">
-                <img class="logout" src="/img/logout.png">
-              </span>
-            </div>
-          </div>
+          <a href="/profile/index.html">Profile</a>
+          <span class="logoutContainer">
+            <img class="logout" src="/img/logout.png">
+          </span>
+        </div>
+      </div>
           <div class="addDeviceContainer">
             <button id="addDevice">Add Device</button>
           </div>
diff --git a/frontend/home/index.html b/frontend/home/index.html
index ae98704..c3189e5 100644
--- a/frontend/home/index.html
+++ b/frontend/home/index.html
@@ -8,16 +8,20 @@
         <script defer type="module" src="/scripts/home.js"></script>
         <link rel="stylesheet" href="/styles/common.css">
         <link rel="stylesheet" href="/styles/home.css" />
+        <link rel="stylesheet" href="/styles/auth.css" />
     </head>
 
     <body>
         <div class="topnav">
             <a class="active" href="/home/index.html">Home</a>
             <div style="display: flex; justify-content: flex-end;">
-                <a class="" href="/home/index.html">Devices</a>
-                <a class="" href="/profile/index.html">Profile</a>
+                <a href="/devices/index.html">Devices</a>
+              <a  href="/profile/index.html">Profile</a>
+              <span class="logoutContainer">
+                <img class="logout" src="/img/logout.png">
+              </span>
             </div>
-        </div>
+          </div>
         <div id="container">
             <div class="chart-container">
                 <canvas id="myChart" style="width: 49%; height: 49%;"></canvas>
diff --git a/frontend/profile/index.html b/frontend/profile/index.html
index 1fb7dc1..41c94d1 100644
--- a/frontend/profile/index.html
+++ b/frontend/profile/index.html
@@ -13,20 +13,23 @@
         <div id="container">
             <div class="topnav">
                 <a href="/home/index.html">Home</a>
-                <a href="/devices/index.html">Devices</a>
                 <div style="display: flex; justify-content: flex-end;">
+                    <a href="/devices/index.html">Devices</a>
                   <a class="active" href="/profile/index.html">Profile</a>
                   <span class="logoutContainer">
                     <img class="logout" src="/img/logout.png">
                   </span>
                 </div>
               </div>
-            <div id="profileCard"></div>
-            <div class="btnContainer">
-                <button class="btn" id="openEditModal">Edit</button>
-                <button class="btn" id="openPasswordModal">Change Password</button>
-
-            </div>
+              <div style="display: flex; justify-content: center;"> 
+                <div class="profileContainer">
+                    <div id="profileCard"></div>
+                    <div class="btnContainer">
+                        <button class="btn" id="openEditModal">Edit</button>
+                        <button class="btn" id="openPasswordModal">Change Password</button>
+                    </div>
+                  </div>
+              </div>
         </div>
 
         <div id="editModal" class="modal">
diff --git a/frontend/scripts/devices.js b/frontend/scripts/devices.js
index e958d0f..5d6418f 100644
--- a/frontend/scripts/devices.js
+++ b/frontend/scripts/devices.js
@@ -1,10 +1,10 @@
-import { getDevicesOnUserId, deleteDevice, update, add } from "./services/devices.service.js";
+import { getDevices, deleteDevice, update, add } from "./services/devices.service.js";
 import { devices } from "../mockdata/devices.mockdata.js";
 
-let id = localStorage.getItem("id");
-// getDevicesOnUserId(id).then(res => {
-//     buildTable(res)
-// })
+getDevices().then(res => {
+    buildTable(res)
+})
+
 buildTable(devices);
 
 let selectedReferenceId = null; // Store the selected referenceId
diff --git a/frontend/scripts/services/devices.service.js b/frontend/scripts/services/devices.service.js
index ee911aa..af8f2ec 100644
--- a/frontend/scripts/services/devices.service.js
+++ b/frontend/scripts/services/devices.service.js
@@ -1,17 +1,7 @@
-import { address } from "../../shared/constants.js";
 import { request } from "../../shared/utils.js";
 
-export function getDevicesOnUserId(userId) {
-    fetch(`${address}/device/${userId}`, {
-        method: "GET",
-        headers: {
-            "Content-Type": "application/json"
-        },
-        body: JSON.stringify({ id: id })
-    })
-    .then(response => response.json())
-    .then(data => console.log("Success:", data))
-    .catch(error => console.error("Error:", error));
+export function getDevices() {
+    return request("GET", "/device");
 }
 
 export function update(ids) {
diff --git a/frontend/scripts/services/users.service.js b/frontend/scripts/services/users.service.js
index 23e22f2..7ab71d8 100644
--- a/frontend/scripts/services/users.service.js
+++ b/frontend/scripts/services/users.service.js
@@ -1,17 +1,8 @@
 import { request } from "../../shared/utils.js";
-import { address } from "../../shared/constants.js";
-import { handleResponse } from "../../shared/utils.js";
 
 
-export function get(userId) {
-    return fetch(`${address}/user/${userId}`, {
-        method: "GET",
-        headers: {
-            "Content-Type": "application/json"
-        },
-    })
-    .then(handleResponse)
-    .catch(err => { error: err.message });
+export function get() {
+    return request("GET",`/user/get`)
 }
 
 export function login(usernameOrEmail, password) {
diff --git a/frontend/styles/common.css b/frontend/styles/common.css
index 4de8cbb..4dbcacc 100644
--- a/frontend/styles/common.css
+++ b/frontend/styles/common.css
@@ -8,3 +8,9 @@
     margin-top: 1rem;
 }
 
+.logout{
+    width: 20px;
+    height: 24px;
+  }
+  
+
diff --git a/frontend/styles/profile.css b/frontend/styles/profile.css
index 87f727d..801b265 100644
--- a/frontend/styles/profile.css
+++ b/frontend/styles/profile.css
@@ -85,3 +85,12 @@ h2{
     width: 90%;
   }
 
+  .profileContainer {
+    margin: 2rem 0;
+    background-color: white;
+    border-radius: 8px;
+    border: 1px solid #DDD;
+    box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.1);
+    width: 400px;
+}
+