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

no errors after merge. update database please

Browse Source
This commit is contained in:
LilleBRG 2025-03-31 15:49:35 +02:00
parent db023ac84e
commit c9155d582b
13 changed files with 58 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/Api/BusinessLogic/DeviceLogic.cs
View File

@ -41,21 +41,12 @@ namespace Api.BusinessLogic
/// <param name="device">The new device</param> /// <param name="device">The new device</param>
/// <param name="userId">The user that owns the 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> /// <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); var profile = await _dbAccess.ReadUser(userId);
if (profile == null) { return new ConflictObjectResult(new { message = "Could not find user" }); } 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); return await _dbAccess.CreateDevice(device, userId);
} }

2
backend/Api/BusinessLogic/UserLogic.cs
View File

@ -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> /// <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) 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) public async Task<IActionResult> changePassword(ChangePasswordRequest passwordRequest, int userId)

8
backend/Api/Controllers/DeviceController.cs
View File

@ -68,13 +68,5 @@ namespace Api.Controllers
{ {
return await _deviceLogic.EditDevice(device, deviceId); return await _deviceLogic.EditDevice(device, deviceId);
} }
[Authorize]
[HttpDelete("Delete/{referenceId}")]
public async Task<IActionResult> EditDevice(string referenceId)
{
return await _deviceLogic.EditDevice(referenceId);
}
} }
} }

10
backend/Api/Controllers/UserController.cs
View File

@ -19,13 +19,15 @@ namespace Api.Controllers
} }
//[Authorize] //[Authorize]
[HttpGet("{userId}")] [HttpGet("Get")]
public async Task<IActionResult> GetUSer(int userId) 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); return await _userLogic.getUser(userId);
} }
[HttpPost("login")]
// Sends the login to userLogic
[HttpPost("Login")] [HttpPost("Login")]
public async Task<IActionResult> Login([FromBody] Login login) public async Task<IActionResult> Login([FromBody] Login login)
{ {

7
backend/Api/DBAccess/DBAccess.cs
View File

@ -21,13 +21,6 @@ namespace Api.DBAccess
return await _context.Users.FirstOrDefaultAsync(u => u.Id == userId); 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> /// <summary>
/// Creates a user using entityframework core /// Creates a user using entityframework core
/// </summary> /// </summary>

18
frontend/devices/index.html
View File

@ -13,16 +13,16 @@
<body> <body>
<div id="container"> <div id="container">
<div class="topnav"> <div class="topnav">
<a href="/home/index.html">Home</a> <a href="/home/index.html">Home</a>
<div style="display: flex; justify-content: flex-end;">
<a class="active" href="/devices/index.html">Devices</a> <a class="active" href="/devices/index.html">Devices</a>
<div style="display: flex; justify-content: flex-end;"> <a href="/profile/index.html">Profile</a>
<a href="/profile/index.html">Profile</a> <span class="logoutContainer">
<span class="logoutContainer"> <img class="logout" src="/img/logout.png">
<img class="logout" src="/img/logout.png"> </span>
</span> </div>
</div> </div>
</div>
<div class="addDeviceContainer"> <div class="addDeviceContainer">
<button id="addDevice">Add Device</button> <button id="addDevice">Add Device</button>
</div> </div>

10
frontend/home/index.html
View File

@ -8,16 +8,20 @@
<script defer type="module" src="/scripts/home.js"></script> <script defer type="module" src="/scripts/home.js"></script>
<link rel="stylesheet" href="/styles/common.css"> <link rel="stylesheet" href="/styles/common.css">
<link rel="stylesheet" href="/styles/home.css" /> <link rel="stylesheet" href="/styles/home.css" />
<link rel="stylesheet" href="/styles/auth.css" />
</head> </head>
<body> <body>
<div class="topnav"> <div class="topnav">
<a class="active" href="/home/index.html">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 class="" href="/home/index.html">Devices</a> <a href="/devices/index.html">Devices</a>
<a class="" href="/profile/index.html">Profile</a> <a href="/profile/index.html">Profile</a>
<span class="logoutContainer">
<img class="logout" src="/img/logout.png">
</span>
</div> </div>
</div> </div>
<div id="container"> <div id="container">
<div class="chart-container"> <div class="chart-container">
<canvas id="myChart" style="width: 49%; height: 49%;"></canvas> <canvas id="myChart" style="width: 49%; height: 49%;"></canvas>

17
frontend/profile/index.html
View File

@ -13,20 +13,23 @@
<div id="container"> <div id="container">
<div class="topnav"> <div class="topnav">
<a href="/home/index.html">Home</a> <a href="/home/index.html">Home</a>
<a href="/devices/index.html">Devices</a>
<div style="display: flex; justify-content: flex-end;"> <div style="display: flex; justify-content: flex-end;">
<a href="/devices/index.html">Devices</a>
<a class="active" href="/profile/index.html">Profile</a> <a class="active" href="/profile/index.html">Profile</a>
<span class="logoutContainer"> <span class="logoutContainer">
<img class="logout" src="/img/logout.png"> <img class="logout" src="/img/logout.png">
</span> </span>
</div> </div>
</div> </div>
<div id="profileCard"></div> <div style="display: flex; justify-content: center;">
<div class="btnContainer"> <div class="profileContainer">
<button class="btn" id="openEditModal">Edit</button> <div id="profileCard"></div>
<button class="btn" id="openPasswordModal">Change Password</button> <div class="btnContainer">
<button class="btn" id="openEditModal">Edit</button>
</div> <button class="btn" id="openPasswordModal">Change Password</button>
</div>
</div>
</div>
</div> </div>
<div id="editModal" class="modal"> <div id="editModal" class="modal">

10
frontend/scripts/devices.js
View File

@ -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"; import { devices } from "../mockdata/devices.mockdata.js";
let id = localStorage.getItem("id"); getDevices().then(res => {
// getDevicesOnUserId(id).then(res => { buildTable(res)
// buildTable(res) })
// })
buildTable(devices); buildTable(devices);
let selectedReferenceId = null; // Store the selected referenceId let selectedReferenceId = null; // Store the selected referenceId

14
frontend/scripts/services/devices.service.js
View File

@ -1,17 +1,7 @@
import { address } from "../../shared/constants.js";
import { request } from "../../shared/utils.js"; import { request } from "../../shared/utils.js";
export function getDevicesOnUserId(userId) { export function getDevices() {
fetch(`${address}/device/${userId}`, { return request("GET", "/device");
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 update(ids) { export function update(ids) {

13
frontend/scripts/services/users.service.js
View File

@ -1,17 +1,8 @@
import { request } from "../../shared/utils.js"; import { request } from "../../shared/utils.js";
import { address } from "../../shared/constants.js";
import { handleResponse } from "../../shared/utils.js";
export function get(userId) { export function get() {
return fetch(`${address}/user/${userId}`, { return request("GET",`/user/get`)
method: "GET",
headers: {
"Content-Type": "application/json"
},
})
.then(handleResponse)
.catch(err => { error: err.message });
} }
export function login(usernameOrEmail, password) { export function login(usernameOrEmail, password) {

6
frontend/styles/common.css
View File

@ -8,3 +8,9 @@
margin-top: 1rem; margin-top: 1rem;
} }
.logout{
width: 20px;
height: 24px;
}

9
frontend/styles/profile.css
View File

@ -85,3 +85,12 @@ h2{
width: 90%; 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;
}