update

update with speed 2.0 m/s
2025-12-20 15:16:59 +07:00 · 2025-12-17 15:34:15 +07:00 · 2025-11-13 10:02:04 +07:00 · 2025-11-12 14:03:04 +07:00 · 2025-11-06 14:14:10 +07:00 · 2025-11-06 09:22:55 +07:00
252 changed files with 18916 additions and 3922 deletions
--- a/RobotApp.Client/ClientRenderMode.cs
+++ b/RobotApp.Client/ClientRenderMode.cs
@@ -0,0 +1,8 @@
+using Microsoft.AspNetCore.Components.Web;
+
+namespace RobotApp.Client;
+
+public class ClientRenderMode
+{
+    public static InteractiveWebAssemblyRenderMode InteractiveWebAssemblyNoPrerender { get; } = new(prerender: false);
+}
--- a/RobotApp.Client/Components/Mapping/MapView.razor
+++ b/RobotApp.Client/Components/Mapping/MapView.razor
@@ -1,5 +0,0 @@
-<h3>MapView</h3>
-
-@code {
-
-}
--- a/RobotApp.Client/Layout/MainLayout.razor
+++ b/RobotApp.Client/Layout/MainLayout.razor
@@ -1,23 +0,0 @@
-@inherits LayoutComponentBase
-
-<div class="page">
-    <div class="sidebar">
-        <NavMenu />
-    </div>
-
-    <main>
-        <div class="top-row px-4">
-            <a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
-        </div>
-
-        <article class="content px-4">
-            @Body
-        </article>
-    </main>
-</div>
-
-<div id="blazor-error-ui" data-nosnippet>
-    An unhandled error has occurred.
-    <a href="." class="reload">Reload</a>
-    <span class="dismiss">🗙</span>
-</div>
--- a/RobotApp.Client/Layout/MainLayout.razor.css
+++ b/RobotApp.Client/Layout/MainLayout.razor.css
@@ -1,98 +0,0 @@
-.page {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-}
-
-main {
-    flex: 1;
-}
-
-.sidebar {
-    background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
-}
-
-.top-row {
-    background-color: #f7f7f7;
-    border-bottom: 1px solid #d6d5d5;
-    justify-content: flex-end;
-    height: 3.5rem;
-    display: flex;
-    align-items: center;
-}
-
-    .top-row ::deep a, .top-row ::deep .btn-link {
-        white-space: nowrap;
-        margin-left: 1.5rem;
-        text-decoration: none;
-    }
-
-    .top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
-        text-decoration: underline;
-    }
-
-    .top-row ::deep a:first-child {
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-
-@media (max-width: 640.98px) {
-    .top-row {
-        justify-content: space-between;
-    }
-
-    .top-row ::deep a, .top-row ::deep .btn-link {
-        margin-left: 0;
-    }
-}
-
-@media (min-width: 641px) {
-    .page {
-        flex-direction: row;
-    }
-
-    .sidebar {
-        width: 250px;
-        height: 100vh;
-        position: sticky;
-        top: 0;
-    }
-
-    .top-row {
-        position: sticky;
-        top: 0;
-        z-index: 1;
-    }
-
-    .top-row.auth ::deep a:first-child {
-        flex: 1;
-        text-align: right;
-        width: 0;
-    }
-
-    .top-row, article {
-        padding-left: 2rem !important;
-        padding-right: 1.5rem !important;
-    }
-}
-
-#blazor-error-ui {
-    color-scheme: light only;
-    background: lightyellow;
-    bottom: 0;
-    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
-    box-sizing: border-box;
-    display: none;
-    left: 0;
-    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
-    position: fixed;
-    width: 100%;
-    z-index: 1000;
-}
-
-    #blazor-error-ui .dismiss {
-        cursor: pointer;
-        position: absolute;
-        right: 0.75rem;
-        top: 0.5rem;
-    }
--- a/RobotApp.Client/Layout/NavMenu.razor
+++ b/RobotApp.Client/Layout/NavMenu.razor
@@ -1,98 +0,0 @@
-@implements IDisposable
-
-@inject NavigationManager NavigationManager
-
-<div class="top-row ps-3 navbar navbar-dark">
-    <div class="container-fluid">
-        <a class="navbar-brand" href="">RobotApp</a>
-    </div>
-</div>
-
-<input type="checkbox" title="Navigation menu" class="navbar-toggler" />
-
-<div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
-    <nav class="nav flex-column">
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
-                <span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
-            </NavLink>
-        </div>
-
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="counter">
-                <span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Counter
-            </NavLink>
-        </div>
-
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="weather">
-                <span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Weather
-            </NavLink>
-        </div>
-
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="auth">
-                <span class="bi bi-lock-nav-menu" aria-hidden="true"></span> Auth Required
-            </NavLink>
-        </div>
-
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="maps-manager">
-                <span class="bi bi-lock-nav-menu" aria-hidden="true"></span> Map Manager
-            </NavLink>
-        </div>
-
-        <AuthorizeView>
-            <Authorized>
-                <div class="nav-item px-3">
-                    <NavLink class="nav-link" href="Account/Manage">
-                        <span class="bi bi-person-fill-nav-menu" aria-hidden="true"></span> @context.User.Identity?.Name
-                    </NavLink>
-                </div>
-                <div class="nav-item px-3">
-                    <form action="Account/Logout" method="post">
-                        <AntiforgeryToken />
-                        <input type="hidden" name="ReturnUrl" value="@currentUrl" />
-                        <button type="submit" class="nav-link">
-                            <span class="bi bi-arrow-bar-left-nav-menu" aria-hidden="true"></span> Logout
-                        </button>
-                    </form>
-                </div>
-            </Authorized>
-            <NotAuthorized>
-                <div class="nav-item px-3">
-                    <NavLink class="nav-link" href="Account/Register">
-                        <span class="bi bi-person-nav-menu" aria-hidden="true"></span> Register
-                    </NavLink>
-                </div>
-                <div class="nav-item px-3">
-                    <NavLink class="nav-link" href="Account/Login">
-                        <span class="bi bi-person-badge-nav-menu" aria-hidden="true"></span> Login
-                    </NavLink>
-                </div>
-            </NotAuthorized>
-        </AuthorizeView>
-    </nav>
-</div>
-
-@code {
-    private string? currentUrl;
-
-    protected override void OnInitialized()
-    {
-        currentUrl = NavigationManager.ToBaseRelativePath(NavigationManager.Uri);
-        NavigationManager.LocationChanged += OnLocationChanged;
-    }
-
-    private void OnLocationChanged(object? sender, LocationChangedEventArgs e)
-    {
-        currentUrl = NavigationManager.ToBaseRelativePath(e.Location);
-        StateHasChanged();
-    }
-
-    public void Dispose()
-    {
-        NavigationManager.LocationChanged -= OnLocationChanged;
-    }
-}
-
--- a/RobotApp.Client/Layout/NavMenu.razor.css
+++ b/RobotApp.Client/Layout/NavMenu.razor.css
@@ -1,125 +0,0 @@
-.navbar-toggler {
-    appearance: none;
-    cursor: pointer;
-    width: 3.5rem;
-    height: 2.5rem;
-    color: white;
-    position: absolute;
-    top: 0.5rem;
-    right: 1rem;
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1);
-}
-
-.navbar-toggler:checked {
-    background-color: rgba(255, 255, 255, 0.5);
-}
-
-.top-row {
-    min-height: 3.5rem;
-    background-color: rgba(0,0,0,0.4);
-}
-
-.navbar-brand {
-    font-size: 1.1rem;
-}
-
-.bi {
-    display: inline-block;
-    position: relative;
-    width: 1.25rem;
-    height: 1.25rem;
-    margin-right: 0.75rem;
-    top: -1px;
-    background-size: cover;
-}
-
-.bi-house-door-fill-nav-menu {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E");
-}
-
-.bi-plus-square-fill-nav-menu {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E");
-}
-
-.bi-list-nested-nav-menu {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E");
-}
-
-.bi-lock-nav-menu {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath d='M8 1a2 2 0 0 1 2 2v4H6V3a2 2 0 0 1 2-2zm3 6V3a3 3 0 0 0-6 0v4a2 2 0 0 0-2 2v5a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V9a2 2 0 0 0-2-2zM5 8h6a1 1 0 0 1 1 1v5a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V9a1 1 0 0 1 1-1z'/%3E%3C/svg%3E");
-}
-
-.bi-person-nav-menu {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-person' viewBox='0 0 16 16'%3E%3Cpath d='M8 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6Zm2-3a2 2 0 1 1-4 0 2 2 0 0 1 4 0Zm4 8c0 1-1 1-1 1H3s-1 0-1-1 1-4 6-4 6 3 6 4Zm-1-.004c-.001-.246-.154-.986-.832-1.664C11.516 10.68 10.289 10 8 10c-2.29 0-3.516.68-4.168 1.332-.678.678-.83 1.418-.832 1.664h10Z'/%3E%3C/svg%3E");
-}
-
-.bi-person-badge-nav-menu {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-person-badge' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 2a.5.5 0 0 0 0 1h3a.5.5 0 0 0 0-1h-3zM11 8a3 3 0 1 1-6 0 3 3 0 0 1 6 0z'/%3E%3Cpath d='M4.5 0A2.5 2.5 0 0 0 2 2.5V14a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V2.5A2.5 2.5 0 0 0 11.5 0h-7zM3 2.5A1.5 1.5 0 0 1 4.5 1h7A1.5 1.5 0 0 1 13 2.5v10.795a4.2 4.2 0 0 0-.776-.492C11.392 12.387 10.063 12 8 12s-3.392.387-4.224.803a4.2 4.2 0 0 0-.776.492V2.5z'/%3E%3C/svg%3E");
-}
-
-.bi-person-fill-nav-menu {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-person-fill' viewBox='0 0 16 16'%3E%3Cpath d='M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3Zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z'/%3E%3C/svg%3E");
-}
-
-.bi-arrow-bar-left-nav-menu {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-arrow-bar-left' viewBox='0 0 16 16'%3E%3Cpath d='M12.5 15a.5.5 0 0 1-.5-.5v-13a.5.5 0 0 1 1 0v13a.5.5 0 0 1-.5.5ZM10 8a.5.5 0 0 1-.5.5H3.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L3.707 7.5H9.5a.5.5 0 0 1 .5.5Z'/%3E%3C/svg%3E");
-}
-
-.nav-item {
-    font-size: 0.9rem;
-    padding-bottom: 0.5rem;
-}
-
-    .nav-item:first-of-type {
-        padding-top: 1rem;
-    }
-
-    .nav-item:last-of-type {
-        padding-bottom: 1rem;
-    }
-
-    .nav-item ::deep .nav-link {
-        color: #d7d7d7;
-        background: none;
-        border: none;
-        border-radius: 4px;
-        height: 3rem;
-        display: flex;
-        align-items: center;
-        line-height: 3rem;
-        width: 100%;
-    }
-
-.nav-item ::deep a.active {
-    background-color: rgba(255,255,255,0.37);
-    color: white;
-}
-
-.nav-item ::deep .nav-link:hover {
-    background-color: rgba(255,255,255,0.1);
-    color: white;
-}
-
-.nav-scrollable {
-    display: none;
-}
-
-.navbar-toggler:checked ~ .nav-scrollable {
-    display: block;
-}
-
-@media (min-width: 641px) {
-    .navbar-toggler {
-        display: none;
-    }
-
-    .nav-scrollable {
-        /* Never collapse the sidebar for wide screens */
-        display: block;
-
-        /* Allow sidebar to scroll for tall menus */
-        height: calc(100vh - 3.5rem);
-        overflow-y: auto;
-    }
-}
--- a/RobotApp.Client/MainLayout.razor
+++ b/RobotApp.Client/MainLayout.razor
@@ -0,0 +1,86 @@
+@inherits LayoutComponentBase
+
+<script>
+    function toggleSidebar() {
+        let sidebar = document.querySelector(".sidebar");
+        sidebar.classList.toggle("collapsed");
+    }
+</script>
+
+<div class="app-shell">
+    <div class="sidebar collapsed">
+        <div class="flex-grow-1 d-flex flex-column">
+            <div class="title">
+                <img src="images/logoLight.svg" alt="PhenikaaX" style="height: 35px;" onclick="toggleSidebar()" />
+                <button class="btn button" onclick="toggleSidebar()">
+                    <i class="mdi mdi-menu" style="color: white; font-size: 35px"></i>
+                </button>
+            </div>
+            <hr />
+            @foreach (var nav in Navs)
+            {
+                <div class="nav-item px-3">
+                    <NavLink class="nav-link" href="@nav.Path" Match="@nav.Match">
+                        <div class="d-flex align-items-center">
+                            <div class="nav-icon">
+                                <span class="mdi @nav.Icon mdi-36px" aria-hidden="true"></span>
+                            </div>
+                            <span class="nav-label">@nav.Label</span>
+                        </div>
+                    </NavLink>
+                </div>
+            }
+        </div>
+        <div class="user">
+            <div>
+                <span class="mdi mdi-account mdi-36px text-white "></span>
+            </div>
+            <AuthorizeView>
+                <Authorized>
+                    <div class="nav-label">
+                        <MudText Class="text-white" Typo="Typo.subtitle1">@context.User.Identity?.Name</MudText>
+                    </div>
+                </Authorized>
+            </AuthorizeView>
+            <MudSpacer />
+            <form action="Account/Logout" method="post">
+                <AntiforgeryToken />
+                <input type="hidden" name="ReturnUrl" value="" />
+                <button class="btn button">
+                    <i class="mdi mdi-logout" style="color: white; font-size: 35px"></i>
+                </button>
+                @* <MudIconButton Class="text-white" ButtonType="@ButtonType.Submit" Icon="@Icons.Material.Filled.Logout" /> *@
+            </form>
+        </div>
+    </div>
+
+    <main class="page">
+        @Body
+    </main>
+</div>
+
+@code{
+    public class NavModel
+    {
+        public string Icon { get; set; } = "";
+        public string Path { get; set; } = "";
+        public string Label { get; set; } = "";
+        public NavLinkMatch Match { get; set; }
+    }
+
+    public NavModel[] Navs = [
+        new(){Icon = "mdi-view-dashboard", Path="/", Label = "Dashboard", Match = NavLinkMatch.All},
+        // new(){Icon = "mdi-map-legend", Path="/maps-manager", Label = "Mapping", Match = NavLinkMatch.All},
+        new(){Icon = "mdi-application-cog", Path="/robot-config", Label = "Config", Match = NavLinkMatch.All},
+    ];
+
+    private bool collapseNavMenu = true;
+
+    private string? NavMenuCssClass => collapseNavMenu ? "collapse" : null;
+
+    private void ToggleNavMenu()
+    {
+        collapseNavMenu = !collapseNavMenu;
+    }
+}
+
--- a/RobotApp.Client/MainLayout.razor.css
+++ b/RobotApp.Client/MainLayout.razor.css
@@ -0,0 +1,134 @@
+.app-shell {
+    display: flex;
+    min-height: 100vh;
+    min-width: 100vw;
+    width: 100vw;
+    height: 100vh;
+    overflow: hidden;
+    flex-direction: row;
+}
+
+.page {
+    flex: 1 1 auto;
+    min-width: 0;
+    display: flex;
+    overflow: hidden;
+}
+
+
+
+.sidebar {
+    background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
+    height: 100vh;
+    width: 250px;
+    display: flex;
+    flex-direction: column;
+    transition: width 0.3s;
+}
+
+    .sidebar.hidden {
+        display: none;
+    }
+
+    .sidebar .title {
+        margin: 8px 4px 0 4px;
+        flex-direction: row;
+        justify-content: center;
+        align-items: center;
+        display: flex;
+    }
+
+        .sidebar .title button {
+            height: 35px;
+            width: 35px;
+            justify-content: center;
+            align-items: center;
+            overflow: hidden;
+        }
+
+    .sidebar:not(.collapsed) .title button {
+        display: none;
+    }
+
+    .sidebar.collapsed {
+        width: 74px;
+    }
+
+        .sidebar.collapsed .title {
+            justify-content: center;
+        }
+
+            .sidebar.collapsed .title img {
+                display: none;
+            }
+
+            .sidebar.collapsed .title button {
+                display: flex;
+            }
+
+        .sidebar.collapsed .nav-label {
+            display: none;
+        }
+
+    .sidebar .title .button:hover {
+        background-color: rgb(5, 39, 80);
+    }
+
+    .sidebar .user {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+    }
+
+    .sidebar.collapsed .user > div {
+        display: none !important;
+    }
+
+    .sidebar.collapsed .user .nav-label {
+        display: none !important;
+    }
+
+.nav-item {
+    font-size: 0.9rem;
+    padding-bottom: 0.5rem;
+    overflow: hidden;
+}
+
+    .nav-item .nav-label {
+        font-size: 18px;
+        text-wrap: nowrap;
+    }
+
+    .nav-item .nav-icon {
+        height: 48px;
+        width: 48px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        overflow: hidden;
+    }
+
+    .nav-item:first-of-type {
+        padding-top: 1rem;
+    }
+
+    .nav-item:last-of-type {
+        padding-bottom: 1rem;
+    }
+
+    .nav-item ::deep a {
+        color: #d7d7d7;
+        border-radius: 4px;
+        height: 48px;
+        align-items: center;
+    }
+
+        .nav-item ::deep a.active {
+            background-color: rgba(255,255,255,0.37);
+            color: white;
+        }
+
+        .nav-item ::deep a:hover {
+            background-color: rgba(255,255,255,0.1);
+            color: white;
+        }
--- a/RobotApp.Client/Pages/AssemblyLayout.razor
+++ b/RobotApp.Client/Pages/AssemblyLayout.razor
@@ -0,0 +1,12 @@
+@inherits LayoutComponentBase
+@layout RobotApp.Client.MainLayout
+
+<MudThemeProvider @rendermode="InteractiveWebAssemblyNoPrerender" IsDarkMode/>
+<MudPopoverProvider @rendermode="InteractiveWebAssemblyNoPrerender" />
+<MudDialogProvider @rendermode="InteractiveWebAssemblyNoPrerender" MaxWidth="MaxWidth.ExtraLarge"
+                   CloseButton="false"
+                   BackdropClick="false"
+                   Position="DialogPosition.Center" />
+<MudSnackbarProvider @rendermode="InteractiveWebAssemblyNoPrerender" />
+
+@Body
--- a/RobotApp.Client/Pages/Auth.razor
+++ b/RobotApp.Client/Pages/Auth.razor
@@ -1,13 +0,0 @@
-@page "/auth"
-
-@using Microsoft.AspNetCore.Authorization
-
-@attribute [Authorize]
-
-<PageTitle>Auth</PageTitle>
-
-<h1>You are authenticated</h1>
-
-<AuthorizeView>
-    Hello @context.User.Identity?.Name!
-</AuthorizeView>
--- a/RobotApp.Client/Pages/Components/Config/RobotConfig.razor
+++ b/RobotApp.Client/Pages/Components/Config/RobotConfig.razor
@@ -0,0 +1,92 @@
+@implements IDisposable
+
+<div class ="d-flex w-100 h-100 flex-column">
+    <EditForm EditContext="EditContext">
+        <DataAnnotationsValidator />
+
+        <div class="mb-2">
+            <label class="form-label">Navigation Type</label>
+            <InputSelect class="form-select" @bind-Value="Model.NavigationType" TValue="NavigationType">
+                @foreach (var t in NavigationTypes)
+                {
+                    <option value="@t">@t</option>
+                }
+            </InputSelect>
+            <ValidationMessage For="@(() => Model.NavigationType)" />
+        </div>
+
+        <div class="row g-2 mb-2">
+            <div class="col">
+                <label class="form-label">Radius (wheel)</label>
+                <InputNumber class="form-control" @bind-Value="Model.RadiusWheel" />
+                <ValidationMessage For="@(() => Model.RadiusWheel)" />
+            </div>
+            <div class="col">
+                <label class="form-label">Width (m)</label>
+                <InputNumber class="form-control" @bind-Value="Model.Width" />
+                <ValidationMessage For="@(() => Model.Width)" />
+            </div>
+        </div>
+
+        <div class="row g-2 mb-2">
+            <div class="col">
+                <label class="form-label">Length (m)</label>
+                <InputNumber class="form-control" @bind-Value="Model.Length" />
+                <ValidationMessage For="@(() => Model.Length)" />
+            </div>
+            <div class="col">
+                <label class="form-label">Height (m)</label>
+                <InputNumber class="form-control" @bind-Value="Model.Height" />
+                <ValidationMessage For="@(() => Model.Height)" />
+            </div>
+        </div>
+
+        <div class="mb-2">
+            <label class="form-label">Description</label>
+            <InputTextArea class="form-control" @bind-Value="Model.Description" />
+            <ValidationMessage For="@(() => Model.Description)" />
+        </div>
+    </EditForm>
+    <div class="flex-grow-1" />
+    <div>
+        @if (Model.CreatedAt != default || Model.UpdatedAt != default)
+        {
+            <div class="d-flex justify-content-end mt-2">
+                <small class="text-muted">Created: @Model.CreatedAt.ToString("dd/MM/yyyy HH:mm:ss")</small>
+                <small class="text-muted ms-3">Updated: @Model.UpdatedAt.ToString("dd/MM/yyyy HH:mm:ss")</small>
+            </div>
+        }
+    </div>
+</div>
+
+
+@code {
+    [Parameter]
+    public RobotConfigDto Model { get; set; } = new();
+
+    [Parameter]
+    public EventCallback<RobotConfigDto> ModelChanged { get; set; }
+
+    private EditContext? EditContext; 
+    private IEnumerable<NavigationType> NavigationTypes => Enum.GetValues(typeof(NavigationType)).Cast<NavigationType>();
+
+    protected override void OnParametersSet()
+    {
+        if (EditContext is null || !EditContext.Model!.Equals(Model))
+        {
+            if (EditContext is not null) EditContext.OnFieldChanged -= EditContext_OnFieldChanged;
+            EditContext = new EditContext(Model);
+            EditContext.OnFieldChanged += EditContext_OnFieldChanged;
+        }
+    }
+
+    private void EditContext_OnFieldChanged(object? sender, FieldChangedEventArgs e)
+    {
+        _ = ModelChanged.InvokeAsync(Model);
+    }
+
+    public void Dispose()
+    {
+        if (EditContext is not null) EditContext.OnFieldChanged -= EditContext_OnFieldChanged;
+    }
+}
--- a/RobotApp.Client/Pages/Components/Config/RobotPLCConfig.razor
+++ b/RobotApp.Client/Pages/Components/Config/RobotPLCConfig.razor
@@ -0,0 +1,74 @@
+@implements IDisposable
+<div class="d-flex w-100 h-100 flex-column">
+    <EditForm EditContext="EditContext">
+        <DataAnnotationsValidator />
+
+        <div class="row g-2 mb-2">
+            <div class="col-md-8">
+                <label class="form-label">PLC Address</label>
+                <InputText class="form-control" @bind-Value="Model.PLCAddress" />
+                <ValidationMessage For="@(() => Model.PLCAddress)" />
+            </div>
+            <div class="col-md-4">
+                <label class="form-label">Port</label>
+                <InputNumber class="form-control" @bind-Value="Model.PLCPort" />
+                <ValidationMessage For="@(() => Model.PLCPort)" />
+            </div>
+        </div>
+
+        <div class="row g-2 mb-2">
+            <div class="col-md-4">
+                <label class="form-label">Unit Id</label>
+                <InputNumber class="form-control" @bind-Value="Model.PLCUnitId" />
+                <ValidationMessage For="@(() => Model.PLCUnitId)" />
+            </div>
+        </div>
+
+        <div class="mb-2">
+            <label class="form-label">Description</label>
+            <InputTextArea class="form-control" @bind-Value="Model.Description" />
+            <ValidationMessage For="@(() => Model.Description)" />
+        </div>
+
+    </EditForm>
+    <div class="flex-grow-1" />
+    <div>
+        @if (Model.CreatedAt != default || Model.UpdatedAt != default)
+        {
+            <div class="d-flex justify-content-end mt-2">
+                <small class="text-muted">Created: @Model.CreatedAt.ToString("dd/MM/yyyy HH:mm:ss")</small>
+                <small class="text-muted ms-3">Updated: @Model.UpdatedAt.ToString("dd/MM/yyyy HH:mm:ss")</small>
+            </div>
+        }
+    </div>
+</div>
+
+@code {
+    [Parameter]
+    public RobotPlcConfigDto Model { get; set; } = new();
+
+    [Parameter]
+    public EventCallback<RobotPlcConfigDto> ModelChanged { get; set; }
+
+    private EditContext? EditContext;
+
+    protected override void OnParametersSet()
+    {
+        if (EditContext is null || !EditContext.Model!.Equals(Model))
+        {
+            if (EditContext is not null) EditContext.OnFieldChanged -= EditContext_OnFieldChanged;
+            EditContext = new EditContext(Model);
+            EditContext.OnFieldChanged += EditContext_OnFieldChanged;
+        }
+    }
+
+    private void EditContext_OnFieldChanged(object? sender, FieldChangedEventArgs e)
+    {
+        _ = ModelChanged.InvokeAsync(Model);
+    }
+
+    public void Dispose()
+    {
+        if (EditContext is not null) EditContext.OnFieldChanged -= EditContext_OnFieldChanged;
+    }
+}
--- a/RobotApp.Client/Pages/Components/Config/RobotSafetyConfig.razor
+++ b/RobotApp.Client/Pages/Components/Config/RobotSafetyConfig.razor
@@ -0,0 +1,97 @@
+@implements IDisposable
+<div class="d-flex w-100 h-100 flex-column">
+    <EditForm EditContext="EditContext">
+        <DataAnnotationsValidator />
+        <div class="row g-2 mb-2">
+            <div class="col-6">
+                <label class="form-label">Very Slow (m/s)</label>
+                <InputNumber class="form-control" @bind-Value="Model.SafetySpeedVerySlow" />
+                <ValidationMessage For="@(() => Model.SafetySpeedVerySlow)" />
+            </div>
+            <div class="col-6">
+                <label class="form-label">Slow (m/s)</label>
+                <InputNumber class="form-control" @bind-Value="Model.SafetySpeedSlow" />
+                <ValidationMessage For="@(() => Model.SafetySpeedSlow)" />
+            </div>
+        </div>
+
+        <div class="row g-2 mb-2">
+            <div class="col-6">
+                <label class="form-label">Normal (m/s)</label>
+                <InputNumber class="form-control" @bind-Value="Model.SafetySpeedNormal" />
+                <ValidationMessage For="@(() => Model.SafetySpeedNormal)" />
+            </div>
+            <div class="col-6">
+                <label class="form-label">Medium (m/s)</label>
+                <InputNumber class="form-control" @bind-Value="Model.SafetySpeedMedium" />
+                <ValidationMessage For="@(() => Model.SafetySpeedMedium)" />
+            </div>
+        </div>
+
+        <div class="row g-2 mb-2">
+            <div class="col-6">
+                <label class="form-label">Optimal (m/s)</label>
+                <InputNumber class="form-control" @bind-Value="Model.SafetySpeedOptimal" />
+                <ValidationMessage For="@(() => Model.SafetySpeedOptimal)" />
+            </div>
+            <div class="col-6">
+                <label class="form-label">Fast (m/s)</label>
+                <InputNumber class="form-control" @bind-Value="Model.SafetySpeedFast" />
+                <ValidationMessage For="@(() => Model.SafetySpeedFast)" />
+            </div>
+        </div>
+
+        <div class="mb-2">
+            <label class="form-label">Very Fast (m/s)</label>
+            <InputNumber class="form-control" @bind-Value="Model.SafetySpeedVeryFast" />
+            <ValidationMessage For="@(() => Model.SafetySpeedVeryFast)" />
+        </div>
+
+        <div class="mb-2">
+            <label class="form-label">Description</label>
+            <InputTextArea class="form-control" @bind-Value="Model.Description" />
+            <ValidationMessage For="@(() => Model.Description)" />
+        </div>
+    </EditForm>
+    <div class="flex-grow-1" />
+    <div>
+        @if (Model.CreatedAt != default || Model.UpdatedAt != default)
+        {
+            <div class="d-flex justify-content-end mt-2">
+                <small class="text-muted">Created: @Model.CreatedAt.ToString("dd/MM/yyyy HH:mm:ss")</small>
+                <small class="text-muted ms-3">Updated: @Model.UpdatedAt.ToString("dd/MM/yyyy HH:mm:ss")</small>
+            </div>
+        }
+    </div>
+</div>
+
+
+@code {
+    [Parameter]
+    public RobotSafetyConfigDto Model { get; set; } = new();
+
+    [Parameter]
+    public EventCallback<RobotSafetyConfigDto> ModelChanged { get; set; }
+
+    private EditContext? EditContext;
+
+    protected override void OnParametersSet()
+    {
+        if (EditContext is null || !EditContext.Model!.Equals(Model))
+        {
+            if (EditContext is not null) EditContext.OnFieldChanged -= EditContext_OnFieldChanged;
+            EditContext = new EditContext(Model);
+            EditContext.OnFieldChanged += EditContext_OnFieldChanged;
+        }
+    }
+
+    private void EditContext_OnFieldChanged(object? sender, FieldChangedEventArgs e)
+    {
+        _ = ModelChanged.InvokeAsync(Model);
+    }
+
+    public void Dispose()
+    {
+        if (EditContext is not null) EditContext.OnFieldChanged -= EditContext_OnFieldChanged;
+    }
+}
--- a/RobotApp.Client/Pages/Components/Config/RobotSimulationConfig.razor
+++ b/RobotApp.Client/Pages/Components/Config/RobotSimulationConfig.razor
@@ -0,0 +1,85 @@
+@implements IDisposable
+
+<div class="d-flex w-100 h-100 flex-column">
+    <EditForm EditContext="EditContext">
+        <DataAnnotationsValidator />
+
+        <div class="form-check mb-2">
+            <InputCheckbox class="form-check-input" Value="Model.EnableSimulation" />
+            <label class="form-check-label">Enable Simulation</label>
+            <ValidationMessage For="@(() => Model.EnableSimulation)" />
+        </div>
+
+        <div class="row g-2 mb-2">
+            <div class="col-md-6">
+                <label class="form-label">Max Velocity (m/s)</label>
+                <InputNumber class="form-control" @bind-Value="Model.SimulationMaxVelocity" />
+                <ValidationMessage For="@(() => Model.SimulationMaxVelocity)" />
+            </div>
+            <div class="col-md-6">
+                <label class="form-label">Max Angular Velocity (rad/s)</label>
+                <InputNumber class="form-control" @bind-Value="Model.SimulationMaxAngularVelocity" />
+                <ValidationMessage For="@(() => Model.SimulationMaxAngularVelocity)" />
+            </div>
+        </div>
+
+        <div class="row g-2 mb-2">
+            <div class="col-md-6">
+                <label class="form-label">Acceleration (m/s²)</label>
+                <InputNumber class="form-control" @bind-Value="Model.SimulationAcceleration" />
+                <ValidationMessage For="@(() => Model.SimulationAcceleration)" />
+            </div>
+            <div class="col-md-6">
+                <label class="form-label">Deceleration (m/s²)</label>
+                <InputNumber class="form-control" @bind-Value="Model.SimulationDeceleration" />
+                <ValidationMessage For="@(() => Model.SimulationDeceleration)" />
+            </div>
+        </div>
+
+        <div class="mb-2">
+            <label class="form-label">Description</label>
+            <InputTextArea class="form-control" @bind-Value="Model.Description" />
+            <ValidationMessage For="@(() => Model.Description)" />
+        </div>
+    </EditForm>
+    <div class="flex-grow-1" />
+    <div>
+        @if (Model.CreatedAt != default || Model.UpdatedAt != default)
+        {
+            <div class="d-flex justify-content-end mt-2">
+                <small class="text-muted">Created: @Model.CreatedAt.ToString("dd/MM/yyyy HH:mm:ss")</small>
+                <small class="text-muted ms-3">Updated: @Model.UpdatedAt.ToString("dd/MM/yyyy HH:mm:ss")</small>
+            </div>
+        }
+    </div>
+</div>
+
+@code {
+    [Parameter]
+    public RobotSimulationConfigDto Model { get; set; } = new();
+
+    [Parameter]
+    public EventCallback<RobotSimulationConfigDto> ModelChanged { get; set; }
+
+    private EditContext? EditContext;
+
+    protected override void OnParametersSet()
+    {
+        if (EditContext is null || !EditContext.Model!.Equals(Model))
+        {
+            if (EditContext is not null) EditContext.OnFieldChanged -= EditContext_OnFieldChanged;
+            EditContext = new EditContext(Model);
+            EditContext.OnFieldChanged += EditContext_OnFieldChanged;
+        }
+    }
+
+    private void EditContext_OnFieldChanged(object? sender, FieldChangedEventArgs e)
+    {
+        _ = ModelChanged.InvokeAsync(Model);
+    }
+
+    public void Dispose()
+    {
+        if (EditContext is not null) EditContext.OnFieldChanged -= EditContext_OnFieldChanged;
+    }
+}
--- a/RobotApp.Client/Pages/Components/Config/RobotVDA5050Config.razor
+++ b/RobotApp.Client/Pages/Components/Config/RobotVDA5050Config.razor
@@ -0,0 +1,329 @@
+@implements IDisposable
+
+<div class="d-flex w-100 h-100 flex-column">
+    <EditForm EditContext="EditContext">
+        <DataAnnotationsValidator />
+
+        <div class="row g-2 mb-2">
+            <div class="col-md-6">
+                <label class="form-label" for="serialNumber">Serial Number</label>
+                <InputText id="serialNumber" class="form-control" @bind-Value="Model.SerialNumber" />
+                <ValidationMessage For="@(() => Model.SerialNumber)" />
+            </div>
+            <div class="col-md-6">
+                <label class="form-label" for="prefix">Topic Prefix</label>
+                <InputText id="prefix" class="form-control" @bind-Value="Model.VDA5050TopicPrefix"/>
+                <ValidationMessage For="@(() => Model.VDA5050TopicPrefix)" />
+            </div>
+        </div>
+
+        <div class="row g-2 mb-2">
+            <div class="col-md-6">
+                <label class="form-label" for="manufacturer">Manufacturer</label>
+                <InputText id="manufacturer" class="form-control" @bind-Value="Model.VDA5050Manufacturer" disabled="true" />
+                <ValidationMessage For="@(() => Model.VDA5050Manufacturer)" />
+            </div>
+            <div class="col-md-6">
+                <label class="form-label" for="version">Version</label>
+                <InputText id="version" class="form-control" @bind-Value="Model.VDA5050Version" disabled="true" />
+                <ValidationMessage For="@(() => Model.VDA5050Version)" />
+            </div>
+        </div>
+
+        <div class="row g-2 mb-2">
+            <div class="col-md-6">
+                <label class="form-label" for="host">Host</label>
+                <InputText id="host" class="form-control" @bind-Value="Model.VDA5050HostServer" />
+                <ValidationMessage For="@(() => Model.VDA5050HostServer)" />
+            </div>
+            <div class="col-md-3">
+                <label class="form-label" for="port">Port</label>
+                <InputNumber id="port" class="form-control" @bind-Value="Model.VDA5050Port" />
+                <ValidationMessage For="@(() => Model.VDA5050Port)" />
+            </div>
+            <div class="col-md-3">
+                <label class="form-label" for="publishRepeat">Publish Repeat</label>
+                <InputNumber id="publishRepeat" class="form-control" @bind-Value="Model.VDA5050PublishRepeat" />
+                <ValidationMessage For="@(() => Model.VDA5050PublishRepeat)" />
+            </div>
+        </div>
+
+        <div class="row g-2 mb-2">
+            <div class="col-md-6">
+                <label class="form-label" for="username">Username</label>
+                <InputText id="username" class="form-control" @bind-Value="Model.VDA5050UserName" />
+                <ValidationMessage For="@(() => Model.VDA5050UserName)" />
+            </div>
+            <div class="col-md-6">
+                <label class="form-label" for="password">Password</label>
+                <div class="password-input-wrapper">
+                    <InputText id="password" class="form-control password-input" @bind-Value="Model.VDA5050Password" inputmode="text" type="@PasswordInputType" autocomplete="new-password" spellcheck="false" />
+                    <button class="password-toggle-btn" type="button" @onclick="TogglePasswordVisibility" aria-label="Toggle password visibility">
+                        <i class="@PasswordIconClass" aria-hidden="true"></i>
+                    </button>
+                </div>
+                <ValidationMessage For="@(() => Model.VDA5050Password)" />
+            </div>
+        </div>
+
+        <div class="form-check mb-2">
+            <InputCheckbox id="enablePassword" class="form-check-input" @bind-Value="Model.VDA5050EnablePassword" />
+            <label class="form-check-label" for="enablePassword">Enable Password</label>
+            <ValidationMessage For="@(() => Model.VDA5050EnablePassword)" />
+        </div>
+
+        <div class="form-check mb-2">
+            <InputCheckbox id="enableTls" class="form-check-input" @bind-Value="Model.VDA5050EnableTls" />
+            <label class="form-check-label" for="enableTls">Enable TLS</label>
+            <ValidationMessage For="@(() => Model.VDA5050EnableTls)" />
+        </div>
+
+        <div class="mb-2">
+            <label class="form-label" for="caFile">CA File</label>
+            <div class="custom-file-input-wrapper position-relative">
+                <InputFile class="d-none" id="caFile" OnChange="e => OnFileSelected(e, FileSlot.Ca)" accept=".crt,.pem,.cer,.pfx,.key,.jks" />
+                <div class="form-control d-flex align-items-center gap-2 ps-0">
+                    <label for="caFile" class="upload-btn d-flex align-items-center gap-1">
+                        <i class="mdi mdi-attachment"></i>
+                    </label>
+
+                    <span id="fileNameDisplay" class="text-muted flex-grow-1 text-truncate" style="max-width: 200px;">
+                        @Model.VDA5050CA
+                    </span>
+
+                    <button class="password-toggle-btn position-absolute rounded-end-2 top-50 translate-middle-y" type="button" @onclick="() => RemoveFile(FileSlot.Ca)" aria-label="Remove client certificate file">
+                        <i class="mdi mdi-close" aria-hidden="true"></i>
+                    </button>
+                </div>
+            </div>
+            @if (!string.IsNullOrEmpty(CaFileInfo))
+            {
+                <div class="small text-muted mt-1 mb-1">@CaFileInfo</div>
+            }
+            @if (!string.IsNullOrEmpty(CaFileError))
+            {
+                <div class="text-danger small mt-1 mb-1">@CaFileError</div>
+            }
+        </div>
+
+        <div class="mb-2">
+            <label class="form-label" for="clientCertFile">Client Certificate File</label>
+            <div class="custom-file-input-wrapper position-relative">
+                <InputFile class="d-none" id="clientCertFile" OnChange="e => OnFileSelected(e, FileSlot.Cert)" accept=".crt,.pem,.cer,.pfx,.key,.jks" />
+                <div class="form-control d-flex align-items-center gap-2 ps-0">
+                    <label for="clientCertFile" class="upload-btn d-flex align-items-center gap-1">
+                        <i class="mdi mdi-attachment"></i>
+                    </label>
+
+                    <span id="fileNameDisplay" class="text-muted flex-grow-1 text-truncate" style="max-width: 200px;">
+                        @Model.VDA5050Cer
+                    </span>
+
+                    <button class="password-toggle-btn position-absolute rounded-end-2 top-50 translate-middle-y" type="button" @onclick="() => RemoveFile(FileSlot.Cert)" aria-label="Remove client certificate file">
+                        <i class="mdi mdi-close" aria-hidden="true"></i>
+                    </button>
+                </div>
+            </div>
+            @if (!string.IsNullOrEmpty(CertFileInfo))
+            {
+                <div class="small text-muted mt-1 mb-1">@CertFileInfo</div>
+            }
+            @if (!string.IsNullOrEmpty(CertFileError))
+            {
+                <div class="text-danger small mt-1 mb-1">@CertFileError</div>
+            }
+        </div>
+
+        <div class="mb-2">
+            <label class="form-label" for="clientKeyFile">Client Key File</label>
+            <div class="custom-file-input-wrapper position-relative">
+                <InputFile class="d-none" id="clientKeyFile" OnChange="e => OnFileSelected(e, FileSlot.Key)" accept=".crt,.pem,.cer,.pfx,.key,.jks" />
+                <div class="form-control d-flex align-items-center gap-2 ps-0">
+                    <label for="clientKeyFile" class="upload-btn d-flex align-items-center gap-1">
+                        <i class="mdi mdi-attachment"></i>
+                    </label>
+
+                    <span id="fileNameDisplay" class="text-muted flex-grow-1 text-truncate" style="max-width: 200px;">
+                        @Model.VDA5050Key
+                    </span>
+
+                    <button class="password-toggle-btn position-absolute rounded-end-2 top-50 translate-middle-y" type="button" @onclick="() => RemoveFile(FileSlot.Key)" aria-label="Remove client key file">
+                        <i class="mdi mdi-close" aria-hidden="true"></i>
+                    </button>
+                </div>
+            </div>
+            @if (!string.IsNullOrEmpty(KeyFileInfo))
+            {
+                <div class="small text-muted mt-1 mb-1">@KeyFileInfo</div>
+            }
+            @if (!string.IsNullOrEmpty(KeyFileError))
+            {
+                <div class="text-danger small mt-1 mb-1">@KeyFileError</div>
+            }
+        </div>
+
+        <div class="mb-2">
+            <label class="form-label" for="description">Description</label>
+            <InputTextArea id="description m-1" class="form-control" @bind-Value="Model.Description" />
+            <ValidationMessage For="@(() => Model.Description)" />
+        </div>
+    </EditForm>
+    <div class="flex-grow-1" />
+    <div>
+        @if (Model.CreatedAt != default || Model.UpdatedAt != default)
+        {
+            <div class="d-flex justify-content-end mt-2">
+                <small class="text-muted">Created: @Model.CreatedAt.ToString("dd/MM/yyyy HH:mm:ss")</small>
+                <small class="text-muted ms-3">Updated: @Model.UpdatedAt.ToString("dd/MM/yyyy HH:mm:ss")</small>
+            </div>
+        }
+    </div>
+</div>
+
+@code {
+    [Parameter]
+    public RobotVDA5050ConfigDto Model { get; set; } = new();
+
+    [Parameter]
+    public EventCallback<RobotVDA5050ConfigDto> ModelChanged { get; set; }
+
+    public IBrowserFile? CaFile { get; set; }
+    public IBrowserFile? CertFile { get; set; }
+    public IBrowserFile? KeyFile { get; set; }
+    public long MaxFileSize { get; set; } = 10 * 1024 * 1024;
+
+    private EditContext? EditContext;
+    private bool showPassword;
+    private string PasswordInputType => showPassword ? "text" : "password";
+    private string PasswordIconClass => showPassword ? "mdi mdi-eye-off" : "mdi mdi-eye";
+
+    private enum FileSlot { Ca, Cert, Key }
+
+    private string? CaFileInfo;
+    private string? CaFileError;
+
+    private string? CertFileInfo;
+    private string? CertFileError;
+
+    private string? KeyFileInfo;
+    private string? KeyFileError;
+
+    private async Task OnFileSelected(InputFileChangeEventArgs e, FileSlot slot)
+    {
+        var file = e.File;
+        if (file is null)
+            return;
+
+        if (file.Size > MaxFileSize)
+        {
+            SetFileError(slot, $"File too large (max {FormatSize(MaxFileSize)})");
+            SetFileInfo(slot, string.Empty, 0);
+            return;
+        }
+
+        try
+        {
+            using var stream = file.OpenReadStream(MaxFileSize);
+            using var ms = new MemoryStream();
+            await stream.CopyToAsync(ms);
+            var data = ms.ToArray();
+
+            SetFileError(slot, null);
+            SetFileInfo(slot, file.Name, file.Size);
+            SetFileName(slot, file.Name);
+            SetBrowserFile(slot, file);
+            _ = ModelChanged.InvokeAsync(Model);
+        }
+        catch
+        {
+            SetFileError(slot, "Failed to read file");
+        }
+    }
+
+    private void RemoveFile(FileSlot slot)
+    {
+        SetFileInfo(slot, string.Empty, 0);
+        SetFileError(slot, null);
+        SetFileName(slot, string.Empty);
+
+        _ = ModelChanged.InvokeAsync(Model);
+    }
+
+    private void SetFileError(FileSlot slot, string? error)
+    {
+        switch (slot)
+        {
+            case FileSlot.Ca: CaFileError = error; break;
+            case FileSlot.Cert: CertFileError = error; break;
+            case FileSlot.Key: KeyFileError = error; break;
+        }
+    }
+
+    private void SetFileInfo(FileSlot slot, string? name, long size)
+    {
+        switch (slot)
+        {
+            case FileSlot.Ca: CaFileInfo = string.IsNullOrEmpty(name) ? "" : $"{name} {FormatSize(size)}"; break;
+            case FileSlot.Cert: CertFileInfo = string.IsNullOrEmpty(name) ? "" : $"{name} {FormatSize(size)}"; break;
+            case FileSlot.Key: KeyFileInfo = string.IsNullOrEmpty(name) ? "" : $"{name} {FormatSize(size)}"; break;
+        }
+    }
+
+    private void SetFileName(FileSlot slot, string? name)
+    {
+        switch (slot)
+        {
+            case FileSlot.Ca: Model.VDA5050CA = name; break;
+            case FileSlot.Cert: Model.VDA5050Cer = name; break;
+            case FileSlot.Key: Model.VDA5050Key = name; break;
+        }
+    }
+
+    private void SetBrowserFile(FileSlot slot, IBrowserFile file)
+    {
+        switch (slot)
+        {
+            case FileSlot.Ca: CaFile = file; break;
+            case FileSlot.Cert: CertFile = file; break;
+            case FileSlot.Key: KeyFile = file; break;
+        }
+    }
+
+    private static string FormatSize(long size)
+    {
+        if (size <= 0) return "0 B";
+        if (size < 1024) return $"{size} B";
+        double kb = size / 1024.0;
+        if (kb < 1024) return $"{kb:F1} KB";
+        double mb = kb / 1024.0;
+        return $"{mb:F2} MB";
+    }
+
+    protected override void OnParametersSet()
+    {
+        if (EditContext is null || !EditContext.Model!.Equals(Model))
+        {
+            if (EditContext is not null) EditContext.OnFieldChanged -= EditContext_OnFieldChanged;
+            EditContext = new EditContext(Model);
+            EditContext.OnFieldChanged += EditContext_OnFieldChanged;
+            CaFileInfo = string.Empty;
+            CertFileInfo = string.Empty;
+            KeyFileInfo = string.Empty;
+        }
+    }
+
+    private void TogglePasswordVisibility()
+    {
+        showPassword = !showPassword;
+    }
+
+    private void EditContext_OnFieldChanged(object? sender, FieldChangedEventArgs e)
+    {
+        _ = ModelChanged.InvokeAsync(Model);
+    }
+
+    public void Dispose()
+    {
+        if (EditContext is not null) EditContext.OnFieldChanged -= EditContext_OnFieldChanged;
+    }
+}
--- a/RobotApp.Client/Pages/Components/Config/RobotVDA5050Config.razor.css
+++ b/RobotApp.Client/Pages/Components/Config/RobotVDA5050Config.razor.css
@@ -0,0 +1,93 @@
+/* wrapper positions the toggle inside the input */
+.password-input-wrapper {
+    position: relative;
+    display: block;
+}
+
+/* add right padding so text doesn't overlap the icon */
+.password-input {
+    padding-right: 2.25rem; /* adjust as needed for icon size */
+}
+
+/* icon button sits absolutely inside the input at the right */
+.password-toggle-btn {
+    position: absolute;
+    right: 0.5rem;
+    top: 50%;
+    transform: translateY(-50%);
+    border: none;
+    background: transparent;
+    padding: 0;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    color: inherit;
+    line-height: 1;
+}
+
+/* keep the native focus behavior but provide visible ring for keyboard users */
+.password-toggle-btn:focus {
+    outline: none;
+}
+
+.password-toggle-btn:focus-visible {
+    box-shadow: 0 0 0 3px rgba(13, 110, 253, 0.15);
+    border-radius: 0.25rem;
+}
+
+/* tune icon size */
+.password-toggle-btn .mdi {
+    font-size: 1.15rem;
+    pointer-events: none; /* let clicks hit the button, not the icon */
+}
+
+.file-input-wrapper {
+    max-width: 100%;
+}
+
+.custom-file-input-wrapper {
+    max-width: 100%;
+}
+
+    .custom-file-input-wrapper .form-control {
+        height: 38px;
+        padding-right: 50px;
+        background-color: #f8f9fa;
+        border: 1px solid #ced4da;
+    }
+
+.text-truncate {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+/* === NÚT LABEL GIỐNG BUTTON THẬT === */
+.upload-btn {
+    cursor: pointer;
+    transition: all 0.2s ease;
+    user-select: none;
+    min-width: 50px;
+    font-size: 23px;
+    justify-content: center;
+    border-right: 1px solid silver;
+    border-radius: 0.25rem;
+}
+
+    /* HOVER: đổi màu nền + viền */
+    .upload-btn:hover {
+        background-color: #e7f3ff !important;
+    }
+
+    /* FOCUS: khi tab đến (accessibility) */
+    .upload-btn:focus {
+        outline: 2px solid transparent;
+        box-shadow: 0 0 0 0.2rem rgba(13, 110, 253, 0.5) !important;
+    }
+
+    /* ACTIVE: khi nhấn */
+    .upload-btn:active {
+        transform: translateY(0);
+        background-color: #d0e8ff !important;
+    }
--- a/RobotApp.Client/Pages/Components/Mapping/MapTable.razor
+++ b/RobotApp.Client/Pages/Components/Mapping/MapTable.razor
@@ -0,0 +1,136 @@
+@inject HttpClient Http
+@inject IJSRuntime JS
+
+<div @ref="ViewContainerRef" class="w-100 h-100">
+    <MudTable Class="h-100 w-100" @ref="Table" Items="@MapsShow" T="MapDto" Dense Hover ReadOnly FixedHeader RowClass="cursor-pointer" Striped Elevation="10"
+              ServerData="ReloadData" Loading=@IsLoading Height="@($"{TableHeight}px")" HorizontalScrollbar=true>
+        <ToolBarContent>
+            <h4>Maps</h4>
+        </ToolBarContent>
+        <HeaderContent>
+            <MudTh>Nr</MudTh>
+            <MudTh>Name</MudTh>
+            <MudTh>Width (m)</MudTh>
+            <MudTh>Height (m)</MudTh>
+            <MudTh>Resolution (m/px)</MudTh>
+            <MudTh>OriginX</MudTh>
+            <MudTh>OriginY</MudTh>
+            <MudTh></MudTh>
+        </HeaderContent>
+        <RowTemplate>
+            <MudTd DataLabel="Nr">
+                @(Table?.CurrentPage * Table?.RowsPerPage + MapsShow.IndexOf(context) + 1)
+            </MudTd>
+            <MudTd DataLabel="Name">
+                @context.Name
+            </MudTd>
+            <MudTd DataLabel="Width">
+                @context.Width
+            </MudTd>
+            <MudTd DataLabel="Height">
+                @context.Height
+            </MudTd>
+            <MudTd DataLabel="Resolution">
+                @context.Resolution
+            </MudTd>
+            <MudTd DataLabel="OriginX">
+                @context.OriginX
+            </MudTd>
+            <MudTd DataLabel="OriginY">
+                @context.OriginY
+            </MudTd>
+            <MudTd>
+                <MudMenuItem Icon="@Icons.Material.Filled.Edit" IconColor="Color.Info">Active</MudMenuItem>
+                <MudMenuItem Icon="@Icons.Material.Filled.Delete" IconColor="Color.Error">Delete</MudMenuItem>
+            </MudTd>
+        </RowTemplate>
+        <PagerContent>
+            <div class="d-flex w-100 flex-row-reverse">
+                <MudTablePager Style="width: 100%;" PageSizeOptions="new[] { 25, 100, 200 }" />
+            </div>
+        </PagerContent>
+    </MudTable>
+</div>
+
+
+@code {
+    private string txtSearch = "";
+    private bool IsLoading = false;
+
+    private List<MapDto> Maps = [];
+    private List<MapDto> MapsShow = [];
+
+    private MapDto MapSelected = new();
+
+    private MudTable<MapDto>? Table;
+    private ElementReference ViewContainerRef;
+
+    private double TableHeight = 105;
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        await base.OnAfterRenderAsync(firstRender);
+        if (!firstRender) return;
+
+        var containerSize = await JS.InvokeAsync<DomRect>("getElementSize", ViewContainerRef);
+        TableHeight = containerSize.Height - 105;
+        // await LoadMaps();
+        StateHasChanged();
+    }
+
+    private async Task LoadMaps()
+    {
+        try
+        {
+            IsLoading = true;
+            Maps.Clear();
+            StateHasChanged();
+
+            var maps = await Http.GetFromJsonAsync<IEnumerable<MapDto>>($"api/MapsManager?txtSearch={txtSearch}");
+            Maps.AddRange(maps ?? []);
+
+            Table?.ReloadServerData();
+            IsLoading = false;
+            StateHasChanged();
+        }
+        catch
+        {
+            return;
+        }
+    }
+
+    private void TextSearchChanged(string text)
+    {
+        txtSearch = text;
+        Table?.ReloadServerData();
+    }
+
+    private bool FilterFunc(MapDto map)
+    {
+        if (string.IsNullOrWhiteSpace(txtSearch))
+            return true;
+        if (map.Name is not null && map.Name.Contains(txtSearch, StringComparison.OrdinalIgnoreCase))
+            return true;
+        if ($"{map.Name}".Contains(txtSearch))
+            return true;
+        return false;
+    }
+
+    private Task<TableData<MapDto>> ReloadData(TableState state, CancellationToken _)
+    {
+        MapsShow.Clear();
+        var tasks = new List<MapDto>();
+        Maps.ForEach(map =>
+        {
+            if (FilterFunc(map)) tasks.Add(map);
+        });
+        MapsShow = tasks.Skip(state.Page * state.PageSize).Take(state.PageSize).ToList();
+        return Task.FromResult(new TableData<MapDto>() { TotalItems = tasks.Count, Items = MapsShow });
+    }
+
+    public class DomRect
+    {
+        public double Width { get; set; }
+        public double Height { get; set; }
+    }
+}
--- a/RobotApp.Client/Pages/Components/Mapping/MapTable.razor.css
+++ b/RobotApp.Client/Pages/Components/Mapping/MapTable.razor.css
@@ -0,0 +1,5 @@
+.map-preview {
+    width: 20%;
+    height: 100%;
+    border-left: 1px solid silver;
+}
--- a/RobotApp.Client/Pages/Components/Mapping/MapView.razor
+++ b/RobotApp.Client/Pages/Components/Mapping/MapView.razor
@@ -0,0 +1,466 @@
+@inject IJSRuntime JS
+@using Excubo.Blazor.Canvas.Contexts
+
+<div class="view">
+    <div class="toolbar">
+        <MudTooltip Text="Zoom In" role="button" Placement="Placement.Bottom" Color="Color.Info">
+            <button type="button" class="btn btn-secondary action-button" @onclick="ZoomIn">
+                <i class="mdi mdi-magnify-plus-outline icon-button"></i>
+            </button>
+        </MudTooltip>
+        <MudTooltip Text="Zoom Out" role="button" Placement="Placement.Bottom" Color="Color.Info">
+            <button type="button" class="btn btn-secondary action-button" @onclick="ZoomOut">
+                <i class="mdi mdi-magnify-minus-outline icon-button"></i>
+            </button>
+        </MudTooltip>
+        <MudTooltip Text="Reset View" role="button" Placement="Placement.Bottom" Color="Color.Info">
+            <button type="button" class="btn btn-secondary action-button" @onclick="ResetView">
+                <i class="mdi mdi-fit-to-screen-outline icon-button"></i>
+            </button>
+        </MudTooltip>
+        <MudSpacer />
+        <MudTooltip Text="Start Localization" role="button" Placement="Placement.Bottom" Color="Color.Info">
+            <button type="button" class="btn btn-secondary action-button" disabled="@(false)">
+                <i class="mdi mdi-play icon-button"></i>
+            </button>
+        </MudTooltip>
+        <MudTooltip Text="Stop Localization" role="button" Placement="Placement.Bottom" Color="Color.Info">
+            <button type="button" class="btn btn-secondary action-button" disabled="@(true)">
+                <i class="mdi mdi-pause icon-button"></i>
+            </button>
+        </MudTooltip>
+        <MudTooltip Text="Start Mapping" role="button" Placement="Placement.Bottom" Color="Color.Info">
+            <button type="button" class="btn btn-secondary action-button" disabled="@(false)">
+                <i class="mdi mdi-plus icon-button"></i>
+            </button>
+        </MudTooltip>
+        <MudTooltip Text="Stop Mapping" role="button" Placement="Placement.Bottom" Color="Color.Info">
+            <button type="button" class="btn btn-secondary action-button" disabled="@(true)">
+                <i class="mdi mdi-stop icon-button"></i>
+            </button>
+        </MudTooltip>
+    </div>
+    <div @ref="ViewContainerRef">
+        <canvas @ref="CanvasRef"
+                @onwheel="HandleWheel"
+                @onmousemove="HandleMouseMove"
+                @onmouseleave="HandleMouseLeave"
+                @ontouchstart="HandleTouchStart"
+                @ontouchmove="HandleTouchMove"
+                @ontouchend="HandleTouchEnd"></canvas>
+    </div>
+</div>
+
+@code {
+    private ElementReference CanvasRef;
+    private ElementReference ViewContainerRef;
+
+    private double ZoomScale = 1.0;
+    private const double MIN_ZOOM = 0.1;
+    private const double MAX_ZOOM = 5.0;
+
+    private const double BASE_PIXELS_PER_METER = 50.0;
+
+    private bool IsMouseInCanvas = false;
+    private double MouseX;
+    private double MouseY;
+
+    private double OriginX = 0;
+    private double OriginY = 0;
+
+    private double WorldMouseX;
+    private double WorldMouseY;
+
+    private double CanvasWidth;
+    private double CanvasHeight;
+
+    private double CanvasTranslateX = 0;
+    private double CanvasTranslateY = 0;
+
+    private const double RulerHeight = 20;
+
+    private const double RobotWidth = 0.606;
+    private const double RobotLength = 1.106;
+
+    private bool RobotImageLoaded = false;
+    private bool MapImageLoaded = false;
+
+    private const double ImageX = -10;
+    private const double ImageY = -5;
+    private const double ImageResolution = 0.05;
+
+    private double MapImageWidth = 0;
+    private double MapImageHeight = 0;
+    private const string MAP_CACHE_KEY = "map_image";
+
+    private TouchPoint? LastTouchPoint;
+    private TouchPoint? LastSecondTouchPoint;
+    private double LastTouchDistance = 0;
+    private bool IsTouching = false;
+
+    protected override async Task OnAfterRenderAsync(bool first_render)
+    {
+        await base.OnAfterRenderAsync(first_render);
+        if (!first_render) return;
+
+        var containerSize = await JS.InvokeAsync<DomRect>("getElementSize", ViewContainerRef);
+
+        CanvasWidth = containerSize.Width;
+        CanvasHeight = containerSize.Height;
+
+        await JS.InvokeVoidAsync("setCanvasSize", CanvasRef, CanvasWidth, CanvasHeight);
+
+        CanvasTranslateX = CanvasWidth / 2;
+        CanvasTranslateY = CanvasHeight / 2;
+
+        await LoadRobotImage();
+        await LoadMapImage();
+
+        await DrawCanvas();
+    }
+
+    private async Task LoadRobotImage()
+    {
+        try
+        {
+            await JS.InvokeVoidAsync("preloadImage", "images/AMR-250.png");
+            RobotImageLoaded = true;
+        }
+        catch
+        {
+            RobotImageLoaded = false;
+        }
+    }
+
+    private async Task LoadMapImage()
+    {
+        try
+        {
+            MapImageLoaded = false;
+            string apiUrl = "api/images/mapping";
+            await JS.InvokeVoidAsync("preloadImageFromUrl", apiUrl, MAP_CACHE_KEY);
+
+            var imageDimensions = await JS.InvokeAsync<DomRect>("getImageDimensions", MAP_CACHE_KEY);
+            MapImageWidth = imageDimensions.Width * ImageResolution;
+            MapImageHeight = imageDimensions.Height * ImageResolution;
+            if (MapImageWidth > 0 && MapImageHeight > 0) MapImageLoaded = true;
+        }
+        catch
+        {
+            MapImageLoaded = false;
+        }
+    }
+
+    private async Task ResetView()
+    {
+        CanvasTranslateX = CanvasWidth / 2;
+        CanvasTranslateY = CanvasHeight / 2;
+        ZoomScale = 1.0;
+        StateHasChanged();
+        await DrawCanvas();
+    }
+
+    private async Task ZoomIn()
+    {
+        const double zoomFactor = 0.15;
+        double oldZoom = ZoomScale;
+
+        ZoomScale = Math.Min(MAX_ZOOM, ZoomScale * (1 + zoomFactor));
+
+        if (Math.Abs(ZoomScale - oldZoom) < 0.001) return;
+
+        await ZoomAtCenter(oldZoom);
+    }
+
+    private async Task ZoomOut()
+    {
+        const double zoomFactor = 0.15;
+        double oldZoom = ZoomScale;
+
+        ZoomScale = Math.Max(MIN_ZOOM, ZoomScale * (1 - zoomFactor));
+
+        if (Math.Abs(ZoomScale - oldZoom) < 0.001) return;
+
+        await ZoomAtCenter(oldZoom);
+    }
+
+    private async Task ZoomAtCenter(double oldZoom)
+    {
+        double centerX = CanvasWidth / 2;
+        double centerY = CanvasHeight / 2;
+
+        double centerWorldX = (centerX - CanvasTranslateX) / oldZoom / BASE_PIXELS_PER_METER - OriginX;
+        double centerWorldY = (centerY - CanvasTranslateY) / oldZoom / BASE_PIXELS_PER_METER - OriginY;
+
+        double newCenterCanvasX = (centerWorldX + OriginX) * BASE_PIXELS_PER_METER * ZoomScale;
+        double newCenterCanvasY = (centerWorldY + OriginY) * BASE_PIXELS_PER_METER * ZoomScale;
+
+        CanvasTranslateX = centerX - newCenterCanvasX;
+        CanvasTranslateY = centerY - newCenterCanvasY;
+
+        if (IsMouseInCanvas)
+        {
+            WorldMouseX = CanvasToWorldX(MouseX);
+            WorldMouseY = CanvasToWorldY(MouseY);
+        }
+
+        StateHasChanged();
+        await DrawCanvas();
+    }
+
+    private async Task HandleMouseMove(MouseEventArgs e)
+    {
+        MouseX = e.OffsetX;
+        MouseY = e.OffsetY;
+        IsMouseInCanvas = true;
+
+        WorldMouseX = CanvasToWorldX(MouseX);
+        WorldMouseY = CanvasToWorldY(MouseY);
+
+        StateHasChanged();
+
+        if (e.Buttons == 4)
+        {
+            CanvasTranslateX += e.MovementX;
+            CanvasTranslateY -= e.MovementY;
+        }
+        await DrawCanvas();
+    }
+
+    private async Task HandleMouseLeave(MouseEventArgs e)
+    {
+        IsMouseInCanvas = false;
+        MouseX = 0;
+        MouseY = 0;
+        StateHasChanged();
+        await DrawCanvas();
+    }
+
+    private async Task HandleWheel(WheelEventArgs e)
+    {
+        if (e.Buttons == 4) return;
+        const double zoomFactor = 0.1;
+        double oldZoom = ZoomScale;
+
+        if (e.DeltaY < 0) ZoomScale = Math.Min(MAX_ZOOM, ZoomScale * (1 + zoomFactor));
+        else ZoomScale = Math.Max(MIN_ZOOM, ZoomScale * (1 - zoomFactor));
+
+        if (Math.Abs(ZoomScale - oldZoom) < 0.001) return;
+
+        MouseX = e.OffsetX;
+        MouseY = e.OffsetY;
+
+        double zoomPointWorldX = (MouseX - CanvasTranslateX) / oldZoom / BASE_PIXELS_PER_METER - OriginX;
+        double zoomPointWorldY = (MouseY - CanvasTranslateY) / oldZoom / BASE_PIXELS_PER_METER - OriginY;
+
+        double newZoomPointCanvasX = (zoomPointWorldX + OriginX) * BASE_PIXELS_PER_METER * ZoomScale;
+        double newZoomPointCanvasY = (zoomPointWorldY + OriginY) * BASE_PIXELS_PER_METER * ZoomScale;
+
+        CanvasTranslateX = MouseX - newZoomPointCanvasX;
+        CanvasTranslateY = MouseY - newZoomPointCanvasY;
+
+        WorldMouseX = CanvasToWorldX(MouseX);
+        WorldMouseY = CanvasToWorldY(MouseY);
+
+        StateHasChanged();
+        await DrawCanvas();
+    }
+
+    private async Task HandleTouchMove(TouchEventArgs e)
+    {
+        if (IsTouching)
+        {
+            if (e.Touches.Length == 1)
+            {
+                await HandleSingleTouchMove(e.Touches[0]);
+            }
+            else if (e.Touches.Length == 2)
+            {
+                await HandlePinchZoom(e.Touches[0], e.Touches[1]);
+            }
+
+            StateHasChanged();
+            await DrawCanvas();
+        }
+    }
+
+    private void HandleTouchStart(TouchEventArgs e)
+    {
+        IsTouching = true;
+
+        if (e.Touches.Length == 1)
+        {
+            LastTouchPoint = new TouchPoint
+            {
+                X = e.Touches[0].ClientX,
+                Y = e.Touches[0].ClientY
+            };
+        }
+        else if (e.Touches.Length == 2)
+        {
+            LastTouchPoint = new TouchPoint
+            {
+                X = e.Touches[0].ClientX,
+                Y = e.Touches[0].ClientY
+            };
+            LastSecondTouchPoint = new TouchPoint
+            {
+                X = e.Touches[1].ClientX,
+                Y = e.Touches[1].ClientY
+            };
+
+            LastTouchDistance = CalculateTouchDistance(LastTouchPoint, LastSecondTouchPoint);
+        }
+    }
+
+    private void HandleTouchEnd(TouchEventArgs e)
+    {
+        IsTouching = false;
+        LastTouchPoint = null;
+        LastSecondTouchPoint = null;
+        LastTouchDistance = 0;
+    }
+
+    private async Task HandleSingleTouchMove(Microsoft.AspNetCore.Components.Web.TouchPoint touch)
+    {
+        if (LastTouchPoint == null) return;
+
+        var currentPoint = new TouchPoint
+        {
+            X = touch.ClientX,
+            Y = touch.ClientY
+        };
+
+        double deltaX = currentPoint.X - LastTouchPoint.X;
+        double deltaY = currentPoint.Y - LastTouchPoint.Y;
+
+        CanvasTranslateX += deltaX;
+        CanvasTranslateY += deltaY;
+
+        LastTouchPoint = currentPoint;
+
+        var canvasRect = await JS.InvokeAsync<DomRect>("getElementBoundingRect", CanvasRef);
+        MouseX = currentPoint.X - canvasRect.X;
+        MouseY = currentPoint.Y - canvasRect.Y;
+        IsMouseInCanvas = true;
+
+        WorldMouseX = CanvasToWorldX(MouseX);
+        WorldMouseY = CanvasToWorldY(MouseY);
+    }
+
+    private async Task HandlePinchZoom(Microsoft.AspNetCore.Components.Web.TouchPoint touch1, Microsoft.AspNetCore.Components.Web.TouchPoint touch2)
+    {
+        if (LastTouchPoint == null || LastSecondTouchPoint == null) return;
+
+        var currentTouch1 = new TouchPoint { X = touch1.ClientX, Y = touch1.ClientY };
+        var currentTouch2 = new TouchPoint { X = touch2.ClientX, Y = touch2.ClientY };
+
+        double currentDistance = CalculateTouchDistance(currentTouch1, currentTouch2);
+
+        if (LastTouchDistance > 0)
+        {
+            double distanceRatio = currentDistance / LastTouchDistance;
+            double oldZoom = ZoomScale;
+
+            ZoomScale = Math.Max(MIN_ZOOM, Math.Min(MAX_ZOOM, ZoomScale * distanceRatio));
+
+            if (Math.Abs(ZoomScale - oldZoom) > 0.001)
+            {
+                double centerX = (currentTouch1.X + currentTouch2.X) / 2;
+                double centerY = (currentTouch1.Y + currentTouch2.Y) / 2;
+
+                var canvasRect = await JS.InvokeAsync<DomRect>("getElementBoundingRect", CanvasRef);
+                double canvasCenterX = centerX - canvasRect.X;
+                double canvasCenterY = centerY - canvasRect.Y;
+
+                ZoomAtPoint(oldZoom, canvasCenterX, canvasCenterY);
+            }
+        }
+
+        LastTouchDistance = currentDistance;
+        LastTouchPoint = currentTouch1;
+        LastSecondTouchPoint = currentTouch2;
+    }
+
+    private double CalculateTouchDistance(TouchPoint point1, TouchPoint point2)
+    {
+        double deltaX = point2.X - point1.X;
+        double deltaY = point2.Y - point1.Y;
+        return Math.Sqrt(deltaX * deltaX + deltaY * deltaY);
+    }
+
+    private void ZoomAtPoint(double oldZoom, double pointX, double pointY)
+    {
+        double pointWorldX = (pointX - CanvasTranslateX) / oldZoom / BASE_PIXELS_PER_METER - OriginX;
+        double pointWorldY = (pointY - CanvasTranslateY) / oldZoom / BASE_PIXELS_PER_METER - OriginY;
+
+        double newPointCanvasX = (pointWorldX + OriginX) * BASE_PIXELS_PER_METER * ZoomScale;
+        double newPointCanvasY = (pointWorldY + OriginY) * BASE_PIXELS_PER_METER * ZoomScale;
+
+        CanvasTranslateX = pointX - newPointCanvasX;
+        CanvasTranslateY = pointY - newPointCanvasY;
+    }
+
+    private LaserScanData GenerateLaserScanData()
+    {
+        // Robot position (in world coordinates)
+        double robotX = 2; // Robot at origin for demo
+        double robotY = 2;
+        double robotOrientation = 0; // Robot facing right (0 degrees)
+
+        Random random = new Random(42); // Fixed seed for consistent pattern
+
+        // Laser scanner parameters
+        const double maxRange = 8.0; // meters
+        const double minRange = 0.5; // meters (fix: was 7.0, should be minimum)
+        const int numPoints = 270;   // Number of laser points
+        const double startAngle = -Math.PI / 2 - Math.PI / 4;
+        const double endAngle = Math.PI / 2 + Math.PI / 4;
+
+        double angleStep = (endAngle - startAngle) / (numPoints - 1);
+
+        var scanData = new LaserScanData
+        {
+            RobotX = robotX,
+            RobotY = robotY,
+            RobotOrientation = robotOrientation,
+        };
+
+        // Generate laser points
+        for (int i = 0; i < numPoints; i++)
+        {
+            double angle = startAngle + i * angleStep;
+
+            // Random range with some clustering around obstacles
+            double range;
+            if (random.NextDouble() < 0.3) // 30% chance of obstacles
+            {
+                range = random.NextDouble() * 3.0 + 1.0; // 1-4 meters (obstacles)
+            }
+            else if (random.NextDouble() < 0.1) // 10% chance of very close objects
+            {
+                range = random.NextDouble() * 0.8 + 0.2; // 0.2-1.0 meters
+            }
+            else
+            {
+                range = random.NextDouble() * maxRange * 0.7 + maxRange * 0.3; // Far points
+            }
+
+            // Add some noise to make it realistic
+            range += (random.NextDouble() - 0.5) * 0.1;
+            range = Math.Max(minRange, Math.Min(maxRange, range));
+
+            // Calculate point position relative to robot
+            double pointX = robotX + Math.Cos(angle + robotOrientation) * range;
+            double pointY = robotY + Math.Sin(angle + robotOrientation) * range;
+
+            scanData.Points.Add(new LaserScanPoint
+            {
+                X = pointX,
+                Y = pointY
+            });
+        }
+
+        return scanData;
+    }
+}
--- a/RobotApp.Client/Pages/Components/Mapping/MapView.razor.cs
+++ b/RobotApp.Client/Pages/Components/Mapping/MapView.razor.cs
@@ -0,0 +1,576 @@
+using Excubo.Blazor.Canvas;
+using Excubo.Blazor.Canvas.Contexts;
+using Microsoft.JSInterop;
+
+namespace RobotApp.Client.Pages.Components.Mapping;
+
+public partial class MapView
+{
+    public class TouchPoint
+    {
+        public double X { get; set; }
+        public double Y { get; set; }
+    }
+
+    public class LaserScanPoint
+    {
+        public double X { get; set; }
+        public double Y { get; set; }
+    }
+
+    public class LaserScanData
+    {
+        public double RobotX { get; set; }
+        public double RobotY { get; set; }
+        public double RobotOrientation { get; set; }
+        public List<LaserScanPoint> Points { get; set; } = [];
+    }
+
+    public class DomRect
+    {
+        public double Width { get; set; }
+        public double Height { get; set; }
+        public double X { get; set; }
+        public double Y { get; set; }
+        public double Left => X;
+        public double Top => Y;
+    }
+
+    private async Task DrawCanvas()
+    {
+        await using var ctx = await JS.GetContext2DAsync(CanvasRef);
+
+        await ctx.ClearRectAsync(0, 0, CanvasWidth, CanvasHeight);
+
+        await ctx.SaveAsync();
+
+        await ctx.TranslateAsync(CanvasTranslateX, CanvasTranslateY);
+        await ctx.ScaleAsync(ZoomScale, ZoomScale);
+
+        await DrawMapImage(ctx);
+        await DrawGrid(ctx);
+        await DrawAxes(ctx);
+        await DrawLaserScannerPoints(ctx);
+        await ctx.RestoreAsync();
+
+        if (IsMouseInCanvas)
+        {
+            await DrawMouseIndicator(ctx);
+        }
+        await DrawRulers(ctx);
+    }
+
+    private async Task DrawMouseIndicator(Context2D ctx)
+    {
+        await ctx.SaveAsync();
+
+        await ctx.StrokeStyleAsync("rgba(255, 50, 50, 0.8)");
+        await ctx.LineWidthAsync(1);
+        await ctx.SetLineDashAsync([3, 3]);
+
+        await ctx.BeginPathAsync();
+        await ctx.MoveToAsync(MouseX, RulerHeight);
+        await ctx.LineToAsync(MouseX, CanvasHeight);
+        await ctx.StrokeAsync();
+
+        await ctx.BeginPathAsync();
+        await ctx.MoveToAsync(RulerHeight, MouseY);
+        await ctx.LineToAsync(CanvasWidth, MouseY);
+        await ctx.StrokeAsync();
+
+        await ctx.SetLineDashAsync([]);
+
+        const double labelPadding = 7;
+        const double labelMargin = 8;
+
+        string coordinateText = $"({WorldMouseX:F2}m, {WorldMouseY:F2}m)";
+
+        await ctx.FontAsync("bold 12px Arial");
+        var textMetrics = await ctx.MeasureTextAsync(coordinateText);
+        double textWidth = textMetrics.Width;
+        double textHeight = 16;
+
+        double labelX = MouseX + labelMargin;
+        double labelY = MouseY - textHeight - labelPadding * 2 - labelMargin;
+
+        if (labelX + textWidth + labelPadding * 2 > CanvasWidth)
+        {
+            labelX = MouseX - textWidth - labelPadding * 2 - labelMargin;
+        }
+        if (labelY - textHeight - labelPadding * 2 < RulerHeight)
+        {
+            labelY = MouseY + labelMargin;
+        }
+
+        await ctx.FillStyleAsync("rgba(0, 0, 0, 0.8)");
+        await ctx.FillRectAsync(labelX, labelY, textWidth + labelPadding * 2, textHeight + labelPadding * 2);
+
+        await ctx.StrokeStyleAsync("rgba(255,255,255,0.6)");
+        await ctx.LineWidthAsync(1);
+        await ctx.StrokeRectAsync(labelX, labelY, textWidth + labelPadding * 2, textHeight + labelPadding * 2);
+
+        await ctx.FillStyleAsync("rgba(255, 50, 50, 0.9)");
+        await ctx.BeginPathAsync();
+        await ctx.ArcAsync(MouseX, MouseY, 3, 0, Math.PI * 2);
+        await ctx.FillAsync(FillRule.NonZero);
+
+        await ctx.StrokeStyleAsync("rgba(255, 255, 255, 0.8)");
+        await ctx.LineWidthAsync(2);
+        await ctx.BeginPathAsync();
+        await ctx.ArcAsync(MouseX, MouseY, 6, 0, Math.PI * 2);
+        await ctx.StrokeAsync();
+
+        await ctx.SaveAsync();
+
+        await ctx.TranslateAsync(labelX + labelPadding + textWidth / 2, labelY + textHeight / 2);
+        await ctx.ScaleAsync(1, -1);
+
+        await ctx.FillStyleAsync("white");
+        await ctx.FontAsync("bold 12px Arial");
+        await ctx.TextAlignAsync(TextAlign.Center);
+        await ctx.TextBaseLineAsync(TextBaseLine.Bottom);
+        await ctx.FillTextAsync(coordinateText, 0, 0);
+
+        await ctx.RestoreAsync();
+    }
+
+    private async Task DrawRulers(Context2D ctx)
+    {
+        double visibleWorldLeft = CanvasToWorldX(0);
+        double visibleWorldRight = CanvasToWorldX(CanvasWidth);
+        double visibleWorldTop = CanvasToWorldY(0);
+        double visibleWorldBottom = CanvasToWorldY(CanvasHeight);
+
+        double scaleInterval = GetRulerScaleInterval();
+
+        await DrawXRuler(ctx, RulerHeight, visibleWorldLeft, visibleWorldRight, scaleInterval);
+        await DrawYRuler(ctx, RulerHeight, visibleWorldTop, visibleWorldBottom, scaleInterval);
+    }
+
+    private double GetRulerScaleInterval()
+    {
+        double pixelsPerMeter = BASE_PIXELS_PER_METER * ZoomScale;
+
+        if (pixelsPerMeter >= 400) return 0.1;
+        else if (pixelsPerMeter >= 200) return 0.2;
+        else if (pixelsPerMeter >= 100) return 0.5;
+        else if (pixelsPerMeter >= 50) return 1.0;
+        else if (pixelsPerMeter >= 25) return 2.0;
+        else if (pixelsPerMeter >= 12) return 5.0;
+        else if (pixelsPerMeter >= 6) return 10.0;
+        else return 20.0;
+    }
+
+    private async Task DrawXRuler(Context2D ctx, double rulerHeight, double visibleWorldLeft, double visibleWorldRight, double scaleInterval)
+    {
+        await ctx.FillStyleAsync("rgba(240, 240, 240, 0.9)");
+        await ctx.FillRectAsync(0, 0, CanvasWidth, rulerHeight);
+
+        await ctx.StrokeStyleAsync("rgba(100, 100, 100, 0.8)");
+        await ctx.LineWidthAsync(1);
+        await ctx.BeginPathAsync();
+        await ctx.MoveToAsync(0, rulerHeight);
+        await ctx.LineToAsync(CanvasWidth, rulerHeight);
+        await ctx.StrokeAsync();
+
+        double startWorld = Math.Floor(visibleWorldLeft / scaleInterval) * scaleInterval;
+        double endWorld = Math.Ceiling(visibleWorldRight / scaleInterval) * scaleInterval;
+
+        startWorld -= scaleInterval;
+        endWorld += scaleInterval;
+
+        for (double worldX = startWorld; worldX <= endWorld; worldX += scaleInterval)
+        {
+            double canvasX = WorldToCanvasX(worldX);
+
+            if (canvasX < -50 || canvasX > CanvasWidth + 50) continue;
+
+            bool isMajorTick = IsNearMultiple(worldX, scaleInterval * 2) || Math.Abs(worldX) < 0.001;
+            double tickHeight = isMajorTick ? rulerHeight * 0.4 : rulerHeight * 0.2;
+
+            await ctx.StrokeStyleAsync("rgba(60, 60, 60, 0.8)");
+            await ctx.LineWidthAsync(1);
+            await ctx.BeginPathAsync();
+            await ctx.MoveToAsync(canvasX, rulerHeight);
+            await ctx.LineToAsync(canvasX, rulerHeight - tickHeight);
+            await ctx.StrokeAsync();
+
+            if (isMajorTick && canvasX >= -20 && canvasX <= CanvasWidth + 20)
+            {
+                await ctx.SaveAsync();
+
+                await ctx.TranslateAsync(canvasX, rulerHeight - tickHeight - 8);
+                await ctx.ScaleAsync(1, -1);
+
+                await ctx.FillStyleAsync("blue");
+                await ctx.FontAsync("bold 10px Arial");
+                await ctx.TextAlignAsync(TextAlign.Center);
+
+                string labelText = FormatRulerLabel(worldX, scaleInterval);
+                await ctx.FillTextAsync(labelText, 0, 0);
+
+                await ctx.RestoreAsync();
+            }
+        }
+    }
+
+    private async Task DrawYRuler(Context2D ctx, double rulerWidth, double visibleWorldTop, double visibleWorldBottom, double scaleInterval)
+    {
+        await ctx.FillStyleAsync("rgba(240, 240, 240, 0.9)");
+        await ctx.FillRectAsync(0, 0, rulerWidth, CanvasHeight);
+
+        await ctx.StrokeStyleAsync("rgba(100, 100, 100, 0.8)");
+        await ctx.LineWidthAsync(1);
+        await ctx.BeginPathAsync();
+        await ctx.MoveToAsync(rulerWidth, 0);
+        await ctx.LineToAsync(rulerWidth, CanvasHeight);
+        await ctx.StrokeAsync();
+
+        double startWorld = Math.Floor(visibleWorldTop / scaleInterval) * scaleInterval;
+        double endWorld = Math.Ceiling(visibleWorldBottom / scaleInterval) * scaleInterval;
+
+        startWorld -= scaleInterval;
+        endWorld += scaleInterval;
+
+        for (double worldY = startWorld; worldY <= endWorld; worldY += scaleInterval)
+        {
+            double canvasY = WorldToCanvasY(worldY);
+
+            if (canvasY < -50 || canvasY > CanvasHeight + 50) continue;
+
+            bool isMajorTick = IsNearMultiple(worldY, scaleInterval * 2) || Math.Abs(worldY) < 0.001;
+            double tickWidth = isMajorTick ? rulerWidth * 0.4 : rulerWidth * 0.2;
+
+            await ctx.StrokeStyleAsync("rgba(60, 60, 60, 0.8)");
+            await ctx.LineWidthAsync(1);
+            await ctx.BeginPathAsync();
+            await ctx.MoveToAsync(rulerWidth, canvasY);
+            await ctx.LineToAsync(rulerWidth - tickWidth, canvasY);
+            await ctx.StrokeAsync();
+
+            if (isMajorTick && canvasY >= -20 && canvasY <= CanvasHeight + 20)
+            {
+                await ctx.SaveAsync();
+
+                await ctx.TranslateAsync(rulerWidth - tickWidth - 2, canvasY);
+                await ctx.ScaleAsync(1, -1);
+                await ctx.RotateAsync(-Math.PI / 2);
+
+                await ctx.FillStyleAsync("blue");
+                await ctx.FontAsync("bold 10px Arial");
+                await ctx.TextAlignAsync(TextAlign.Center);
+
+                string labelText = FormatRulerLabel(worldY, scaleInterval);
+                await ctx.FillTextAsync(labelText, 0, 0);
+
+                await ctx.RestoreAsync();
+            }
+        }
+    }
+
+    private static bool IsNearMultiple(double value, double multiple)
+    {
+        if (multiple == 0) return false;
+        double remainder = Math.Abs(value % multiple);
+        double epsilon = multiple * 0.001;
+        return remainder < epsilon || remainder > multiple - epsilon;
+    }
+
+    private static string FormatRulerLabel(double worldValue, double scaleInterval)
+    {
+        return scaleInterval < 1.0 ? $"{worldValue:F1}m" : $"{worldValue:F0}m";
+    }
+
+    private async Task DrawAxes(Context2D ctx)
+    {
+        double originCanvasX = OriginX * BASE_PIXELS_PER_METER;
+        double originCanvasY = OriginY * BASE_PIXELS_PER_METER;
+
+        await ctx.FillStyleAsync("red");
+        await ctx.BeginPathAsync();
+        await ctx.ArcAsync(originCanvasX, originCanvasY, 8 / ZoomScale, 0, Math.PI * 2);
+        await ctx.FillAsync(FillRule.NonZero);
+
+        double gridSpacingMeters = GetGridSpacingMeters();
+        double arrowLength = gridSpacingMeters * BASE_PIXELS_PER_METER;
+        double arrowHeadSize = 16 / ZoomScale;
+
+        await ctx.FillStyleAsync("blue");
+        await ctx.StrokeStyleAsync("blue");
+        await ctx.LineWidthAsync(4 / ZoomScale);
+
+        await ctx.BeginPathAsync();
+        await ctx.MoveToAsync(originCanvasX, originCanvasY);
+        await ctx.LineToAsync(originCanvasX + arrowLength - arrowHeadSize, originCanvasY);
+        await ctx.StrokeAsync();
+
+        await ctx.BeginPathAsync();
+        double xArrowTipX = originCanvasX + arrowLength;
+        double xArrowTipY = originCanvasY;
+        await ctx.MoveToAsync(xArrowTipX, xArrowTipY);
+        await ctx.LineToAsync(xArrowTipX - arrowHeadSize, xArrowTipY - arrowHeadSize / 2);
+        await ctx.LineToAsync(xArrowTipX - arrowHeadSize, xArrowTipY + arrowHeadSize / 2);
+        await ctx.ClosePathAsync();
+        await ctx.FillAsync(FillRule.NonZero);
+
+        await ctx.FillStyleAsync("red");
+        await ctx.StrokeStyleAsync("red");
+        await ctx.LineWidthAsync(4 / ZoomScale);
+
+        await ctx.BeginPathAsync();
+        await ctx.MoveToAsync(originCanvasX, originCanvasY);
+        await ctx.LineToAsync(originCanvasX, originCanvasY + arrowLength - arrowHeadSize);
+        await ctx.StrokeAsync();
+
+        await ctx.BeginPathAsync();
+        double yArrowTipX = originCanvasX;
+        double yArrowTipY = originCanvasY + arrowLength;
+        await ctx.MoveToAsync(yArrowTipX, yArrowTipY);
+        await ctx.LineToAsync(yArrowTipX - arrowHeadSize / 2, yArrowTipY - arrowHeadSize);
+        await ctx.LineToAsync(yArrowTipX + arrowHeadSize / 2, yArrowTipY - arrowHeadSize);
+        await ctx.ClosePathAsync();
+        await ctx.FillAsync(FillRule.NonZero);
+    }
+
+    private async Task DrawGrid(Context2D ctx)
+    {
+        await ctx.StrokeStyleAsync("rgba(200, 200, 200, 0.4)");
+        await ctx.LineWidthAsync(1 / ZoomScale);
+        await ctx.SetLineDashAsync([5 / ZoomScale, 5 / ZoomScale]);
+
+        double gridSpacingMeters = GetGridSpacingMeters();
+        double gridSpacingPixels = gridSpacingMeters * BASE_PIXELS_PER_METER;
+
+        double visibleLeft = -CanvasTranslateX / ZoomScale;
+        double visibleRight = (CanvasWidth - CanvasTranslateX) / ZoomScale;
+        double visibleTop = -CanvasTranslateY / ZoomScale;
+        double visibleBottom = (CanvasHeight - CanvasTranslateY) / ZoomScale;
+
+        double startX = Math.Floor(visibleLeft / gridSpacingPixels) * gridSpacingPixels;
+        double startY = Math.Floor(visibleTop / gridSpacingPixels) * gridSpacingPixels;
+
+        for (double x = startX; x <= visibleRight; x += gridSpacingPixels)
+        {
+            await ctx.BeginPathAsync();
+            await ctx.MoveToAsync(x, visibleTop);
+            await ctx.LineToAsync(x, visibleBottom);
+            await ctx.StrokeAsync();
+        }
+
+        for (double y = startY; y <= visibleBottom; y += gridSpacingPixels)
+        {
+            await ctx.BeginPathAsync();
+            await ctx.MoveToAsync(visibleLeft, y);
+            await ctx.LineToAsync(visibleRight, y);
+            await ctx.StrokeAsync();
+        }
+
+        await ctx.SetLineDashAsync([]);
+    }
+
+    private double GetGridSpacingMeters()
+    {
+        double PixelsPerMeter = BASE_PIXELS_PER_METER * ZoomScale;
+        if (PixelsPerMeter >= 300) return 0.2;
+        else if (PixelsPerMeter >= 150) return 0.5;
+        else if (PixelsPerMeter >= 75) return 1.0;
+        else if (PixelsPerMeter >= 40) return 2.0;
+        else if (PixelsPerMeter >= 20) return 5.0;
+        else if (PixelsPerMeter >= 10) return 10.0;
+        else return 20.0;
+    }
+
+    private async Task DrawMapImage(Context2D ctx)
+    {
+        if (!MapImageLoaded)
+        {
+            return;
+        }
+
+        await ctx.SaveAsync();
+
+        try
+        {
+            double imageWidthCanvas = MapImageWidth * BASE_PIXELS_PER_METER;
+            double imageHeightCanvas = MapImageHeight * BASE_PIXELS_PER_METER;
+
+            double mapCanvasX = ImageX * BASE_PIXELS_PER_METER;
+            double mapCanvasY = (ImageY + MapImageHeight) * BASE_PIXELS_PER_METER;
+
+            bool success = await JS.InvokeAsync<bool>("drawCachedImageOnCanvas",
+                CanvasRef,
+                MAP_CACHE_KEY,
+                mapCanvasX,
+                mapCanvasY - imageHeightCanvas,
+                imageWidthCanvas,
+                imageHeightCanvas);
+        }
+        catch
+        {
+        }
+
+        await ctx.RestoreAsync();
+    }
+
+    private async Task DrawLaserScannerPoints(Context2D ctx)
+    {
+        var scanData = GenerateLaserScanData();
+
+        double robotCanvasX = scanData.RobotX * BASE_PIXELS_PER_METER;
+        double robotCanvasY = scanData.RobotY * BASE_PIXELS_PER_METER;
+
+        await ctx.SaveAsync();
+
+        if (scanData.Points.Count > 0)
+        {
+            await ctx.BeginPathAsync();
+
+            for (int i = 0; i < scanData.Points.Count; i++)
+            {
+                var point = scanData.Points[i];
+                double pointCanvasX = point.X * BASE_PIXELS_PER_METER;
+                double pointCanvasY = point.Y * BASE_PIXELS_PER_METER;
+
+                if (i == 0)
+                {
+                    await ctx.MoveToAsync(pointCanvasX, pointCanvasY);
+                }
+                else
+                {
+                    await ctx.LineToAsync(pointCanvasX, pointCanvasY);
+                }
+            }
+
+            await ctx.StrokeStyleAsync("rgba(255, 100, 100, 0.8)");
+            await ctx.LineWidthAsync(2 / ZoomScale);
+            await ctx.StrokeAsync();
+
+            await ctx.LineToAsync(robotCanvasX, robotCanvasY);
+            await ctx.ClosePathAsync();
+            await ctx.FillStyleAsync("rgba(255, 100, 100, 0.1)");
+            await ctx.FillAsync(FillRule.NonZero);
+        }
+
+        await DrawRobotImage(ctx, robotCanvasX, robotCanvasY, scanData.RobotOrientation);
+        await DrawRobotOrientationArrows(ctx, robotCanvasX, robotCanvasY, scanData.RobotOrientation);
+
+        await ctx.RestoreAsync();
+    }
+
+    private async Task DrawRobotImage(Context2D ctx, double robotCanvasX, double robotCanvasY, double robotOrientation)
+    {
+        if (!RobotImageLoaded)
+        {
+            await ctx.FillStyleAsync("rgba(0, 255, 0, 0.8)");
+            await ctx.BeginPathAsync();
+            await ctx.ArcAsync(robotCanvasX, robotCanvasY, 8 / ZoomScale, 0, Math.PI * 2);
+            await ctx.FillAsync(FillRule.NonZero);
+            return;
+        }
+
+        await ctx.SaveAsync();
+
+        double robotWidthPixels = RobotWidth * BASE_PIXELS_PER_METER;
+        double robotLengthPixels = RobotLength * BASE_PIXELS_PER_METER;
+
+        double scaledWidth = ZoomScale < 1 ? robotWidthPixels / ZoomScale : robotWidthPixels;
+        double scaledLength = ZoomScale < 1 ? robotLengthPixels / ZoomScale : robotLengthPixels;
+
+        await ctx.TranslateAsync(robotCanvasX, robotCanvasY);
+        await ctx.RotateAsync(robotOrientation);
+
+        try
+        {
+            bool success = await JS.InvokeAsync<bool>("drawImageOnCanvas",
+                CanvasRef,
+                "images/AMR-250.png",
+                -scaledLength / 2,
+                -scaledWidth / 2,
+                scaledLength,
+                scaledWidth);
+
+            if (!success)
+            {
+                await ctx.FillStyleAsync("rgba(0, 255, 0, 0.8)");
+                await ctx.FillRectAsync(-scaledLength / 2, -scaledWidth / 2, scaledLength, scaledWidth);
+            }
+        }
+        catch
+        {
+            await ctx.FillStyleAsync("rgba(0, 255, 0, 0.8)");
+            await ctx.FillRectAsync(-scaledLength / 2, -scaledWidth / 2, scaledLength, scaledWidth);
+        }
+
+        await ctx.RestoreAsync();
+    }
+
+    private async Task DrawRobotOrientationArrows(Context2D ctx, double robotCanvasX, double robotCanvasY, double robotOrientation)
+    {
+        double arrowLength = 30 / ZoomScale;
+        double arrowHeadSize = 10 / ZoomScale;
+
+        await ctx.StrokeStyleAsync("rgba(0, 100, 255, 1.0)");
+        await ctx.FillStyleAsync("rgba(0, 100, 255, 1.0)");
+        await ctx.LineWidthAsync(3 / ZoomScale);
+
+        await ctx.BeginPathAsync();
+        await ctx.MoveToAsync(robotCanvasX, robotCanvasY);
+        double xAxisEndX = robotCanvasX + Math.Cos(robotOrientation) * (arrowLength - arrowHeadSize + 1);
+        double xAxisEndY = robotCanvasY + Math.Sin(robotOrientation) * (arrowLength - arrowHeadSize + 1);
+        await ctx.LineToAsync(xAxisEndX, xAxisEndY);
+        await ctx.StrokeAsync();
+
+        await ctx.BeginPathAsync();
+        double xArrowTipX = robotCanvasX + Math.Cos(robotOrientation) * arrowLength;
+        double xArrowTipY = robotCanvasY + Math.Sin(robotOrientation) * arrowLength;
+        await ctx.MoveToAsync(xArrowTipX, xArrowTipY);
+        double xArrowAngle = robotOrientation + Math.PI;
+        await ctx.LineToAsync(xArrowTipX + Math.Cos(xArrowAngle + Math.PI / 6) * arrowHeadSize, xArrowTipY + Math.Sin(xArrowAngle + Math.PI / 6) * arrowHeadSize);
+        await ctx.LineToAsync(xArrowTipX + Math.Cos(xArrowAngle - Math.PI / 6) * arrowHeadSize, xArrowTipY + Math.Sin(xArrowAngle - Math.PI / 6) * arrowHeadSize);
+        await ctx.ClosePathAsync();
+        await ctx.FillAsync(FillRule.NonZero);
+
+        await ctx.StrokeStyleAsync("rgba(255, 50, 50, 1.0)");
+        await ctx.FillStyleAsync("rgba(255, 50, 50, 1.0)");
+        await ctx.LineWidthAsync(3 / ZoomScale);
+
+        double yAxisAngle = robotOrientation + Math.PI / 2;
+
+        await ctx.BeginPathAsync();
+        await ctx.MoveToAsync(robotCanvasX, robotCanvasY);
+        double yAxisEndX = robotCanvasX + Math.Cos(yAxisAngle) * (arrowLength - arrowHeadSize + 1);
+        double yAxisEndY = robotCanvasY + Math.Sin(yAxisAngle) * (arrowLength - arrowHeadSize + 1);
+        await ctx.LineToAsync(yAxisEndX, yAxisEndY);
+        await ctx.StrokeAsync();
+
+        await ctx.BeginPathAsync();
+        double yArrowTipX = robotCanvasX + Math.Cos(yAxisAngle) * arrowLength;
+        double yArrowTipY = robotCanvasY + Math.Sin(yAxisAngle) * arrowLength;
+        await ctx.MoveToAsync(yArrowTipX, yArrowTipY);
+        double yArrowAngle = yAxisAngle + Math.PI;
+        await ctx.LineToAsync(yArrowTipX + Math.Cos(yArrowAngle + Math.PI / 6) * arrowHeadSize, yArrowTipY + Math.Sin(yArrowAngle + Math.PI / 6) * arrowHeadSize);
+        await ctx.LineToAsync(yArrowTipX + Math.Cos(yArrowAngle - Math.PI / 6) * arrowHeadSize, yArrowTipY + Math.Sin(yArrowAngle - Math.PI / 6) * arrowHeadSize);
+        await ctx.ClosePathAsync();
+        await ctx.FillAsync(FillRule.NonZero);
+    }
+
+    private double CanvasToWorldX(double canvasX)
+    {
+        return (canvasX - CanvasTranslateX) / ZoomScale / BASE_PIXELS_PER_METER - OriginX;
+    }
+
+    private double CanvasToWorldY(double canvasY)
+    {
+        return (canvasY - CanvasTranslateY) / ZoomScale / BASE_PIXELS_PER_METER - OriginY;
+    }
+
+    private double WorldToCanvasX(double worldX)
+    {
+        return (worldX + OriginX) * BASE_PIXELS_PER_METER * ZoomScale + CanvasTranslateX;
+    }
+
+    private double WorldToCanvasY(double worldY)
+    {
+        return (worldY + OriginY) * BASE_PIXELS_PER_METER * ZoomScale + CanvasTranslateY;
+    }
+}
--- a/RobotApp.Client/Pages/Components/Mapping/MapView.razor.css
+++ b/RobotApp.Client/Pages/Components/Mapping/MapView.razor.css
@@ -0,0 +1,70 @@
+.view {
+    height: 100%;
+    width: 100%;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    background-color: #808080;
+    border-radius: var(--mud-default-borderradius);
+    transition: box-shadow 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
+    box-shadow: var(--mud-elevation-10);
+}
+
+    .view .toolbar {
+        width: 100%;
+        height: 3rem;
+        flex: 0 0 auto;
+        display: flex;
+        align-items: center;
+        padding: 0.5rem;
+        border-bottom: 1px solid var(--mud-palette-divider);
+        background-color: var(--mud-palette-background);
+    }
+
+        .view .toolbar .action-button {
+            padding: 0rem 0.4rem;
+            margin-right: 0.5rem;
+            border-radius: var(--mud-default-borderradius);
+            transition: all 0.3s ease;
+            background-color: var(--bs-gray-200);
+        }
+
+            .view .toolbar .action-button:hover {
+                background-color: var(--mud-palette-action-hover);
+                transform: translateY(-1px);
+            }
+
+            .view .toolbar .action-button:disabled {
+                opacity: 0.6;
+                cursor: not-allowed;
+            }
+
+                .view .toolbar .action-button:disabled:hover {
+                    transform: none;
+                    background-color: transparent;
+                }
+
+        .view .toolbar .icon-button {
+            font-size: 1.2rem;
+            color: var(--mud-palette-primary);
+        }
+
+
+    .view > div {
+        display: flex;
+        position: relative;
+        width: 100%;
+        flex-grow: 1;
+        overflow: hidden;
+    }
+
+        .view > div > canvas {
+            transition: cursor 0.2s ease;
+            display: block;
+            transform: scale(1, -1);
+        }
+
+            .view > div > canvas:hover {
+                cursor: crosshair;
+            }
--- a/RobotApp.Client/Pages/Components/Mapping/RobotInfomation.razor
+++ b/RobotApp.Client/Pages/Components/Mapping/RobotInfomation.razor
@@ -0,0 +1,60 @@
+<div class="view">
+    <h4 class="info-title">Informations</h4>
+
+    <div class="info-grid">
+        <div class="info-col">
+            <dl class="info-list">
+                <dt class="info-term">X (m)</dt>
+                <dd class="info-desc">@Localization.X.ToString("F3")</dd>
+
+                <dt class="info-term">Y (m)</dt>
+                <dd class="info-desc">@Localization.Y.ToString("F3")</dd>
+
+                <dt class="info-term">Theta (rad)</dt>
+                <dd class="info-desc">@Localization.Theta.ToString("F4")</dd>
+
+                <dt class="info-term">Theta (deg)</dt>
+                <dd class="info-desc">@($"{Localization.Theta * 180.0 / Math.PI:F2}°")</dd>
+
+                <dt class="info-term">Ready</dt>
+                <dd class="info-desc">@((Localization.IsReady) ? "Yes" : "No")</dd>
+            </dl>
+        </div>
+
+        <div class="info-col">
+            <dl class="info-list">
+                <dt class="info-term">SlamState</dt>
+                <dd class="info-desc">@Localization.SlamState</dd>
+
+                <dt class="info-term">SlamDetail</dt>
+                <dd class="info-desc text-truncate" title="@Localization.SlamStateDetail">@Localization.SlamStateDetail</dd>
+
+                <dt class="info-term">Active Map</dt>
+                <dd class="info-desc text-truncate" title="@Localization.CurrentActiveMap">@Localization.CurrentActiveMap</dd>
+
+                <dt class="info-term">Reliability</dt>
+                <dd class="info-desc">@($"{Localization.Reliability:F1}%")</dd>
+
+                <dt class="info-term">MatchingScore</dt>
+                <dd class="info-desc">@($"{Localization.MatchingScore:F1}%")</dd>
+            </dl>
+        </div>
+    </div>
+</div>
+
+@code {
+    private class LocalizationDto
+    {
+        public bool IsReady { get; set; }
+        public double X { get; set; }
+        public double Y { get; set; }
+        public double Theta { get; set; }
+        public string SlamState { get; set; } = "Localization";
+        public string SlamStateDetail { get; set; } = "/r/n";
+        public string CurrentActiveMap { get; set; } = "Localization";
+        public double Reliability { get; set; }
+        public double MatchingScore { get; set; }
+    }
+
+    private LocalizationDto Localization = new();
+}
--- a/RobotApp.Client/Pages/Components/Mapping/RobotInfomation.razor.css
+++ b/RobotApp.Client/Pages/Components/Mapping/RobotInfomation.razor.css
@@ -0,0 +1,121 @@
+.view {
+    height: 100%;
+    width: 100%;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    background-color: var(--mud-palette-surface, #ffffff);
+    border-radius: var(--mud-default-borderradius, 8px);
+    transition: box-shadow 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
+    box-shadow: var(--mud-elevation-10, 0 4px 12px rgba(0,0,0,0.08));
+    padding: 12px;
+    box-sizing: border-box;
+    border: 1px solid rgba(0,0,0,0.04);
+}
+
+    .view::before {
+        content: "";
+        position: absolute;
+        left: 0;
+        top: 0;
+        bottom: 0;
+        width: 6px;
+        border-top-left-radius: inherit;
+        border-bottom-left-radius: inherit;
+        background: linear-gradient(180deg, var(--mud-palette-primary, #1976d2), rgba(25,118,210,0.7));
+    }
+
+.info-title {
+    margin: 0 0 10px 12px;
+    font-weight: 600;
+    font-size: 1rem;
+    color: var(--mud-palette-primary, #1976d2);
+}
+
+.info-grid {
+    display: flex;
+    gap: 14px;
+    align-items: flex-start;
+    flex: 1 1 auto;
+    overflow: hidden;
+    padding: 1.5em;
+}
+
+.info-col {
+    flex: 1 1 50%;
+    min-width: 0; 
+    overflow: hidden;
+}
+
+.info-list {
+    margin: 0;
+    padding: 0;
+}
+
+    .info-list dt,
+    .info-list dd {
+        display: flex;
+        align-items: center;
+        padding: 6px 0;
+        font-size: 0.95rem;
+        line-height: 1.2;
+    }
+
+.info-term {
+    width: 42%;
+    text-align: right;
+    padding-right: 12px;
+    color: var(--mud-palette-text-secondary, rgba(0,0,0,0.6));
+    font-weight: 600;
+    box-sizing: border-box;
+    white-space: nowrap;
+}
+
+.info-desc {
+    width: 58%;
+    text-align: left;
+    font-weight: 700;
+    color: var(--mud-palette-text-primary, rgba(0,0,0,0.85));
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    font-variant-numeric: tabular-nums;
+}
+
+.text-truncate {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.info-list dt + dd {
+    border-bottom: 1px dashed rgba(0,0,0,0.03);
+}
+
+.ready-yes {
+    color: var(--mud-palette-success, #2e7d32);
+}
+
+.ready-no {
+    color: var(--mud-palette-error, #d32f2f);
+}
+
+.percent {
+    color: var(--mud-palette-primary, #1976d2);
+}
+
+@media (max-width: 640px) {
+    .info-grid {
+        flex-direction: column;
+        gap: 8px;
+    }
+
+    .info-term {
+        width: 45%;
+    }
+
+    .info-desc {
+        width: 55%;
+    }
+}
--- a/RobotApp.Client/Pages/Counter.razor
+++ b/RobotApp.Client/Pages/Counter.razor
@@ -1,18 +0,0 @@
-@page "/counter"
-
-<PageTitle>Counter</PageTitle>
-
-<h1>Counter</h1>
-
-<p role="status">Current count: @currentCount</p>
-
-<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
-
-@code {
-    private int currentCount = 0;
-
-    private void IncrementCount()
-    {
-        currentCount++;
-    }
-}
--- a/RobotApp.Client/Pages/Home.razor
+++ b/RobotApp.Client/Pages/Home.razor
@@ -1,7 +0,0 @@
-@page "/"
-
-<PageTitle>Home</PageTitle>
-
-<h1>Hello, world!</h1>
-
-Welcome to your new app.
--- a/RobotApp.Client/Pages/MapsManager.razor
+++ b/RobotApp.Client/Pages/MapsManager.razor
@@ -1,181 +1,25 @@
@page "/maps-manager"
-@using MudBlazor
-@using RobotApp.Common.Shares.Dtos
+
+@rendermode InteractiveWebAssemblyNoPrerender

@attribute [Authorize]
-@inject HttpClient Http

 <PageTitle>Map Manager</PageTitle>

-<style>
-    .selected {
-        background-color: #3399ff !important;
-    }
-
-        .selected > td {
-            color: white !important;
-        }
-
-            .selected > td .mud-input {
-                color: white !important;
-            }
-</style>
-
-<div class="d-flex flex-row w-100 h-100 p-2 overflow-hidden">
-    <div class="d-flex h-100 flex-column flex-grow-1 pe-2">
-        <div class="d-flex justify-content-between align-items-center mb-2">
-            <MudTextField Value="txtSearch" T="string" Label="Search" Variant="Variant.Outlined" Adornment="Adornment.End" AdornmentIcon="@Icons.Material.Filled.Search"
-                          AdornmentColor="Color.Secondary" ValueChanged="TextSearchChanged" Style="max-width: 550px" />
-            <MudButton Class="ms-3" StartIcon="@Icons.Material.Filled.Add" Variant="Variant.Filled" Color="Color.Primary" Size="Size.Large">
-                NEW
-            </MudButton>
+<div class="d-flex w-100 h-100 p-2  overflow-hidden flex-row">
+    <div class="me-4 d-flex flex-column" style="height: 100%; width: 40%">
+        <div class="mb-4" style="height: 50%; width: 100%">
+            <RobotApp.Client.Pages.Components.Mapping.MapTable />
        </div>
-        <div class="d-flex" style="height: 92%">
-            <MudTable Class="w-100" @ref="Table" Items="@MapsShow" T="MapDto" Dense=true Hover=true ReadOnly=true FixedHeader=true RowClass="cursor-pointer" Striped="true"
-                      ServerData="ReloadData" Loading=@IsLoading Outlined="true" RowClassFunc="@SelectedRowClassFunc" OnRowClick="RowClickEvent" Height="95%">
-                <HeaderContent>
-                    <MudTh>Nr</MudTh>
-                    <MudTh>Name</MudTh>
-                    <MudTh>Width (m)</MudTh>
-                    <MudTh>Height (m)</MudTh>
-                    <MudTh>Resolution (m/px)</MudTh>
-                    <MudTh>OriginX</MudTh>
-                    <MudTh>OriginY</MudTh>
-                    <MudTh></MudTh>
-                </HeaderContent>
-                <RowTemplate>
-                    <MudTd DataLabel="Nr">
-                        @(Table?.CurrentPage * Table?.RowsPerPage + MapsShow.IndexOf(context) + 1)
-                    </MudTd>
-                    <MudTd DataLabel="Name">
-                        @context.Name
-                    </MudTd>
-                    <MudTd DataLabel="Width">
-                        @context.Width
-                    </MudTd>
-                    <MudTd DataLabel="Height">
-                        @context.Height
-                    </MudTd>
-                    <MudTd DataLabel="Resolution">
-                        @context.Resolution
-                    </MudTd>
-                    <MudTd DataLabel="OriginX">
-                        @context.OriginX
-                    </MudTd>
-                    <MudTd DataLabel="OriginY">
-                        @context.OriginY
-                    </MudTd>
-                    <MudTd>
-                        <div class="d-flex flex-row-reverse">
-                            <MudMenu Icon="@Icons.Material.Filled.MoreVert" AnchorOrigin="Origin.BottomCenter">
-                                <MudMenuItem Icon="@Icons.Material.Filled.Edit" IconColor="Color.Info">Edit</MudMenuItem>
-                                <MudMenuItem Icon="@Icons.Material.Filled.Delete" IconColor="Color.Error">Delete</MudMenuItem>
-                            </MudMenu>
-                        </div>
-                    </MudTd>
-                </RowTemplate>
-                <PagerContent>
-                    <div class="d-flex w-100 flex-row-reverse">
-                        <MudTablePager Style="width: 100%;" PageSizeOptions="new[] {25 , 100, 200}" />
-                    </div>
-                </PagerContent>
-            </MudTable>
+        <div class="flex-grow-1" style="height: 50%; width: 100%">
+            <RobotApp.Client.Pages.Components.Mapping.RobotInfomation />
        </div>
    </div>
-    <div class="map-preview">
+    <div class="flex-grow-1 h-100" style="width: 60%">
+        <RobotApp.Client.Pages.Components.Mapping.MapView />
    </div>
 </div>

@code {
-    private string txtSearch = "";
-    private bool IsLoading = false;
-
-    private List<MapDto> Maps = [];
    private List<MapDto> MapsShow = [];
-
-    private int selectedRowNumber = -1;
-    private MapDto MapSelected = new();
-
-    private MudTable<MapDto>? Table; protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        await base.OnAfterRenderAsync(firstRender);
-        if (!firstRender) return;
-
-        await LoadMaps();
-    }
-
-    private async Task LoadMaps()
-    {
-        try
-        {
-            IsLoading = true;
-            Maps.Clear();
-            StateHasChanged();
-
-            var maps = await Http.GetFromJsonAsync<IEnumerable<MapDto>>($"api/MapsManager?txtSearch={txtSearch}");
-            Maps.AddRange(maps ?? []);
-
-            Table?.ReloadServerData();
-            IsLoading = false;
-            StateHasChanged();
-        }
-        catch
-        {
-            return;
-        }
-    }
-
-    private void TextSearchChanged(string text)
-    {
-        txtSearch = text;
-        Table?.ReloadServerData();
-    }
-
-    private bool FilterFunc(MapDto map)
-    {
-        if (string.IsNullOrWhiteSpace(txtSearch))
-            return true;
-        if (map.Name is not null && map.Name.Contains(txtSearch, StringComparison.OrdinalIgnoreCase))
-            return true;
-        if ($"{map.Name}".Contains(txtSearch))
-            return true;
-        return false;
-    }
-
-    private Task<TableData<MapDto>> ReloadData(TableState state, CancellationToken _)
-    {
-        MapsShow.Clear();
-        var tasks = new List<MapDto>();
-        Maps.ForEach(map =>
-        {
-            if (FilterFunc(map)) tasks.Add(map);
-        });
-        MapsShow = tasks.Skip(state.Page * state.PageSize).Take(state.PageSize).ToList();
-        return Task.FromResult(new TableData<MapDto>() { TotalItems = tasks.Count, Items = MapsShow });
-    }
-
-    private void RowClickEvent(TableRowClickEventArgs<MapDto> tableRowClickEventArgs) { }
-
-    private string SelectedRowClassFunc(MapDto element, int rowNumber)
-    {
-        if (selectedRowNumber == rowNumber && Table?.SelectedItem != null && !Table.SelectedItem.Equals(element))
-        {
-            return string.Empty;
-        }
-        else if (selectedRowNumber == rowNumber && Table?.SelectedItem != null && Table.SelectedItem.Equals(element))
-        {
-            return "selected";
-        }
-        else if (Table?.SelectedItem != null && Table.SelectedItem.Equals(element))
-        {
-            selectedRowNumber = rowNumber;
-            MapSelected = element;
-            // NavigationMapPreviewRef.SetMapPreview(MapSelected);
-            return "selected";
-        }
-        else
-        {
-            return string.Empty;
-        }
-    }
 }
--- a/RobotApp.Client/Pages/RobotConfigManager.razor
+++ b/RobotApp.Client/Pages/RobotConfigManager.razor
@@ -0,0 +1,437 @@
+@page "/robot-config"
+@rendermode InteractiveWebAssemblyNoPrerender
+@attribute [Authorize]
+
+@inject HttpClient Http
+@inject ISnackbar Snackbar
+
+@using System.Net.Http.Json
+@using RobotApp.Common.Shares.Dtos
+
+<PageTitle>Robot Configuration</PageTitle>
+
+<div class="d-flex w-100 h-100 p-2 overflow-hidden flex-column position-relative">
+    <div class="rcm-toolbar">
+        <div class="rcm-toolbar-left">
+            <label class="rcm-label" for="configType">Config Type</label>
+            <div class="rcm-select-wrapper">
+                <select id="configType" class="form-select rcm-select" value="@SelectedType" @onchange="OnTypeChanged">
+                    @foreach (var type in GetConfigType)
+                    {
+                        <option value="@type">@type</option>
+                    }
+                </select>
+                <span class="rcm-select-icon" aria-hidden="true">
+                    <svg width="16" height="16" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">
+                        <path d="M7 10l5 5 5-5" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+                    </svg>
+                </span>
+            </div>
+        </div>
+
+        <div class="rcm-toolbar-right">
+            <div class="rcm-action-group">
+                @* <button type="button" class="btn rcm-icon-btn" data-tooltip="Add config" aria-label="Add" @onclick="OpenAddConfig">
+                    <i class="mdi mdi-plus" aria-hidden="true"></i>
+                </button> *@
+
+                <button type="button" class="btn rcm-icon-btn" data-tooltip="Update config" aria-label="Update" @onclick="SaveConfig">
+                    <i class="mdi mdi-content-save" aria-hidden="true"></i>
+                </button>
+
+                <button type="button" class="btn rcm-icon-btn" data-tooltip="Load config" aria-label="Update" @onclick="LoadConfig">
+                    <i class="mdi mdi-file-download" aria-hidden="true"></i>
+                </button>
+
+                @* <button type="button" class="btn rcm-icon-btn rcm-danger" data-tooltip="Delete config" aria-label="Delete" @onclick="DeleteConfig">
+                    <i class="mdi mdi-delete" aria-hidden="true"></i>
+                </button> *@
+            </div>
+        </div>
+    </div>
+    <div class="content rcm-content flex-grow-1 d-flex gap-3 mt-3">
+        <div class="card p-2 config-list rcm-config-list">
+            <div class="card-body list-body p-0">
+                @switch (SelectedType)
+                {
+                    case RobotConfigType.VDA5050:
+                        @RenderList(VdaConfigs, SelectVda, v => v.ConfigName, v => v.IsActive)
+                        break;
+                    case RobotConfigType.Safety:
+                        @RenderList(SafetyConfigs, SelectSafety, s => s.ConfigName, s => s.IsActive)
+                        break;
+                    case RobotConfigType.Simulation:
+                        @RenderList(SimulationConfigs, SelectSimulation, s => s.ConfigName, s => s.IsActive)
+                        break;
+                    case RobotConfigType.PLC:
+                        @RenderList(PlcConfigs, SelectPlc, p => p.ConfigName, p => p.IsActive)
+                        break;
+                    case RobotConfigType.Core:
+                        @RenderList(CoreConfigs, SelectCore, c => c.ConfigName, c => c.IsActive)
+                        break;
+                    default:
+                        <div class="p-2">No configs.</div>
+                        break;
+                }
+            </div>
+        </div>
+
+        <div class="card p-2 config-content rcm-config-content">
+            <div class="card-body">
+                @if (!HasSelection)
+                {
+                    <div class="text-muted">Select a config from the list or click Add to create one.</div>
+                }
+                else
+                {
+                    @switch (SelectedType)
+                    {
+                        case RobotConfigType.VDA5050:
+                            <RobotApp.Client.Pages.Components.Config.RobotVDA5050Config @ref="@RobotVDA5050ConfigRef" @bind-Model="SelectedVda" />
+                            break;
+                        case RobotConfigType.Safety:
+                            <RobotApp.Client.Pages.Components.Config.RobotSafetyConfig @bind-Model="SelectedSafety" />
+                            break;
+                        case RobotConfigType.Simulation:
+                            <RobotApp.Client.Pages.Components.Config.RobotSimulationConfig @bind-Model="SelectedSimulation" />
+                            break;
+                        case RobotConfigType.PLC:
+                            <RobotApp.Client.Pages.Components.Config.RobotPLCConfig @bind-Model="SelectedPlc" />
+                            break;
+                        case RobotConfigType.Core:
+                            <RobotApp.Client.Pages.Components.Config.RobotConfig @bind-Model="SelectedCore" />
+                            break;
+                    }
+                }
+            </div>
+        </div>
+    </div>
+
+    @if (IsLoading)
+    {
+        <div class="rcm-overlay" role="status" aria-live="polite" aria-busy="true">
+            <div class="rcm-overlay-content" aria-hidden="false">
+                <div class="spinner-border text-light" role="status" aria-hidden="true"></div>
+                <div class="rcm-overlay-message ms-2">Loading…</div>
+            </div>
+        </div>
+    }
+
+    @if (IsAddingNew)
+    {
+        <div class="rcm-modal-overlay" role="dialog" aria-modal="true">
+            <div class="rcm-modal">
+                <div class="card">
+                    <div class="card-header d-flex justify-content-between align-items-center">
+                        <strong>Create @SelectedType Config</strong>
+                        <button class="btn btn-sm btn-link text-muted" @onclick="CloseAddDialog" aria-label="Close">✕</button>
+                    </div>
+
+                    <div class="card-body">
+                        <EditForm Model="addForm" OnValidSubmit="SaveNewConfigAsync">
+                            <DataAnnotationsValidator />
+                            <ValidationSummary />
+
+                            <div class="mb-2">
+                                <label class="form-label">Config name</label>
+                                <InputText class="form-control" @bind-Value="addForm.ConfigName" />
+                            </div>
+
+                            <div class="mb-2">
+                                <label class="form-label">Description</label>
+                                <InputText class="form-control" @bind-Value="addForm.Description" />
+                            </div>
+
+                            <div class="mb-2">
+                                <label class="form-label">Copy parameters from existing (@SelectedType)</label>
+                                <select class="form-select" @bind="SelectedTemplateIdString">
+                                    @foreach (var t in GetTemplatesForSelectedType())
+                                    {
+                                        <option value="@t.Id">@t.Name</option>
+                                    }
+                                </select>
+                                <div class="form-text">If you choose an existing config, its parameter fields will be copied into the new config; you can still change name/description.</div>
+                            </div>
+
+                            <div class="d-flex justify-content-end gap-2 mt-3">
+                                <button type="button" class="btn btn-outline-secondary" @onclick="CloseAddDialog">Cancel</button>
+                                <button type="submit" class="btn btn-primary">Create</button>
+                            </div>
+                        </EditForm>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+
+    @if (ShowDeleteConfirm)
+    {
+        <div class="rcm-modal-overlay" role="dialog" aria-modal="true">
+            <div class="rcm-modal">
+                <div class="card">
+                    <div class="card-header d-flex justify-content-between align-items-center">
+                        <strong>Confirm Delete</strong>
+                        <button class="btn btn-sm btn-link text-muted" @onclick="CancelDelete" aria-label="Close">✕</button>
+                    </div>
+                    <div class="card-body">
+                        <p>Are you sure you want to delete configuration "<strong>@DeletePendingName</strong>"?</p>
+                        <div class="d-flex justify-content-end gap-2 mt-3">
+                            <button class="btn btn-outline-secondary" @onclick="CancelDelete">Cancel</button>
+                            <button class="btn btn-danger" @onclick="ConfirmDeleteAsync">Delete</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+
+</div>
+
+@code {
+    private List<RobotVDA5050ConfigDto> VdaConfigs { get; set; } = new();
+    private List<RobotSafetyConfigDto> SafetyConfigs { get; set; } = new();
+    private List<RobotSimulationConfigDto> SimulationConfigs { get; set; } = new();
+    private List<RobotPlcConfigDto> PlcConfigs { get; set; } = new();
+    private List<RobotConfigDto> CoreConfigs { get; set; } = new();
+
+    private RobotVDA5050ConfigDto? SelectedVda { get; set; }
+    private RobotSafetyConfigDto? SelectedSafety { get; set; }
+    private RobotSimulationConfigDto? SelectedSimulation { get; set; }
+    private RobotPlcConfigDto? SelectedPlc { get; set; }
+    private RobotConfigDto? SelectedCore { get; set; }
+
+    private CreateRobotVDA5050ConfigDto CreateVda = new();
+    private CreateRobotConfigDto CreateSafety = new();
+    private CreateRobotSafetyConfigDto CreateSimulation = new();
+    private CreateRobotSimulationConfigDto CreatePlc = new();
+    private CreateRobotPlcConfigDto CreateCore = new();
+
+    private RobotConfigType SelectedType = RobotConfigType.VDA5050;
+
+    private RobotApp.Client.Pages.Components.Config.RobotVDA5050Config RobotVDA5050ConfigRef = default!;
+
+    private int SelectedIndex = -1;
+    private bool HasSelection => SelectedIndex >= 0;
+    private bool IsLoading = false;
+    private bool IsAddingNew = false;
+
+    private bool ShowDeleteConfirm = false;
+    private Guid? DeletePendingId;
+    private string DeletePendingName = string.Empty;
+
+    private class AddFormModel
+    {
+        public string ConfigName { get; set; } = string.Empty;
+        public string Description { get; set; } = string.Empty;
+    }
+    private AddFormModel addForm = new();
+
+    private string SelectedTemplateIdString = string.Empty;
+    private IEnumerable<RobotConfigType> GetConfigType = [RobotConfigType.VDA5050, RobotConfigType.Simulation];
+
+    private IEnumerable<(Guid Id, string Name, bool Active)> GetTemplatesForSelectedType()
+    {
+        return SelectedType switch
+        {
+            RobotConfigType.VDA5050 => VdaConfigs.Select(x => (x.Id, x.ConfigName ?? string.Empty, x.IsActive)),
+            RobotConfigType.Safety => SafetyConfigs.Select(x => (x.Id, x.ConfigName ?? string.Empty, x.IsActive)),
+            RobotConfigType.Simulation => SimulationConfigs.Select(x => (x.Id, x.ConfigName ?? string.Empty, x.IsActive)),
+            RobotConfigType.PLC => PlcConfigs.Select(x => (x.Id, x.ConfigName ?? string.Empty, x.IsActive)),
+            RobotConfigType.Core => CoreConfigs.Select(x => (x.Id, x.ConfigName ?? string.Empty, x.IsActive)),
+            _ => [],
+        };
+    }
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        await base.OnAfterRenderAsync(firstRender);
+        if (!firstRender) return;
+        await LoadForTypeAsync(SelectedType);
+    }
+
+    private async Task OnTypeChanged(ChangeEventArgs e)
+    {
+        if (e?.Value is null) return;
+        if (!Enum.TryParse<RobotConfigType>(e.Value.ToString(), out var newType)) return;
+        if (newType == SelectedType) return;
+
+        SelectedType = newType;
+        await LoadForTypeAsync(newType);
+    }
+
+    private async Task LoadForTypeAsync(RobotConfigType type)
+    {
+        IsLoading = true;
+        StateHasChanged();
+
+        try
+        {
+            switch (type)
+            {
+                case RobotConfigType.VDA5050:
+                    await LoadVDA5050Configs();
+                    break;
+                case RobotConfigType.Safety:
+                    await LoadRobotSafetyConfigs();
+                    break;
+                case RobotConfigType.Simulation:
+                    await LoadRobotSimulationConfigs();
+                    break;
+                case RobotConfigType.PLC:
+                    await LoadRobotPlcConfigs();
+                    break;
+                case RobotConfigType.Core:
+                    await LoadRobotConfigs();
+                    break;
+            }
+        }
+        finally
+        {
+            IsLoading = false;
+            StateHasChanged();
+        }
+    }
+
+    RenderFragment RenderList<T>(List<T> list, Action<int> onSelect, Func<T, string> nameSelector, Func<T, bool>? isActiveSelector = null) where T : class
+    {
+        return builder =>
+        {
+            if (list is null || !list.Any())
+            {
+                builder.OpenElement(0, "div");
+                builder.AddAttribute(1, "class", "p-2 text-muted");
+                builder.AddContent(2, "No configs found.");
+                builder.CloseElement();
+                return;
+            }
+
+            builder.OpenElement(3, "ul");
+            builder.AddAttribute(4, "class", "list-group list-group-flush");
+
+            for (int i = 0; i < list.Count; i++)
+            {
+                var item = list[i];
+                var idx = i;
+                builder.OpenElement(10 + i * 6, "li");
+                builder.AddAttribute(11 + i * 6, "class", $"list-group-item {(SelectedIndex == idx ? "active" : "")}");
+                builder.AddAttribute(12 + i * 6, "style", "cursor:pointer;padding:0.75rem 1rem;");
+                builder.AddAttribute(13 + i * 6, "onclick", EventCallback.Factory.Create(this, () => onSelect(idx)));
+
+                string name;
+                try
+                {
+                    name = nameSelector(item) ?? "Unnamed";
+                }
+                catch
+                {
+                    name = "Unnamed";
+                }
+                builder.AddContent(14 + i * 6, name);
+
+                bool isActive = false;
+                if (isActiveSelector is not null)
+                {
+                    try
+                    {
+                        isActive = isActiveSelector(item);
+                    }
+                    catch
+                    {
+                        isActive = false;
+                    }
+                }
+
+                if (isActive)
+                {
+                    builder.OpenElement(15 + i * 6, "span");
+                    builder.AddAttribute(16 + i * 6, "class", "badge bg-success ms-2 float-end");
+                    builder.AddContent(17 + i * 6, "Active");
+                    builder.CloseElement();
+                }
+
+                builder.CloseElement();
+            }
+
+            builder.CloseElement();
+        };
+    }
+
+    private Action<int> SelectVda => idx =>
+    {
+        SelectedIndex = idx;
+        SelectedVda = idx >= 0 && idx < VdaConfigs.Count ? VdaConfigs[idx] with { } : null;
+        StateHasChanged();
+    };
+
+    private Action<int> SelectSafety => idx =>
+    {
+        SelectedIndex = idx;
+        SelectedSafety = idx >= 0 && idx < SafetyConfigs.Count ? SafetyConfigs[idx] with { } : null;
+        StateHasChanged();
+    };
+
+    private Action<int> SelectSimulation => idx =>
+    {
+        SelectedIndex = idx;
+        SelectedSimulation = idx >= 0 && idx < SimulationConfigs.Count ? SimulationConfigs[idx] with { } : null;
+        StateHasChanged();
+    };
+
+    private Action<int> SelectPlc => idx =>
+    {
+        SelectedIndex = idx;
+        SelectedPlc = idx >= 0 && idx < PlcConfigs.Count ? PlcConfigs[idx] with { } : null;
+        StateHasChanged();
+    };
+
+    private Action<int> SelectCore => idx =>
+    {
+        SelectedIndex = idx;
+        SelectedCore = idx >= 0 && idx < CoreConfigs.Count ? CoreConfigs[idx] with { } : null;
+        StateHasChanged();
+    };
+
+    private void OpenAddConfig()
+    {
+        addForm = new AddFormModel();
+        var model = GetTemplatesForSelectedType();
+        var modelActive = model.Where(x => x.Active).ToList();
+        SelectedTemplateIdString = modelActive.Count > 0 ? modelActive.First().Id.ToString() : model.Any() ? model.First().Id.ToString() : string.Empty;
+        IsAddingNew = true;
+    }
+
+    private void CloseAddDialog()
+    {
+        IsAddingNew = false;
+    }
+
+    private void DeleteConfig()
+    {
+        var tuple = SelectedType switch
+        {
+            RobotConfigType.VDA5050 => (Id: SelectedVda?.Id, Name: SelectedVda?.ConfigName),
+            RobotConfigType.Safety => (Id: SelectedSafety?.Id, Name: SelectedSafety?.ConfigName),
+            RobotConfigType.Simulation => (Id: SelectedSimulation?.Id, Name: SelectedSimulation?.ConfigName),
+            RobotConfigType.PLC => (Id: SelectedPlc?.Id, Name: SelectedPlc?.ConfigName),
+            RobotConfigType.Core => (Id: SelectedCore?.Id, Name: SelectedCore?.ConfigName),
+            _ => (Id: (Guid?)null, Name: (string?)null)
+        };
+
+        if (tuple.Id is null || tuple.Id == Guid.Empty)
+        {
+            Snackbar.Add("No config selected to delete.", Severity.Warning);
+            return;
+        }
+
+        DeletePendingId = tuple.Id;
+        DeletePendingName = tuple.Name ?? string.Empty;
+        ShowDeleteConfirm = true;
+    }
+
+    private void CancelDelete()
+    {
+        ShowDeleteConfirm = false;
+        DeletePendingId = null;
+        DeletePendingName = string.Empty;
+    }
+}
--- a/RobotApp.Client/Pages/RobotConfigManager.razor.cs
+++ b/RobotApp.Client/Pages/RobotConfigManager.razor.cs
@@ -0,0 +1,569 @@
+using MudBlazor;
+using RobotApp.Common.Shares;
+using RobotApp.Common.Shares.Dtos;
+using RobotApp.Common.Shares.Enums;
+using System.Net.Http.Headers;
+using System.Net.Http.Json;
+using System.Xml.Schema;
+
+namespace RobotApp.Client.Pages;
+
+public partial class RobotConfigManager
+{
+    private async Task LoadVDA5050Configs()
+    {
+        try
+        {
+            var res = await Http.GetFromJsonAsync<MessageResult<RobotVDA5050ConfigDto[]>>("api/RobotConfigs/vda5050");
+            if (res is null) Snackbar.Add("Failed to load VDA5050 configs", Severity.Warning);
+            else if (!res.IsSuccess) Snackbar.Add(res.Message ?? "Failed to load VDA5050 configs", Severity.Warning);
+            else if (res.Data is not null)
+            {
+                VdaConfigs.Clear();
+                VdaConfigs.AddRange(res.Data);
+
+                var activeIdx = VdaConfigs.FindIndex(x => x.IsActive);
+                if (activeIdx >= 0)
+                {
+                    SelectedIndex = activeIdx;
+                    SelectedVda = VdaConfigs[activeIdx] with { };
+                }
+                else
+                {
+                    SelectedIndex = -1;
+                    SelectedVda = null;
+                }
+
+                StateHasChanged();
+            }
+            else
+            {
+                Snackbar.Add("No VDA5050 configs found", Severity.Info);
+            }
+        }
+        catch (Exception ex)
+        {
+            Snackbar.Add($"Error loading PLC configs: {ex.Message}", Severity.Warning);
+        }
+    }
+
+    private async Task LoadRobotConfigs()
+    {
+        try
+        {
+            var res = await Http.GetFromJsonAsync<MessageResult<RobotConfigDto[]>>("api/RobotConfigs/robot");
+            if (res is null) Snackbar.Add("Failed to load VDA5050 configs", Severity.Warning);
+            else if (!res.IsSuccess) Snackbar.Add(res.Message ?? "Failed to load VDA5050 configs", Severity.Warning);
+            else if (res.Data is not null)
+            {
+                CoreConfigs.Clear();
+                CoreConfigs.AddRange(res.Data);
+
+                var activeIdx = CoreConfigs.FindIndex(x => x.IsActive);
+                if (activeIdx >= 0)
+                {
+                    SelectedIndex = activeIdx;
+                    SelectedCore = CoreConfigs[activeIdx] with { };
+                }
+                else
+                {
+                    SelectedIndex = -1;
+                    SelectedCore = null;
+                }
+
+                StateHasChanged();
+            }
+        }
+        catch (Exception ex)
+        {
+            Snackbar.Add($"Error loading PLC configs: {ex.Message}", Severity.Warning);
+        }
+    }
+
+    private async Task LoadRobotSafetyConfigs()
+    {
+        try
+        {
+            var res = await Http.GetFromJsonAsync<MessageResult<RobotSafetyConfigDto[]>>("api/RobotConfigs/safety");
+            if (res is null) Snackbar.Add("Failed to load VDA5050 configs", Severity.Warning);
+            else if (!res.IsSuccess) Snackbar.Add(res.Message ?? "Failed to load VDA5050 configs", Severity.Warning);
+            else if (res.Data is not null)
+            {
+                SafetyConfigs.Clear();
+                SafetyConfigs.AddRange(res.Data);
+
+                var activeIdx = SafetyConfigs.FindIndex(x => x.IsActive);
+                if (activeIdx >= 0)
+                {
+                    SelectedIndex = activeIdx;
+                    SelectedSafety = SafetyConfigs[activeIdx] with { };
+                }
+                else
+                {
+                    SelectedIndex = -1;
+                    SelectedSafety = null;
+                }
+
+                StateHasChanged();
+            }
+        }
+        catch (Exception ex)
+        {
+            Snackbar.Add($"Error loading PLC configs: {ex.Message}", Severity.Warning);
+        }
+    }
+
+    private async Task LoadRobotSimulationConfigs()
+    {
+        try
+        {
+            var res = await Http.GetFromJsonAsync<MessageResult<RobotSimulationConfigDto[]>>("api/RobotConfigs/simulation");
+            if (res is null) Snackbar.Add("Failed to load VDA5050 configs", Severity.Warning);
+            else if (!res.IsSuccess) Snackbar.Add(res.Message ?? "Failed to load VDA5050 configs", Severity.Warning);
+            else if (res.Data is not null)
+            {
+                SimulationConfigs.Clear();
+                SimulationConfigs.AddRange(res.Data);
+
+                var activeIdx = SimulationConfigs.FindIndex(x => x.IsActive);
+                if (activeIdx >= 0)
+                {
+                    SelectedIndex = activeIdx;
+                    SelectedSimulation = SimulationConfigs[activeIdx] with { };
+                }
+                else
+                {
+                    SelectedIndex = -1;
+                    SelectedSimulation = null;
+                }
+
+                StateHasChanged();
+            }
+        }
+        catch (Exception ex)
+        {
+            Snackbar.Add($"Error loading PLC configs: {ex.Message}", Severity.Warning);
+        }
+    }
+
+    private async Task LoadRobotPlcConfigs()
+    {
+        try
+        {
+            var res = await Http.GetFromJsonAsync<MessageResult<RobotPlcConfigDto[]>>("api/RobotConfigs/plc");
+            if (res is null) Snackbar.Add("Failed to load VDA5050 configs", Severity.Warning);
+            else if (!res.IsSuccess) Snackbar.Add(res.Message ?? "Failed to load VDA5050 configs", Severity.Warning);
+            else if (res.Data is not null)
+            {
+                PlcConfigs.Clear();
+                PlcConfigs.AddRange(res.Data);
+                var activeIdx = PlcConfigs.FindIndex(x => x.IsActive);
+                if (activeIdx >= 0)
+                {
+                    SelectedIndex = activeIdx;
+                    SelectedPlc = PlcConfigs[activeIdx] with { };
+                }
+                else
+                {
+                    SelectedIndex = -1;
+                    SelectedPlc = null;
+                }
+                StateHasChanged();
+            }
+        }
+        catch (Exception ex)
+        {
+            Snackbar.Add($"Error loading PLC configs: {ex.Message}", Severity.Warning);
+        }
+    }
+
+    private async Task SaveNewConfigAsync()
+    {
+        try
+        {
+            HttpResponseMessage? res = null;
+            _ = Guid.TryParse(SelectedTemplateIdString, out Guid templateId);
+
+            switch (SelectedType)
+            {
+                case RobotConfigType.VDA5050:
+                    {
+                        var template = VdaConfigs.FirstOrDefault(x => x.Id == templateId);
+                        if (template is null) return;
+                        var payload = new
+                        {
+                            addForm.ConfigName,
+                            addForm.Description,
+                            template.SerialNumber,
+                            template.VDA5050HostServer,
+                            template.VDA5050Port,
+                            template.VDA5050UserName,
+                            template.VDA5050Password,
+                            template.VDA5050Manufacturer,
+                            template.VDA5050Version,
+                            template.VDA5050TopicPrefix,
+                            template.VDA5050PublishRepeat,
+                            template.VDA5050EnablePassword,
+                            template.VDA5050EnableTls
+                        };
+
+                        res = await Http.PostAsJsonAsync("api/RobotConfigs/vda5050", payload);
+                        break;
+                    }
+
+                case RobotConfigType.PLC:
+                    {
+                        var template = PlcConfigs.FirstOrDefault(x => x.Id == templateId);
+                        if (template is null) return;
+                        var payload = new
+                        {
+                            addForm.ConfigName,
+                            addForm.Description,
+                            template.PLCAddress,
+                            template.PLCPort,
+                            template.PLCUnitId
+                        };
+
+                        res = await Http.PostAsJsonAsync("api/RobotConfigs/plc", payload);
+                        break;
+                    }
+
+                case RobotConfigType.Safety:
+                    {
+                        var template = SafetyConfigs.FirstOrDefault(x => x.Id == templateId);
+                        if (template is null) return;
+                        var payload = new
+                        {
+                            addForm.ConfigName,
+                            addForm.Description,
+                            template.SafetySpeedVerySlow,
+                            template.SafetySpeedSlow,
+                            template.SafetySpeedNormal,
+                            template.SafetySpeedMedium,
+                            template.SafetySpeedOptimal,
+                            template.SafetySpeedFast,
+                            template.SafetySpeedVeryFast
+                        };
+
+                        res = await Http.PostAsJsonAsync("api/RobotConfigs/safety", payload);
+                        break;
+                    }
+
+                case RobotConfigType.Simulation:
+                    {
+                        var template = SimulationConfigs.FirstOrDefault(x => x.Id == templateId);
+                        if (template is null) return;
+                        var payload = new
+                        {
+                            addForm.ConfigName,
+                            addForm.Description,
+                            template.EnableSimulation,
+                            template.SimulationMaxVelocity,
+                            template.SimulationMaxAngularVelocity,
+                            template.SimulationAcceleration,
+                            template.SimulationDeceleration
+                        };
+
+                        res = await Http.PostAsJsonAsync("api/RobotConfigs/simulation", payload);
+                        break;
+                    }
+
+                case RobotConfigType.Core:
+                default:
+                    {
+                        var template = CoreConfigs.FirstOrDefault(x => x.Id == templateId);
+                        if (template is null) return;
+                        var payload = new
+                        {
+                            addForm.ConfigName,
+                            addForm.Description,
+                            template.NavigationType,
+                            template.RadiusWheel,
+                            template.Width,
+                            template.Length,
+                            template.Height
+                        };
+
+                        res = await Http.PostAsJsonAsync("api/RobotConfigs/robot", payload);
+                        break;
+                    }
+            }
+
+            if (res is not null && res.IsSuccessStatusCode)
+            {
+                Snackbar.Add("Config created", Severity.Success);
+                IsAddingNew = false;
+                await LoadForTypeAsync(SelectedType);
+            }
+            else
+            {
+                var message = res is null ? "No response" : await res.Content.ReadAsStringAsync();
+                Snackbar.Add($"Create failed: {message}", Severity.Error);
+            }
+        }
+        catch (Exception ex)
+        {
+            Snackbar.Add($"Error creating config: {ex.Message}", Severity.Error);
+        }
+    }
+
+    private async Task<bool> SaveCertificates()
+    {
+        using var content = new MultipartFormDataContent();
+
+        if (RobotVDA5050ConfigRef.CaFile is not null)
+        {
+            var fileContent = new StreamContent(RobotVDA5050ConfigRef.CaFile.OpenReadStream(maxAllowedSize: RobotVDA5050ConfigRef.MaxFileSize));
+            content.Add(fileContent, "CaFile", RobotVDA5050ConfigRef.CaFile.Name);
+        }
+        if (RobotVDA5050ConfigRef.CertFile is not null)
+        {
+            var fileContent = new StreamContent(RobotVDA5050ConfigRef.CertFile.OpenReadStream(maxAllowedSize: RobotVDA5050ConfigRef.MaxFileSize));
+            content.Add(fileContent, "CertFile", RobotVDA5050ConfigRef.CertFile.Name);
+        }
+        if (RobotVDA5050ConfigRef.KeyFile is not null)
+        {
+            var fileContent = new StreamContent(RobotVDA5050ConfigRef.KeyFile.OpenReadStream(maxAllowedSize: RobotVDA5050ConfigRef.MaxFileSize));
+            content.Add(fileContent, "KeyFile", RobotVDA5050ConfigRef.KeyFile.Name);
+        }
+        if (content.Any())
+        {
+            var response = await (await Http.PostAsync($"api/File/certificates", content)).Content.ReadFromJsonAsync<MessageResult>();
+            if (response is null) Snackbar.Add("Failed to update certificates", Severity.Warning);
+            else if (!response.IsSuccess) Snackbar.Add(response.Message ?? "Failed to update certificates", Severity.Warning);
+            else return true;
+            StateHasChanged();
+            return false;
+        }
+        return true;
+    }
+
+    private async Task SaveConfig()
+    {
+        try
+        {
+            Guid? id = SelectedType switch
+            {
+                RobotConfigType.VDA5050 => SelectedVda?.Id,
+                RobotConfigType.Safety => SelectedSafety?.Id,
+                RobotConfigType.Simulation => SelectedSimulation?.Id,
+                RobotConfigType.PLC => SelectedPlc?.Id,
+                RobotConfigType.Core => SelectedCore?.Id,
+                _ => null
+            };
+
+            if (id == null || id == Guid.Empty)
+            {
+                Snackbar.Add("No config selected to save.", Severity.Warning);
+                return;
+            }
+
+            MessageResult? result = null;
+
+            switch (SelectedType)
+            {
+                case RobotConfigType.VDA5050:
+                    {
+                        if (SelectedVda is null) { Snackbar.Add("No VDA5050 config selected.", Severity.Warning); return; }
+                        var updateDto = new
+                        {
+                            SelectedVda.SerialNumber,
+                            SelectedVda.VDA5050HostServer,
+                            SelectedVda.VDA5050Port,
+                            SelectedVda.VDA5050UserName,
+                            SelectedVda.VDA5050Password,
+                            SelectedVda.VDA5050Manufacturer,
+                            SelectedVda.VDA5050Version,
+                            SelectedVda.VDA5050TopicPrefix,
+                            SelectedVda.VDA5050PublishRepeat,
+                            SelectedVda.VDA5050EnablePassword,
+                            SelectedVda.VDA5050EnableTls,
+                            SelectedVda.VDA5050CA,
+                            SelectedVda.VDA5050Cer,
+                            SelectedVda.VDA5050Key,
+                            SelectedVda.Description
+                        };
+                        var saveCer = await SaveCertificates();
+                        if (saveCer) result = await (await Http.PutAsJsonAsync($"api/RobotConfigs/vda5050/{id}", updateDto)).Content.ReadFromJsonAsync<MessageResult>();
+                        else return;
+                        break;
+                    }
+
+                case RobotConfigType.PLC:
+                    {
+                        if (SelectedPlc is null) { Snackbar.Add("No PLC config selected.", Severity.Warning); return; }
+                        var updateDto = new
+                        {
+                            SelectedPlc.Description,
+                            SelectedPlc.PLCAddress,
+                            SelectedPlc.PLCPort,
+                            SelectedPlc.PLCUnitId
+                        };
+
+                        result = await (await Http.PutAsJsonAsync($"api/RobotConfigs/plc/{id}", updateDto)).Content.ReadFromJsonAsync<MessageResult>();
+                        break;
+                    }
+
+                case RobotConfigType.Safety:
+                    {
+                        if (SelectedSafety is null) { Snackbar.Add("No Safety config selected.", Severity.Warning); return; }
+                        var updateDto = new
+                        {
+                            SelectedSafety.SafetySpeedVerySlow,
+                            SelectedSafety.SafetySpeedSlow,
+                            SelectedSafety.SafetySpeedNormal,
+                            SelectedSafety.SafetySpeedMedium,
+                            SelectedSafety.SafetySpeedOptimal,
+                            SelectedSafety.SafetySpeedFast,
+                            SelectedSafety.SafetySpeedVeryFast,
+                            SelectedSafety.Description
+                        };
+
+                        result = await (await Http.PutAsJsonAsync($"api/RobotConfigs/safety/{id}", updateDto)).Content.ReadFromJsonAsync<MessageResult>();
+                        break;
+                    }
+
+                case RobotConfigType.Simulation:
+                    {
+                        if (SelectedSimulation is null) { Snackbar.Add("No Simulation config selected.", Severity.Warning); return; }
+                        var updateDto = new
+                        {
+                            SelectedSimulation.EnableSimulation,
+                            SelectedSimulation.SimulationMaxVelocity,
+                            SelectedSimulation.SimulationMaxAngularVelocity,
+                            SelectedSimulation.SimulationAcceleration,
+                            SelectedSimulation.SimulationDeceleration,
+                            SelectedSimulation.Description
+                        };
+
+                        result = await (await Http.PutAsJsonAsync($"api/RobotConfigs/simulation/{id}", updateDto)).Content.ReadFromJsonAsync<MessageResult>();
+                        break;
+                    }
+
+                case RobotConfigType.Core:
+                default:
+                    {
+                        if (SelectedCore is null) { Snackbar.Add("No Core config selected.", Severity.Warning); return; }
+                        var updateDto = new
+                        {
+                            SelectedCore.NavigationType,
+                            SelectedCore.RadiusWheel,
+                            SelectedCore.Width,
+                            SelectedCore.Length,
+                            SelectedCore.Height,
+                            SelectedCore.Description
+                        };
+
+                        result = await (await Http.PutAsJsonAsync($"api/RobotConfigs/robot/{id}", updateDto)).Content.ReadFromJsonAsync<MessageResult>();
+                        break;
+                    }
+            }
+
+            if (result is null) Snackbar.Add("Failed to update config", Severity.Warning);
+            else if (!result.IsSuccess) Snackbar.Add(result.Message ?? "Failed to update config", Severity.Warning);
+            else
+            {
+                Snackbar.Add("Config saved", Severity.Success);
+
+                await LoadForTypeAsync(SelectedType);
+
+                switch (SelectedType)
+                {
+                    case RobotConfigType.VDA5050:
+                        var vIdx = VdaConfigs.FindIndex(x => x.Id == id);
+                        if (vIdx >= 0) { SelectedIndex = vIdx; SelectedVda = VdaConfigs[vIdx] with { }; }
+                        break;
+                    case RobotConfigType.Safety:
+                        var sIdx = SafetyConfigs.FindIndex(x => x.Id == id);
+                        if (sIdx >= 0) { SelectedIndex = sIdx; SelectedSafety = SafetyConfigs[sIdx] with { }; }
+                        break;
+                    case RobotConfigType.Simulation:
+                        var simIdx = SimulationConfigs.FindIndex(x => x.Id == id);
+                        if (simIdx >= 0) { SelectedIndex = simIdx; SelectedSimulation = SimulationConfigs[simIdx] with { }; }
+                        break;
+                    case RobotConfigType.PLC:
+                        var pIdx = PlcConfigs.FindIndex(x => x.Id == id);
+                        if (pIdx >= 0) { SelectedIndex = pIdx; SelectedPlc = PlcConfigs[pIdx] with { }; }
+                        break;
+                    case RobotConfigType.Core:
+                        var cIdx = CoreConfigs.FindIndex(x => x.Id == id);
+                        if (cIdx >= 0) { SelectedIndex = cIdx; SelectedCore = CoreConfigs[cIdx] with { }; }
+                        break;
+                }
+
+                StateHasChanged();
+            }
+        }
+        catch (Exception ex)
+        {
+            Snackbar.Add($"Error saving config: {ex.Message}", Severity.Error);
+        }
+    }
+
+    private async Task ConfirmDeleteAsync()
+    {
+        try
+        {
+            if (DeletePendingId is null || DeletePendingId == Guid.Empty)
+            {
+                Snackbar.Add("No config selected to delete.", Severity.Warning);
+                CancelDelete();
+                return;
+            }
+
+            var id = DeletePendingId.Value;
+            string path = SelectedType switch
+            {
+                RobotConfigType.VDA5050 => $"api/RobotConfigs/vda5050/{id}",
+                RobotConfigType.Safety => $"api/RobotConfigs/safety/{id}",
+                RobotConfigType.Simulation => $"api/RobotConfigs/simulation/{id}",
+                RobotConfigType.PLC => $"api/RobotConfigs/plc/{id}",
+                RobotConfigType.Core => $"api/RobotConfigs/robot/{id}",
+                _ => throw new InvalidOperationException("Unsupported config type")
+            };
+
+            IsLoading = true;
+            StateHasChanged();
+
+            var httpRes = await Http.DeleteFromJsonAsync<MessageResult>(path);
+
+            if (httpRes is null) Snackbar.Add("Failed to delete config", Severity.Warning);
+            else if (!httpRes.IsSuccess) Snackbar.Add(httpRes.Message ?? "Failed to delete config", Severity.Warning);
+            else
+            {
+                Snackbar.Add("Config deleted", Severity.Success);
+
+                SelectedIndex = -1;
+                switch (SelectedType)
+                {
+                    case RobotConfigType.VDA5050: SelectedVda = null; break;
+                    case RobotConfigType.Safety: SelectedSafety = null; break;
+                    case RobotConfigType.Simulation: SelectedSimulation = null; break;
+                    case RobotConfigType.PLC: SelectedPlc = null; break;
+                    case RobotConfigType.Core: SelectedCore = null; break;
+                }
+
+                await LoadForTypeAsync(SelectedType);
+            }
+        }
+        catch (Exception ex)
+        {
+            Snackbar.Add($"Error deleting config: {ex.Message}", Severity.Error);
+        }
+        finally
+        {
+            IsLoading = false;
+            CancelDelete();
+            StateHasChanged();
+        }
+    }
+
+    private async Task LoadConfig()
+    {
+        var response = await (await Http.PostAsync($"api/RobotConfigs/load", null)).Content.ReadFromJsonAsync<MessageResult>();
+        if (response is null) Snackbar.Add("Failed to load config", Severity.Warning);
+        else if (!response.IsSuccess) Snackbar.Add(response.Message ?? "Failed to load config", Severity.Warning);
+        else Snackbar.Add("Config loaded", Severity.Success);
+        StateHasChanged();
+    }
+}
--- a/RobotApp.Client/Pages/RobotConfigManager.razor.css
+++ b/RobotApp.Client/Pages/RobotConfigManager.razor.css
@@ -0,0 +1,520 @@
+/* Toolbar layout */
+.rcm-toolbar {
+    display: flex;
+    gap: 1rem;
+    align-items: center;
+    justify-content: space-between;
+    background: var(--mud-palette-surface, #ffffff);
+    color: #e6e6e6;
+    padding: 0.75rem 1rem;
+    border-radius: 0.375rem;
+    box-shadow: 0 2px 6px rgba(0,0,0,0.6);
+    border: 1px solid rgba(255,255,255,0.04);
+}
+
+/* Content layout: take remaining height */
+.rcm-content {
+    height: calc(100vh - 90px); /* approximate toolbar + padding height; adjust if needed */
+    min-height: 0; /* allow flex children to shrink properly */
+}
+
+/* Config list uses flexible basis and can shrink instead of forcing overflow */
+.rcm-config-list {
+    /* replace fixed width with flex basis + shrink */
+    flex: 0 1 35%; /* flex-grow:0, flex-shrink:1, flex-basis:35% */
+    min-width: 240px; /* allow smaller than before but keep readable */
+    display: flex;
+    flex-direction: column;
+    min-height: 0;
+}
+
+/* Config content uses remaining space and can shrink/grow */
+.rcm-config-content {
+    flex: 1 1 65%; /* flex-grow:1 to take remaining, flex-shrink:1 */
+    min-width: 220px;
+    display: flex;
+    flex-direction: column;
+}
+
+/* Make card body scrollable if content overflows */
+.config-list .list-body,
+.rcm-config-content .card-body,
+.config-list .list-body ul {
+    overflow: auto;
+}
+
+/* Ensure list-body and editor body expand to fill container */
+.config-list .list-body {
+    height: 100%;
+}
+
+.rcm-config-content .card-body {
+    height: 100%;
+}
+
+/* Make config list body fill available height and scroll when content overflows */
+.rcm-config-list .card-body.list-body {
+  flex: 1 1 auto; /* expand to fill container */
+  min-height: 0;   /* allow flex children to shrink in many browsers */
+  overflow: auto;  /* enable scrolling when content overflows */
+  padding: 0.25rem 0.5rem; /* keep slight padding for list */
+}
+
+/* Ensure the list itself doesn't add extra margins that affect scrolling */
+.rcm-config-list .list-group {
+  margin: 0;
+  padding: 0;
+}
+
+/* Each list item keeps its padding but stays in flow */
+.rcm-config-list .list-group-item {
+  padding: 0.75rem 1rem;
+}
+
+/* List items spacing */
+.list-group-item {
+    cursor: pointer;
+}
+
+/* Left side controls (robot id + select) */
+.rcm-toolbar-left {
+    display: flex;
+    gap: 0.5rem;
+    align-items: center;
+    flex-wrap: wrap;
+}
+
+/* Right side action buttons */
+.rcm-toolbar-right {
+    display: flex;
+    align-items: center;
+}
+
+/* Group buttons with small spacing */
+.rcm-action-group {
+    display: flex;
+    gap: 0.5rem;
+}
+
+/* Inputs sizing */
+.rcm-input {
+    width: 160px;
+    background: #1a1a1a;
+    border: 1px solid rgba(255,255,255,0.06);
+    color: #e6e6e6;
+}
+
+.rcm-select-wrapper {
+    position: relative;
+    display: inline-flex;
+    align-items: center;
+}
+
+/* Make select background brighter and match button gradients (blue tone similar to Update) */
+.rcm-select {
+    width: 180px;
+    margin-left: 6px; /* bring select closer to left controls */
+    background: linear-gradient(180deg, #4aa0db, #2b87c9);
+    border: 1px solid rgba(0,0,0,0.12);
+    color: #fff;
+    appearance: none;
+    padding-right: 28px; /* space for icon */
+    box-shadow: 0 1px 0 rgba(255,255,255,0.04) inset;
+}
+
+/* Hover effect: slightly brighter */
+.rcm-select-wrapper:hover .rcm-select {
+    background: linear-gradient(180deg, #5bb6ee, #399ad6);
+    border-color: rgba(58,123,184,0.22);
+    transform: translateY(-1px);
+}
+
+/* Select icon color to contrast with brighter select */
+.rcm-select-icon {
+    position: absolute;
+    right: 6px;
+    pointer-events: none;
+    color: rgba(255,255,255,0.9);
+    display: inline-flex;
+    align-items: center;
+}
+
+/* Toolbar labels */
+.rcm-label {
+    font-size: 0.9rem;
+    margin-right: 6px;
+    color: #cfcfcf;
+}
+
+/* Minor button styling to match toolbar */
+.rcm-btn {
+    min-width: 84px;
+}
+
+/* Icon button styles */
+.rcm-icon-btn {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 38px;
+    height: 34px;
+    padding: 0.25rem;
+    border-radius: 6px;
+    background: transparent;
+    color: #e6e6e6;
+    border: 1px solid rgba(255,255,255,0.04);
+}
+
+.rcm-icon-btn svg { 
+    display: block;
+}
+
+/* Icon button hover and focus states */
+.rcm-icon-btn:hover, .rcm-icon-btn:focus {
+    background: rgba(255,255,255,0.03);
+    color: #fff;
+    border-color: rgba(255,255,255,0.08);
+}
+
+.rcm-danger {
+    color: #ffb3b3;
+    border-color: rgba(255,100,100,0.18);
+}
+
+/* Adjust bootstrap button colors for dark toolbar when using outline variants */
+.rcm-toolbar .btn-outline-primary {
+    color: #cfe2ff;
+    border-color: rgba(95,160,255,0.2);
+}
+
+.rcm-toolbar .btn-outline-success {
+    color: #d4f5d4;
+    border-color: rgba(60,200,120,0.18);
+}
+
+.rcm-toolbar .btn-outline-danger {
+    color: #ffcfcf;
+    border-color: rgba(255,100,100,0.18);
+}
+
+/* Specific styles for action buttons (Add, Update, Delete) */
+.rcm-action-group button[aria-label="Add"] {
+  background: linear-gradient(180deg, #4bb24b, #2f9a2f); /* bright green */
+  color: #fff;
+  border: 1px solid rgba(0,0,0,0.08);
+  box-shadow: 0 1px 0 rgba(255,255,255,0.06) inset;
+}
+
+.rcm-action-group button[aria-label="Add"]:hover {
+  background: linear-gradient(180deg, #66d166, #3fb83f);
+  transform: translateY(-1px);
+}
+
+.rcm-action-group button[aria-label="Add"]:focus {
+  outline: none;
+  box-shadow: 0 0 0 3px rgba(56,160,56,0.18);
+}
+
+.rcm-action-group button[aria-label="Update"] {
+  background: linear-gradient(180deg, #4aa0db, #2b87c9); /* bright blue */
+  color: #fff;
+  border: 1px solid rgba(0,0,0,0.08);
+  box-shadow: 0 1px 0 rgba(255,255,255,0.08) inset;
+}
+
+.rcm-action-group button[aria-label="Update"]:hover {
+  background: linear-gradient(180deg, #5bb6ee, #399ad6);
+  transform: translateY(-1px);
+}
+
+.rcm-action-group button[aria-label="Update"]:focus {
+  outline: none;
+  box-shadow: 0 0 0 3px rgba(58,123,184,0.18);
+}
+
+.rcm-action-group button[aria-label="Delete"] {
+  background: linear-gradient(180deg, #ff6b6b, #e04848); /* bright red */
+  color: #fff;
+  border: 1px solid rgba(0,0,0,0.08);
+  box-shadow: 0 1px 0 rgba(255,255,255,0.06) inset;
+}
+
+.rcm-action-group button[aria-label="Delete"]:hover {
+  background: linear-gradient(180deg, #ff8282, #ec5b5b);
+  transform: translateY(-1px);
+}
+
+.rcm-action-group button[aria-label="Delete"]:focus {
+  outline: none;
+  box-shadow: 0 0 0 3px rgba(224,72,72,0.18);
+}
+
+/* Ensure icons inside the action buttons remain visible */
+.rcm-action-group button[aria-label="Add"] .mdi,
+.rcm-action-group button[aria-label="Update"] .mdi,
+.rcm-action-group button[aria-label="Delete"] .mdi {
+  color: #fff;
+}
+
+/* Ensure dropdown options use dark theme matching select */
+.rcm-select option {
+  background-color: #141414 !important;
+  color: #e6e6e6 !important;
+}
+
+/* Hover/active state inside dropdown */
+.rcm-select option:hover,
+.rcm-select option:checked {
+  background-color: #2b87c9 !important; /* match update button blue */
+  color: #fff !important;
+}
+
+/* Optgroup styling (if used) */
+.rcm-select optgroup {
+  color: #e6e6e6;
+  background: #141414;
+}
+
+/* Tooltip for action buttons using data-tooltip attribute */
+.rcm-action-group button[data-tooltip] {
+  position: relative;
+}
+
+.rcm-action-group button[data-tooltip]::after {
+  content: attr(data-tooltip);
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%) translateY(8px);
+  bottom: -9999px; /* hidden by default below flow */
+  background: rgba(20,20,20,0.98);
+  color: #fff;
+  padding: 6px 10px;
+  border-radius: 6px;
+  font-size: 0.85rem;
+  white-space: nowrap;
+  box-shadow: 0 2px 6px rgba(0,0,0,0.5);
+  opacity: 0;
+  pointer-events: none;
+  transition: opacity 0.12s ease, transform 0.12s ease;
+  z-index: 50;
+}
+
+/* Arrow below tooltip */
+.rcm-action-group button[data-tooltip]::before {
+  content: "";
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: -9999px;
+  width: 8px;
+  height: 8px;
+  background: rgba(20,20,20,0.98);
+  transform-origin: center;
+  rotate: 45deg;
+  z-index: 49;
+}
+
+/* Show tooltip on hover */
+.rcm-action-group button[data-tooltip]:hover::after,
+.rcm-action-group button[data-tooltip]:hover::before {
+  bottom: -45px; /* reduced gap: place tooltip closer to the button */
+  opacity: 1;
+  transform: translateX(-50%) translateY(0);
+}
+
+/* Adjust for danger button (slightly different color) */
+.rcm-action-group button[data-tooltip].rcm-danger::after {
+  background: rgba(224,72,72,0.95);
+}
+
+/* Slightly lift the button on hover to match tooltip */
+.rcm-action-group button[data-tooltip]:hover {
+  transform: translateY(-2px);
+}
+
+/* Tooltip backgrounds matching their buttons */
+.rcm-action-group button[aria-label="Add"][data-tooltip]::after {
+  background: linear-gradient(180deg, #4bb24b, #2f9a2f);
+}
+.rcm-action-group button[aria-label="Add"][data-tooltip]::before {
+  background: #2f9a2f;
+}
+
+.rcm-action-group button[aria-label="Update"][data-tooltip]::after {
+  background: linear-gradient(180deg, #4aa0db, #2b87c9);
+}
+.rcm-action-group button[aria-label="Update"][data-tooltip]::before {
+  background: #2b87c9;
+}
+
+/* Delete already had a red variant, update the arrow to match precisely */
+.rcm-action-group button[aria-label="Delete"][data-tooltip]::after,
+.rcm-action-group button[data-tooltip].rcm-danger::after {
+  background: linear-gradient(180deg, #ff6b6b, #e04848);
+}
+.rcm-action-group button[aria-label="Delete"][data-tooltip]::before,
+.rcm-action-group button[data-tooltip].rcm-danger::before {
+  background: #e04848;
+}
+
+/* Ensure tooltip text stays readable on gradients */
+.rcm-action-group button[data-tooltip]::after {
+  color: #fff;
+}
+
+/* Active badge in config list: make slightly larger and more visible */
+.rcm-config-list .list-group-item .badge {
+  font-size: 1.05rem; /* slightly larger */
+  padding: 0.45rem 0.8rem;
+  border-radius: 0.5rem;
+  line-height: 1;
+  margin-left: 0.6rem;
+  opacity: 0.98;
+  display: inline-block;
+  vertical-align: middle;
+}
+
+/* Overlay that blocks the whole viewport while loading */
+.rcm-overlay {
+    position: absolute;
+    inset: 0; /* top:0; right:0; bottom:0; left:0; */
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: rgba(7, 10, 13, 0.55);
+    z-index: 1050; /* above most UI layers */
+    pointer-events: auto; /* capture mouse interactions */
+}
+
+/* inner content: spinner + optional message */
+.rcm-overlay-content {
+    display: inline-flex;
+    align-items: center;
+    gap: 0.6rem;
+    background: rgba(20, 20, 20, 0.85);
+    padding: 0.75rem 1rem;
+    border-radius: 8px;
+    box-shadow: 0 8px 24px rgba(0,0,0,0.45);
+    color: #fff;
+    font-weight: 500;
+    transform: translateY(-6px);
+}
+
+/* message text */
+.rcm-overlay-message {
+    font-size: 0.95rem;
+    color: #eef3ff;
+}
+
+/* ensure spinner is visible on dark overlay */
+.rcm-overlay .spinner-border {
+    width: 1.25rem;
+    height: 1.25rem;
+    border-width: 0.18rem;
+    color: #ffffff;
+}
+
+/* Modal overlay (create dialog) */
+.rcm-modal-overlay {
+    position: absolute;
+    inset: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: rgba(7, 10, 13, 0.45);
+    z-index: 1065;
+    pointer-events: auto;
+}
+
+/* Modal container */
+.rcm-modal {
+    width: 820px;
+    max-width: calc(100% - 40px);
+    border-radius: 8px;
+    box-shadow: 0 12px 40px rgba(0,0,0,0.5);
+    background: var(--mud-palette-surface, #0f1720);
+    color: #e6e6e6;
+}
+
+    /* Ensure card inside modal uses default spacing already present */
+    .rcm-modal .card {
+        background: #0f1720;
+        border: 1px solid rgba(255,255,255,0.04);
+    }
+
+    /* Header styling */
+    .rcm-modal .card-header {
+        padding: 0.6rem 0.9rem;
+        background: rgba(255,255,255,0.02);
+        border-bottom: 1px solid rgba(255,255,255,0.03);
+    }
+
+/* Modal message / spinner adjustments (already defined for overlay) */
+.rcm-overlay .spinner-border {
+    width: 1.25rem;
+    height: 1.25rem;
+    border-width: 0.18rem;
+    color: #ffffff;
+}
+
+/* Keep responsive layout for modal form inputs */
+.rcm-modal .card-body {
+    padding: 0.8rem;
+    color: #e6e6e6;
+}
+
+/* --- Contrast adjustments for modal form elements --- */
+/* Improve readability by increasing text contrast and adjusting input backgrounds */
+.rcm-modal {
+    color: #eaf4ff; /* default text inside modal */
+}
+
+    /* labels, headers and small notes */
+    .rcm-modal .form-label,
+    .rcm-modal label,
+    .rcm-modal .card-header strong,
+    .rcm-modal .card-header,
+    .rcm-modal .form-text,
+    .rcm-modal .validation-message,
+    .rcm-modal .text-muted {
+        color: #cfe6ff;
+    }
+
+    /* form controls */
+    .rcm-modal .form-control,
+    .rcm-modal .form-select,
+    .rcm-modal input[type="text"],
+    .rcm-modal input[type="number"],
+    .rcm-modal textarea {
+        /*background: rgba(255,255,255,0.03);*/ /* subtle contrast with modal bg */
+        /*color: #ffffff;*/
+        border: 1px solid rgba(255,255,255,0.08);
+        box-shadow: none;
+        caret-color: #ffffff;
+    }
+
+        /* placeholder text */
+        .rcm-modal .form-control::placeholder,
+        .rcm-modal input::placeholder,
+        .rcm-modal textarea::placeholder {
+            color: rgba(255,255,255,0.55);
+        }
+
+    /* validation / summary messages */
+    .rcm-modal .validation-message,
+    .rcm-modal .validation-summary-valid,
+    .rcm-modal .validation-summary-errors,
+    .rcm-modal .field-validation-error {
+        color: #ffd2d2;
+    }
+
+    /* modal buttons */
+    .rcm-modal .btn-link {
+        color: #cfcfcf;
+    }
+
+    /* keep modal small text readable */
+    .rcm-modal .card-body {
+        font-size: 0.95rem;
+        line-height: 1.4;
+    }
--- a/RobotApp.Client/Pages/Weather.razor
+++ b/RobotApp.Client/Pages/Weather.razor
@@ -1,63 +0,0 @@
-@page "/weather"
-
-<PageTitle>Weather</PageTitle>
-
-<h1>Weather</h1>
-
-<p>This component demonstrates showing data.</p>
-
-@if (forecasts == null)
-{
-    <p><em>Loading...</em></p>
-}
-else
-{
-    <table class="table">
-        <thead>
-            <tr>
-                <th>Date</th>
-                <th aria-label="Temperature in Celsius">Temp. (C)</th>
-                <th aria-label="Temperature in Farenheit">Temp. (F)</th>
-                <th>Summary</th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach (var forecast in forecasts)
-            {
-                <tr>
-                    <td>@forecast.Date.ToShortDateString()</td>
-                    <td>@forecast.TemperatureC</td>
-                    <td>@forecast.TemperatureF</td>
-                    <td>@forecast.Summary</td>
-                </tr>
-            }
-        </tbody>
-    </table>
-}
-
-@code {
-    private WeatherForecast[]? forecasts;
-
-    protected override async Task OnInitializedAsync()
-    {
-        // Simulate asynchronous loading to demonstrate a loading indicator
-        await Task.Delay(500);
-
-        var startDate = DateOnly.FromDateTime(DateTime.Now);
-        var summaries = new[] { "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" };
-        forecasts = Enumerable.Range(1, 5).Select(index => new WeatherForecast
-        {
-            Date = startDate.AddDays(index),
-            TemperatureC = Random.Shared.Next(-20, 55),
-            Summary = summaries[Random.Shared.Next(summaries.Length)]
-        }).ToArray();
-    }
-
-    private class WeatherForecast
-    {
-        public DateOnly Date { get; set; }
-        public int TemperatureC { get; set; }
-        public string? Summary { get; set; }
-        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-    }
-}
--- a/RobotApp.Client/Pages/_Imports.razor
+++ b/RobotApp.Client/Pages/_Imports.razor
@@ -0,0 +1,18 @@
+@layout RobotApp.Client.Pages.AssemblyLayout
+@using System.Net.Http
+@using System.Net.Http.Json
+@using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
+@using static RobotApp.Client.ClientRenderMode
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@using Microsoft.JSInterop
+@using RobotApp.Client
+@using Microsoft.AspNetCore.Authorization
+@using MudBlazor
+@using RobotApp.Common.Shares
+@using RobotApp.Common.Shares.Dtos
+@using Excubo.Blazor.Canvas
+@using Excubo.Blazor.Canvas.Contexts
--- a/RobotApp.Client/Program.cs
+++ b/RobotApp.Client/Program.cs
@@ -1,9 +1,20 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using MudBlazor.Services;
+using System.Globalization;

+CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("en-US");
 var builder = WebAssemblyHostBuilder.CreateDefault(args);

 builder.Services.AddAuthorizationCore();
 builder.Services.AddCascadingAuthenticationState();
 builder.Services.AddAuthenticationStateDeserialization();

+builder.Services.AddScoped(_ => new HttpClient() { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+builder.Services.AddMudServices(config =>
+{
+    config.SnackbarConfiguration.VisibleStateDuration = 2000;
+    config.SnackbarConfiguration.HideTransitionDuration = 500;
+    config.SnackbarConfiguration.ShowTransitionDuration = 500;
+});
+
 await builder.Build().RunAsync();
--- a/RobotApp.Client/RobotApp.Client.csproj
+++ b/RobotApp.Client/RobotApp.Client.csproj
@@ -9,6 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
+    <PackageReference Include="Excubo.Blazor.Canvas" Version="3.2.91" />
    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.1" />
    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.1" />
    <PackageReference Include="MudBlazor" Version="8.12.0" />
@@ -18,4 +19,8 @@
    <ProjectReference Include="..\RobotApp.Common.Shares\RobotApp.Common.Shares.csproj" />
  </ItemGroup>

+  <ItemGroup>
+    <Folder Include="Models\" />
+  </ItemGroup>
+
 </Project>
--- a/RobotApp.Client/Routes.razor
+++ b/RobotApp.Client/Routes.razor
@@ -1,10 +0,0 @@
-<Router AppAssembly="typeof(Program).Assembly">
-    <Found Context="routeData">
-        <AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)">
-            <NotAuthorized>
-                <RedirectToLogin />
-            </NotAuthorized>
-        </AuthorizeRouteView>
-        <FocusOnNavigate RouteData="routeData" Selector="h1" />
-    </Found>
-</Router>
--- a/RobotApp.Client/_Imports.razor
+++ b/RobotApp.Client/_Imports.razor
@@ -5,7 +5,11 @@
@using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using static Microsoft.AspNetCore.Components.Web.RenderMode
+@using static RobotApp.Client.ClientRenderMode
@using Microsoft.AspNetCore.Components.Web.Virtualization
@using Microsoft.JSInterop
@using RobotApp.Client
@using Microsoft.AspNetCore.Authorization
+@using MudBlazor
+@using RobotApp.Common.Shares.Dtos
+@using RobotApp.Common.Shares.Enums
--- a/RobotApp.Client/wwwroot/images/AMR-250.png
+++ b/RobotApp.Client/wwwroot/images/AMR-250.png
--- a/RobotApp.Client/wwwroot/images/Image-not-found.png
+++ b/RobotApp.Client/wwwroot/images/Image-not-found.png
--- a/RobotApp.Client/wwwroot/images/logoDark.svg
+++ b/RobotApp.Client/wwwroot/images/logoDark.svg
@@ -0,0 +1,10 @@
+<svg
+  id="Layer_1"
+  data-name="Layer 1"
+  xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 0 32 32"
+>
+	<path d="M31.81,1.79,21.29,14.32l-2.48-3a2.6,2.6,0,0,1,0-3.34l4.45-5.31a2.64,2.64,0,0,1,2-.93Z" fill="#e06e2e"/>
+	<path d="M.19,1.8,10.71,14.34l2.48-2.95a2.6,2.6,0,0,0,0-3.34L8.75,2.74a2.66,2.66,0,0,0-2-.94Z" fill="#e06e2e"/>
+	<path d="M32,30.21H25.36a2.61,2.61,0,0,1-2-.92L16.5,21.1a.65.65,0,0,0-1,0L8.63,29.29a2.58,2.58,0,0,1-2,.92H0L12.07,15.83,14,13.57a2.67,2.67,0,0,1,4.08,0l1.89,2.26Z" fill="#233871"/>
+  </svg>
--- a/RobotApp.Client/wwwroot/images/logoLight.svg
+++ b/RobotApp.Client/wwwroot/images/logoLight.svg
@@ -0,0 +1,48 @@
+<svg
+  id="Layer_1"
+  data-name="Layer 1"
+  xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 0 370.84 59.64"
+>
+    <path
+      d="M66.68,0,44.62,26.28,39.43,20.1a5.45,5.45,0,0,1,0-7L48.75,2A5.53,5.53,0,0,1,53,0Z"
+      fill="#e06e2e"
+    />
+    <path
+      d="M.4,0,22.46,26.31l5.19-6.18a5.45,5.45,0,0,0,0-7L18.33,2a5.53,5.53,0,0,0-4.22-2Z"
+      fill="#e06e2e"
+    />
+    <path
+      d="M67.08,59.59H53.15A5.44,5.44,0,0,1,49,57.65L34.58,40.49a1.36,1.36,0,0,0-2.09,0L18.09,57.65a5.46,5.46,0,0,1-4.17,1.94H0L25.31,29.43l4-4.72a5.57,5.57,0,0,1,8.54,0l4,4.72Z"
+      fill="#ffffff"
+    />
+    <path
+      d="M98.34,24.3A12.87,12.87,0,0,1,104,42.84a12.29,12.29,0,0,1-5.61,4.56A21.47,21.47,0,0,1,89.74,49H81.17v7.93a2.72,2.72,0,0,1-2.72,2.73H74.13V22.72H89.74a21.64,21.64,0,0,1,8.6,1.58m-1.93,17a6.52,6.52,0,0,0,2.39-5.43,6.54,6.54,0,0,0-2.39-5.43q-2.39-1.91-7-1.9H81.17V43.18h8.25q4.6,0,7-1.9"
+      fill="#ffffff"
+    />
+    <path
+      d="M145.86,25.44V56.91a2.72,2.72,0,0,1-2.72,2.73h-4.33V43.81H119.18V59.64h-4.32a2.73,2.73,0,0,1-2.73-2.73V25.44a2.72,2.72,0,0,1,2.73-2.72h4.32V38h19.63V22.72h4.33a2.72,2.72,0,0,1,2.72,2.72"
+      fill="#ffffff"
+    />
+    <path
+      d="M183,56.58v3h-24.8a3.6,3.6,0,0,1-3.6-3.6V26.36a3.6,3.6,0,0,1,3.6-3.6h24.05v3a2.73,2.73,0,0,1-2.73,2.73H161.62v9.57h18.29V43.7H161.62V53.86h18.65A2.72,2.72,0,0,1,183,56.58"
+      fill="#ffffff"
+    />
+    <path
+      d="M222.73,22.76V59.59h-4.52a2.71,2.71,0,0,1-2.09-1l-20.06-24V59.59h-7V22.76h4.51a2.72,2.72,0,0,1,2.09,1l20.07,24V22.76Z"
+      fill="#ffffff"
+    />
+    <rect x="231.85" y="22.76" width="7.03" height="36.83" fill="#ffffff" />
+    <path
+      d="M261,44.18l-6,6v9.42h-7V22.76h7V41.65L273,23.57a2.71,2.71,0,0,1,1.93-.81h6.77L265.75,39.23l16.88,20.36h-7a2.72,2.72,0,0,1-2.06-.94Z"
+      fill="#ffffff"
+    />
+    <path
+      d="M315.59,51.07H296.65l-3,6.89a2.74,2.74,0,0,1-2.5,1.63h-5.47l16.08-34.74A3.6,3.6,0,0,1,305,22.76h2.32a3.61,3.61,0,0,1,3.27,2.08l16.13,34.75h-5.59A2.72,2.72,0,0,1,318.66,58Zm-2.33-5.37-7.14-16.1L299,45.7Z"
+      fill="#ffffff"
+    />
+    <path
+      d="M359.69,51.07H340.76l-3,6.89a2.71,2.71,0,0,1-2.49,1.63h-5.47l16.07-34.74a3.62,3.62,0,0,1,3.27-2.09h2.33a3.59,3.59,0,0,1,3.26,2.08l16.13,34.75h-5.59A2.7,2.7,0,0,1,362.77,58Zm-2.32-5.37-7.14-16.1-7.09,16.1Z"
+      fill="#ffffff"
+    />
+  </svg>
--- a/RobotApp.Client/wwwroot/js/app.js
+++ b/RobotApp.Client/wwwroot/js/app.js
@@ -0,0 +1 @@
+
--- a/RobotApp.Client/wwwroot/js/canvas.js
+++ b/RobotApp.Client/wwwroot/js/canvas.js
@@ -0,0 +1,107 @@
+window.getElementSize = (element) => {
+    return {
+        width: element.clientWidth,
+        height: element.clientHeight,
+    };
+}
+
+window.getElementBoundingRect = (element) => {
+    const rect = element.getBoundingClientRect();
+    return {
+        width: rect.width,
+        height: rect.height,
+        x: rect.x,
+        y: rect.y,
+        left: rect.left,
+        top: rect.top
+    };
+}
+
+window.setCanvasSize = (canvas, width, height) => {
+    canvas.width = width;
+    canvas.height = height;
+}
+
+window.imageCache = new Map();
+
+window.preloadImage = (imagePath) => {
+    return new Promise((resolve, reject) => {
+        if (window.imageCache.has(imagePath)) {
+            resolve(window.imageCache.get(imagePath));
+            return;
+        }
+
+        const img = new Image();
+        img.onload = () => {
+            window.imageCache.set(imagePath, img);
+            resolve(img);
+        };
+        img.onerror = () => {
+            reject(new Error(`Failed to load image: ${imagePath}`));
+        };
+        img.src = imagePath;
+    });
+};
+
+window.preloadImageFromUrl = (url, cacheKey) => {
+    return new Promise((resolve, reject) => {
+        if (window.imageCache.has(cacheKey)) {
+            resolve(window.imageCache.get(cacheKey));
+            return;
+        }
+
+        const img = new Image();
+        img.onload = () => {
+            window.imageCache.set(cacheKey, img);
+            resolve(img);
+        };
+        img.onerror = (error) => {
+            reject(new Error(`Failed to load image from URL: ${url}`));
+        };
+        img.src = url;
+    });
+};
+
+window.getImageDimensions = (cacheKey) => {
+    const img = window.imageCache.get(cacheKey);
+    if (!img) {
+        return { width: 0, height: 0 };
+    }
+    
+    return {
+        width: img.naturalWidth || img.width,
+        height: img.naturalHeight || img.height
+    };
+};
+
+window.drawImageOnCanvas = (canvas, imagePath, x, y, width, height) => {
+    const ctx = canvas.getContext('2d');
+    const img = window.imageCache.get(imagePath);
+    
+    if (!img) {
+        return false;
+    }
+
+    try {
+        ctx.drawImage(img, x, y, width, height);
+        return true;
+    } catch (error) {
+        return false;
+    }
+};
+
+window.drawCachedImageOnCanvas = (canvas, cacheKey, x, y, width, height) => {
+    const ctx = canvas.getContext('2d');
+    const img = window.imageCache.get(cacheKey);
+    
+    if (!img) {
+        return false;
+    }
+
+    try {
+        ctx.drawImage(img, x, y, width, height);
+        return true;
+    } catch (error) {
+        return false;
+    }
+};
--- a/RobotApp.Common.Shares/Dtos/RobotConfigDto.cs
+++ b/RobotApp.Common.Shares/Dtos/RobotConfigDto.cs
@@ -0,0 +1,47 @@
+using RobotApp.Common.Shares.Enums;
+using System.ComponentModel.DataAnnotations;
+
+namespace RobotApp.Common.Shares.Dtos;
+
+#nullable disable
+
+public record RobotConfigDto
+{
+    public Guid Id { get; set; }
+    public NavigationType NavigationType { get; set; }
+    [Range(0.1, 10, ErrorMessage = "Value must be from 0.1 to 10")]
+    public double RadiusWheel { get; set; }
+    [Range(0.1, 10, ErrorMessage = "Value must be from 0.1 to 10")]
+    public double Width { get; set; }
+    [Range(0.1, 10, ErrorMessage = "Value must be from 0.1 to 10")]
+    public double Length { get; set; }
+    [Range(0.1, 10, ErrorMessage = "Value must be from 0.1 to 10")]
+    public double Height { get; set; }
+    public DateTime CreatedAt { get; set; }
+    public DateTime UpdatedAt { get; set; }
+    public bool IsActive { get; set; }
+    [Required]
+    public string ConfigName { get; set; }
+    public string Description { get; set; }
+}
+
+public record UpdateRobotConfigDto
+{
+    public NavigationType NavigationType { get; set; }
+    public double RadiusWheel { get; set; }
+    public double Width { get; set; }
+    public double Length { get; set; }
+    public double Height { get; set; }
+    public string Description { get; set; }
+}
+
+public record CreateRobotConfigDto
+{
+    public string ConfigName { get; set; }
+    public string Description { get; set; }
+    public NavigationType NavigationType { get; set; }
+    public double RadiusWheel { get; set; }
+    public double Width { get; set; }
+    public double Length { get; set; }
+    public double Height { get; set; }
+}
--- a/RobotApp.Common.Shares/Dtos/RobotPlcConfigDto.cs
+++ b/RobotApp.Common.Shares/Dtos/RobotPlcConfigDto.cs
@@ -0,0 +1,39 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace RobotApp.Common.Shares.Dtos;
+
+#nullable disable
+
+public record RobotPlcConfigDto
+{
+    public Guid Id { get; set; }
+    [Required]
+    public string PLCAddress { get; set; }
+    [Range(1, 65535, ErrorMessage = "Value must be from 1 to 65535")]
+    public int PLCPort { get; set; }
+    [Range(1, 65535, ErrorMessage = "Value must be from 1 to 65535")]
+    public int PLCUnitId { get; set; }
+    public DateTime CreatedAt { get; set; }
+    public DateTime UpdatedAt { get; set; }
+    public bool IsActive { get; set; }
+    [Required]
+    public string ConfigName { get; set; }
+    public string Description { get; set; }
+}
+
+public record UpdateRobotPlcConfigDto
+{
+    public string Description { get; set; }
+    public string PLCAddress { get; set; }
+    public int PLCPort { get; set; }
+    public int PLCUnitId { get; set; }
+}
+
+public record CreateRobotPlcConfigDto
+{
+    public string ConfigName { get; set; }
+    public string Description { get; set; }
+    public string PLCAddress { get; set; }
+    public int PLCPort { get; set; }
+    public int PLCUnitId { get; set; }
+}
--- a/RobotApp.Common.Shares/Dtos/RobotSafetyConfigDto.cs
+++ b/RobotApp.Common.Shares/Dtos/RobotSafetyConfigDto.cs
@@ -0,0 +1,54 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace RobotApp.Common.Shares.Dtos;
+
+#nullable disable
+
+public record RobotSafetyConfigDto
+{
+    public Guid Id { get; set; }
+    public double SafetySpeedVerySlow { get; set; }
+    [Range(0, 10, ErrorMessage = "Value must be from 0 to 10")]
+    public double SafetySpeedSlow { get; set; }
+    [Range(0, 10, ErrorMessage = "Value must be from 0 to 10")]
+    public double SafetySpeedNormal { get; set; }
+    [Range(0, 10, ErrorMessage = "Value must be from 0 to 10")]
+    public double SafetySpeedMedium { get; set; }
+    [Range(0, 10, ErrorMessage = "Value must be from 0 to 10")]
+    public double SafetySpeedOptimal { get; set; }
+    [Range(0, 10, ErrorMessage = "Value must be from 0 to 10")]
+    public double SafetySpeedFast { get; set; }
+    [Range(0, 10, ErrorMessage = "Value must be from 0 to 10")]
+    public double SafetySpeedVeryFast { get; set; }
+    public DateTime CreatedAt { get; set; }
+    public DateTime UpdatedAt { get; set; }
+    public bool IsActive { get; set; }
+    [Required]
+    public string ConfigName { get; set; }
+    public string Description { get; set; }
+}
+
+public record UpdateRobotSafetyConfigDto
+{
+    public double SafetySpeedVerySlow { get; set; }
+    public double SafetySpeedSlow { get; set; }
+    public double SafetySpeedNormal { get; set; }
+    public double SafetySpeedMedium { get; set; }
+    public double SafetySpeedOptimal { get; set; }
+    public double SafetySpeedFast { get; set; }
+    public double SafetySpeedVeryFast { get; set; }
+    public string Description { get; set; }
+}
+
+public record CreateRobotSafetyConfigDto
+{
+    public double SafetySpeedVerySlow { get; set; }
+    public double SafetySpeedSlow { get; set; }
+    public double SafetySpeedNormal { get; set; }
+    public double SafetySpeedMedium { get; set; }
+    public double SafetySpeedOptimal { get; set; }
+    public double SafetySpeedFast { get; set; }
+    public double SafetySpeedVeryFast { get; set; }
+    public string ConfigName { get; set; }
+    public string Description { get; set; }
+}
--- a/RobotApp.Common.Shares/Dtos/RobotSimulationConfigDto.cs
+++ b/RobotApp.Common.Shares/Dtos/RobotSimulationConfigDto.cs
@@ -0,0 +1,46 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace RobotApp.Common.Shares.Dtos;
+
+#nullable disable
+
+public record RobotSimulationConfigDto
+{
+    public Guid Id { get; set; }
+    public bool EnableSimulation { get; set; }
+    [Range(0.1, 10, ErrorMessage = "Value must be from 0.1 to 10")]
+    public double SimulationMaxVelocity { get; set; }
+    [Range(0.1, 10, ErrorMessage = "Value must be from 0.1 to 10")]
+    public double SimulationMaxAngularVelocity { get; set; }
+    [Range(0.1, 10, ErrorMessage = "Value must be from 0.1 to 10")]
+    public double SimulationAcceleration { get; set; }
+    [Range(0.1, 10, ErrorMessage = "Value must be from 0.1 to 10")]
+    public double SimulationDeceleration { get; set; }
+    public DateTime CreatedAt { get; set; }
+    public DateTime UpdatedAt { get; set; }
+    public bool IsActive { get; set; }
+    [Required]
+    public string ConfigName { get; set; }
+    public string Description { get; set; }
+}
+
+public record UpdateRobotSimulationConfigDto
+{
+    public bool EnableSimulation { get; set; }
+    public double SimulationMaxVelocity { get; set; }
+    public double SimulationMaxAngularVelocity { get; set; }
+    public double SimulationAcceleration { get; set; }
+    public double SimulationDeceleration { get; set; }
+    public string Description { get; set; }
+}
+
+public record CreateRobotSimulationConfigDto
+{
+    public bool EnableSimulation { get; set; }
+    public double SimulationMaxVelocity { get; set; }
+    public double SimulationMaxAngularVelocity { get; set; }
+    public double SimulationAcceleration { get; set; }
+    public double SimulationDeceleration { get; set; }
+    public string ConfigName { get; set; }
+    public string Description { get; set; }
+}
--- a/RobotApp.Common.Shares/Dtos/RobotVDA5050ConfigDto.cs
+++ b/RobotApp.Common.Shares/Dtos/RobotVDA5050ConfigDto.cs
@@ -0,0 +1,74 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace RobotApp.Common.Shares.Dtos;
+
+#nullable disable
+
+public record RobotVDA5050ConfigDto
+{
+    public Guid Id { get; set; }
+    [Required]
+    public string SerialNumber { get; set; }
+    [Required]
+    public string VDA5050HostServer { get; set; }
+    [Required]
+    [Range(1, 65535, ErrorMessage = "Value must be from 1 to 65535")]
+    public int VDA5050Port { get; set; }
+    public string VDA5050UserName { get; set; }
+    public string VDA5050Password { get; set; }
+    public string VDA5050Manufacturer { get; set; }
+    public string VDA5050Version { get; set; }
+    public string VDA5050TopicPrefix { get; set; }
+    [Range(1, 65535, ErrorMessage = "Value must be from 1 to 65535")]
+    public int VDA5050PublishRepeat { get; set; }
+    public bool VDA5050EnablePassword { get; set; }
+    public bool VDA5050EnableTls { get; set; }
+    public string VDA5050CA { get; set; }
+    public string VDA5050Cer { get; set; }
+    public string VDA5050Key { get; set; }
+    public DateTime CreatedAt { get; set; }
+    public DateTime UpdatedAt { get; set; }
+    public bool IsActive { get; set; }
+    [Required]
+    public string ConfigName { get; set; }
+    public string Description { get; set; }
+}
+
+public record UpdateRobotVDA5050ConfigDto
+{
+    public string SerialNumber { get; set; }
+    public string VDA5050HostServer { get; set; }
+    public int VDA5050Port { get; set; }
+    public string VDA5050UserName { get; set; }
+    public string VDA5050Password { get; set; }
+    public string VDA5050Manufacturer { get; set; }
+    public string VDA5050Version { get; set; }
+    public string VDA5050TopicPrefix { get; set; }
+    public int VDA5050PublishRepeat { get; set; }
+    public bool VDA5050EnablePassword { get; set; }
+    public bool VDA5050EnableTls { get; set; }
+    public string VDA5050CA { get; set; }
+    public string VDA5050Cer { get; set; }
+    public string VDA5050Key { get; set; }
+    public string Description { get; set; }
+}
+
+public record CreateRobotVDA5050ConfigDto
+{
+    public string SerialNumber { get; set; }
+    public string VDA5050HostServer { get; set; }
+    public int VDA5050Port { get; set; }
+    public string VDA5050UserName { get; set; }
+    public string VDA5050Password { get; set; }
+    public string VDA5050Manufacturer { get; set; }
+    public string VDA5050Version { get; set; }
+    public string VDA5050TopicPrefix { get; set; }
+    public int VDA5050PublishRepeat { get; set; }
+    public bool VDA5050EnablePassword { get; set; }
+    public bool VDA5050EnableTls { get; set; }
+    public string VDA5050CA { get; set; }
+    public string VDA5050Cer { get; set; }
+    public string VDA5050Key { get; set; }
+    public string ConfigName { get; set; }
+    public string Description { get; set; }
+}
--- a/RobotApp.Common.Shares/Enums/RobotConfigType.cs
+++ b/RobotApp.Common.Shares/Enums/RobotConfigType.cs
@@ -0,0 +1,10 @@
+namespace RobotApp.Common.Shares.Enums;
+
+public enum RobotConfigType
+{
+    VDA5050,
+    Core,
+    Safety ,
+    Simulation,
+    PLC,
+}
--- a/RobotApp.Common.Shares/Enums/RobotDirection.cs
+++ b/RobotApp.Common.Shares/Enums/RobotDirection.cs
@@ -0,0 +1,7 @@
+namespace RobotApp.Common.Shares.Enums;
+
+public enum RobotDirection
+{
+    FORWARD,
+    BACKWARD,
+}
--- a/RobotApp.Common.Shares/Enums/StateType.cs
+++ b/RobotApp.Common.Shares/Enums/StateType.cs
@@ -0,0 +1,94 @@
+namespace RobotApp.Common.Shares.Enums;
+
+public enum RootStateType
+{
+    System,
+    Auto,
+    Manual,
+    Service,
+    Stop,
+    Fault,
+}
+
+public enum SystemStateType
+{
+    Initializing,
+    Standby,
+    Shutting_Down,
+}
+
+public enum AutoStateType
+{
+    Idle,
+    Executing,
+    Paused,
+    Holding,
+    Canceling,
+    Recovering,
+    Remote_Override,
+}
+
+public enum ManualStateType
+{
+    Idle,
+    Active,
+}
+
+public enum ServiceStateType
+{
+    Idle,
+    Active,
+}
+
+public enum StopStateType
+{
+    EMC,
+    Bumber,
+    Protective,
+    Manual,
+}
+
+public enum FaultStateType
+{
+    Navigation,
+    Localization,
+    Shielf,
+    Battery,
+    Driver,
+    Peripherals,
+    Safety,
+    Communication,
+}
+
+public enum ExecutingStateType
+{
+    Planning,
+    Moving,
+    ACT,
+}
+
+public enum ACTStateType
+{
+    Docking,
+    Docked,
+    Charging,
+    Undocking,
+    Loading,
+    Unloading,
+    TechAction,
+}
+
+public enum MoveStateType
+{
+    Navigation,
+    Avoidance,
+    Approach,
+    Tracking,
+    Repositioning,
+}
+
+public enum PlanStateType
+{
+    Task,
+    Path,
+}
--- a/RobotApp.Common.Shares/Enums/TrajectoryDegree.cs
+++ b/RobotApp.Common.Shares/Enums/TrajectoryDegree.cs
@@ -0,0 +1,8 @@
+namespace RobotApp.Common.Shares.Enums;
+
+public enum TrajectoryDegree
+{
+    One,
+    Two,
+    Three,
+}
--- a/RobotApp.Common.Shares/MathExtensions.cs
+++ b/RobotApp.Common.Shares/MathExtensions.cs
@@ -0,0 +1,110 @@
+using RobotApp.Common.Shares.Model;
+
+namespace RobotApp.Common.Shares;
+
+public static class MathExtensions
+{
+    public static double NormalizeAngle(double angle)
+    {
+        angle = angle % 360;
+        if (angle > 180)  angle -= 360;
+        else if (angle < -180) angle += 360;
+        return angle;
+    }
+
+    public static (double x, double y) CurveDegreeTwo(double t, double x1, double y1, double controlPointX, double controlPointY, double x2, double y2)
+    {
+        var x = (1 - t) * (1 - t) * x1 + 2 * t * (1 - t) * controlPointX + t * t * x2;
+        var y = (1 - t) * (1 - t) * y1 + 2 * t * (1 - t) * controlPointY + t * t * y2;
+        return (x, y);
+    }
+
+    public static (double x, double y) CurveDegreeThree(double t, double x1, double y1, double controlPoint1X, double controlPoint1Y, double controlPoint2X, double controlPoint2Y, double x2, double y2)
+    {
+        var x = Math.Pow(1 - t, 3) * x1 + 3 * Math.Pow(1 - t, 2) * t * controlPoint1X + 3 * Math.Pow(t, 2) * (1 - t) * controlPoint2X + Math.Pow(t, 3) * x2; ;
+        var y = Math.Pow(1 - t, 3) * y1 + 3 * Math.Pow(1 - t, 2) * t * controlPoint1Y + 3 * Math.Pow(t, 2) * (1 - t) * controlPoint2Y + Math.Pow(t, 3) * y2;
+        return (x, y);
+    }
+
+
+    public static (double x, double y) Curve(double t, EdgeCalculatorModel edge)
+    {
+        if (edge.TrajectoryDegree == Enums.TrajectoryDegree.One)
+        {
+            return (edge.X1 + t * (edge.X2 - edge.X1), edge.Y1 + t * (edge.Y2 - edge.Y1));
+        }
+        else if (edge.TrajectoryDegree == Enums.TrajectoryDegree.Two)
+        {
+            return CurveDegreeTwo(t, edge.X1, edge.Y1, edge.ControlPoint1X, edge.ControlPoint1Y, edge.X2, edge.Y2);
+        }
+        else
+        {
+            return CurveDegreeThree(t, edge.X1, edge.Y1, edge.ControlPoint1X, edge.ControlPoint1Y, edge.ControlPoint2X, edge.ControlPoint2Y, edge.X2, edge.Y2);
+        }
+    }
+
+    public static (double x, double y) Curve(this EdgeCalculatorModel edge, double t)
+    {
+        return Curve(t, edge);
+    }
+
+    public static double GetEdgeLength(this EdgeCalculatorModel edge)
+    {
+        double distance = 0;
+        if (edge.TrajectoryDegree == Enums.TrajectoryDegree.One)
+        {
+            distance = Math.Sqrt(Math.Pow(edge.X1 - edge.X2, 2) + Math.Pow(edge.Y1 - edge.Y2, 2));
+        }
+        else if (edge.TrajectoryDegree == Enums.TrajectoryDegree.Two)
+        {
+            var length = Math.Sqrt(Math.Pow(edge.X1 - edge.X2, 2) + Math.Pow(edge.Y1 - edge.Y2, 2));
+            if (length == 0) return 0;
+            double step = 0.1 / length;
+
+            for (double t = step; t <= 1.001; t += step)
+            {
+                (double x1, double y1) = CurveDegreeTwo(t - step, edge.X1, edge.Y1, edge.ControlPoint1X, edge.ControlPoint1Y, edge.X2, edge.Y2);
+                (double x2, double y2) = CurveDegreeTwo(t, edge.X1, edge.Y1, edge.ControlPoint1X, edge.ControlPoint1Y, edge.X2, edge.Y2);
+                distance += Math.Sqrt(Math.Pow(x1 - x2, 2) + Math.Pow(y1 - y2, 2));
+            }
+        }
+        else
+        {
+            var length = Math.Sqrt(Math.Pow(edge.X1 - edge.X2, 2) + Math.Pow(edge.Y1 - edge.Y2, 2));
+            if (length == 0) return 0;
+            double step = 0.1 / length;
+            for (double t = step; t <= 1.001; t += step)
+            {
+                var sTime = t - step;
+                (var sx, var sy) = CurveDegreeThree(1 - sTime, edge.X1, edge.Y1, edge.ControlPoint1X, edge.ControlPoint1Y, edge.ControlPoint2X, edge.ControlPoint2Y, edge.X2, edge.Y2);
+                sTime = t;
+                (var ex, var ey) = CurveDegreeThree(1 - sTime, edge.X1, edge.Y1, edge.ControlPoint1X, edge.ControlPoint1Y, edge.ControlPoint2X, edge.ControlPoint2Y, edge.X2, edge.Y2);
+
+                distance += Math.Sqrt(Math.Pow(sx - ex, 2) + Math.Pow(sy - ey, 2));
+            }
+        }
+        return distance;
+    }
+
+    public static double GetVectorAngle(double originNodeX, double originNodeY, double vector1X, double vector1Y, double vector2X, double vector2Y)
+    {
+        double BA_x = vector1X - originNodeX;
+        double BA_y = vector1Y - originNodeY;
+        double BC_x = vector2X - originNodeX;
+        double BC_y = vector2Y - originNodeY;
+        // Tính độ dài của các vector AB và BC
+        double lengthAB = Math.Sqrt(BA_x * BA_x + BA_y * BA_y);
+        double lengthBC = Math.Sqrt(BC_x * BC_x + BC_y * BC_y);
+        // Tính tích vô hướng của AB và BC
+        double dotProduct = BA_x * BC_x + BA_y * BC_y;
+        if (lengthAB * lengthBC == 0) return 0;
+        if (dotProduct / (lengthAB * lengthBC) > 1) return 0;
+        if (dotProduct / (lengthAB * lengthBC) < -1) return 180;
+        return Math.Acos(dotProduct / (lengthAB * lengthBC)) * (180.0 / Math.PI);
+    }
+
+    public static double Distance(double x1, double y1, double x2, double y2)
+    {
+        return Math.Sqrt(Math.Pow(x2 - x1, 2) + Math.Pow(y2 - y1, 2));
+    }
+}
--- a/RobotApp.Common.Shares/Model/EdgeCalculatorModel.cs
+++ b/RobotApp.Common.Shares/Model/EdgeCalculatorModel.cs
@@ -0,0 +1,16 @@
+using RobotApp.Common.Shares.Enums;
+
+namespace RobotApp.Common.Shares.Model;
+
+public class EdgeCalculatorModel
+{
+    public double X1 { get; set; }
+    public double Y1 { get; set; }
+    public double X2 { get; set; }
+    public double Y2 { get; set; }
+    public TrajectoryDegree TrajectoryDegree { get; set; }
+    public double ControlPoint1X { get; set; }
+    public double ControlPoint1Y { get; set; }
+    public double ControlPoint2X { get; set; }
+    public double ControlPoint2Y { get; set; }
+}
--- a/RobotApp.VDA5050/Factsheet/AgvActions.cs
+++ b/RobotApp.VDA5050/Factsheet/AgvActions.cs
@@ -9,7 +9,8 @@ public enum ActionScopes
    NODE,
    EDGE,
 }
-public class AgvActions
+
+public class AgvAction
 {
    [Required]
    public string ActionType { get; set; } = string.Empty;
--- a/RobotApp.VDA5050/Factsheet/ProtocolFeatures.cs
+++ b/RobotApp.VDA5050/Factsheet/ProtocolFeatures.cs
@@ -8,5 +8,5 @@ public class ProtocolFeatures
    [Required]
    public OptionalParameters[] OptionalParameters { get; set; } = [];
    [Required]
-    public AgvActions[] AgvActions { get; set; } = [];
+    public AgvAction[] AgvActions { get; set; } = [];
 }
--- a/RobotApp.VDA5050/State/ActionState.cs
+++ b/RobotApp.VDA5050/State/ActionState.cs
@@ -2,8 +2,6 @@

 namespace RobotApp.VDA5050.State;

-#nullable disable
-
 public enum ActionStatus
 {
    WAITING,
@@ -15,11 +13,11 @@ public enum ActionStatus
 }
 public class ActionState
 {
-    public string ActionType { get; set; }
+    public string ActionType { get; set; } = string.Empty;
    [Required]
-    public string ActionId { get; set; }
-    public string ActionDescription { get; set; }
+    public string ActionId { get; set; } = string.Empty;
+    public string ActionDescription { get; set; } = string.Empty;
    [Required]
-    public string ActionStatus { get; set; }
-    public string ResultDescription { get; set; }
+    public string ActionStatus { get; set; } = string.Empty;
+    public string ResultDescription { get; set; } = string.Empty;
 }
--- a/RobotApp.VDA5050/State/EdgeState.cs
+++ b/RobotApp.VDA5050/State/EdgeState.cs
@@ -3,17 +3,15 @@ using System.ComponentModel.DataAnnotations;

 namespace RobotApp.VDA5050.State;

-#nullable disable
-
 public class EdgeState
 {

    [Required]
-    public string EdgeId { get; set; }
+    public string EdgeId { get; set; } = string.Empty;
    [Required]
    public int SequenceId { get; set; }
-    public string EdgeDescription { get; set; }
+    public string EdgeDescription { get; set; } = string.Empty;
    [Required]
    public bool Released { get; set; }
-    public Trajectory Trajectory { get; set; }
+    public Trajectory Trajectory { get; set; } = new();
 }
--- a/RobotApp.VDA5050/State/Error.cs
+++ b/RobotApp.VDA5050/State/Error.cs
@@ -2,28 +2,34 @@

 namespace RobotApp.VDA5050.State;

-#nullable disable
-
 public enum ErrorLevel
 {
    NONE,
    WARNING,
    FATAL
 }
+
 public class ErrorReferences
 {
    [Required]
-    public string ReferenceKey { get; set; }
+    public string ReferenceKey { get; set; } = string.Empty;
    [Required]
-    public string ReferenceValue { get; set; }
+    public string ReferenceValue { get; set; } = string.Empty;
 }
+
+public enum ErrorType
+{
+    INITIALIZE_ORDER,
+    READ_PERIPHERAL_FAILURE,
+}
+
 public class Error
 {
    [Required]
-    public string ErrorType { get; set; }
-    public ErrorReferences[] ErrorReferences { get; set; }
-    public string ErrorDescription { get; set; }
-    public string ErrorHint { get; set; }
+    public string ErrorType { get; set; } = string.Empty;
+    public ErrorReferences[] ErrorReferences { get; set; } = [];
+    public string ErrorDescription { get; set; } = string.Empty;
+    public string ErrorHint { get; set; } = string.Empty;
    [Required]
-    public string ErrorLevel { get; set; }
+    public string ErrorLevel { get; set; } = string.Empty;
 }
--- a/RobotApp.VDA5050/State/Information.cs
+++ b/RobotApp.VDA5050/State/Information.cs
@@ -2,7 +2,6 @@

 namespace RobotApp.VDA5050.State;

-#nullable disable

 public enum InfoLevel
 {
@@ -12,16 +11,16 @@ public enum InfoLevel
 public class InfomationReferences
 {
    [Required]
-    public string ReferenceKey { get; set; }
+    public string ReferenceKey { get; set; } = string.Empty;
    [Required]
-    public string ReferenceValue { get; set; }
+    public string ReferenceValue { get; set; } = string.Empty;
 }
 public class Information
 {
    [Required]
-    public string InfoType { get; set; }
-    public InfomationReferences[] InfoReferences { get; set; }
-    public string InfoDescription { get; set; }
+    public string InfoType { get; set; } = string.Empty;
+    public InfomationReferences[] InfoReferences { get; set; } = [];
+    public string InfoDescription { get; set; } = string.Empty;
    [Required]
-    public string InfoLevel { get; set; }
+    public string InfoLevel { get; set; } = string.Empty;
 }
--- a/RobotApp.VDA5050/State/Load.cs
+++ b/RobotApp.VDA5050/State/Load.cs
@@ -2,15 +2,13 @@

 namespace RobotApp.VDA5050.State;

-#nullable disable
-
 public class Load
 {
-    public string LoadId { get; set; }
-    public string LoadType { get; set; }
-    public string LoadPosition { get; set; }
-    public BoundingBoxReference BoundingBoxReference { get; set; }
-    public LoadDimensions LoadDimensions { get; set; }
+    public string LoadId { get; set; } = string.Empty;
+    public string LoadType { get; set; } = string.Empty;
+    public string LoadPosition { get; set; } = string.Empty;
+    public BoundingBoxReference BoundingBoxReference { get; set; } = new();
+    public LoadDimensions LoadDimensions { get; set; } = new();
    public double Weight { get; set; } 

 }
--- a/RobotApp.VDA5050/State/NodeState.cs
+++ b/RobotApp.VDA5050/State/NodeState.cs
@@ -1,20 +1,18 @@
-using RobotApp.VDA5050.Order;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;

 namespace RobotApp.VDA5050.State;

-#nullable disable

 public class NodeState
 {
    [Required]
-    public string NodeId { get; set; }
+    public string NodeId { get; set; } = string.Empty;
    [Required]
    public int SequenceId { get; set; }
-    public string NodeDescription { get; set; }
+    public string NodeDescription { get; set; } = string.Empty;
    [Required]
    public bool Released { get; set; }
-    public NodePosition NodePosition { get; set; }
+    public NodePosition NodePosition { get; set; } = new();
 }

 public class NodePosition
@@ -25,6 +23,6 @@ public class NodePosition
    public double Y { get; set; }
    public double Theta { get; set; }
    [Required]
-    public string MapId { get; set; } = "";
+    public string MapId { get; set; } = string.Empty;

 }
--- a/RobotApp.VDA5050/State/StateMsg.cs
+++ b/RobotApp.VDA5050/State/StateMsg.cs
@@ -3,8 +3,6 @@ using System.ComponentModel.DataAnnotations;

 namespace RobotApp.VDA5050.State;

-#nullable disable
-
 public enum OperatingMode
 {
    AUTOMATIC,
@@ -17,22 +15,21 @@ public class StateMsg
 {
    [Required]
    public uint HeaderId { get; set; }
+    public string Timestamp { get; set; } = DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
    [Required]
-    public string Timestamp { get; set; }
+    public string Version { get; set; } = "1.0.0";
    [Required]
-    public string Version { get; set; }
+    public string Manufacturer { get; set; } = "PhenikaaX";
    [Required]
-    public string Manufacturer { get; set; }
-    [Required]
-    public string SerialNumber { get; set; }
+    public string SerialNumber { get; set; } = string.Empty;
    public Map[] Maps { get; set; } = [];
    [Required]
-    public string OrderId { get; set; }
+    public string OrderId { get; set; } = string.Empty;
    [Required]
    public int OrderUpdateId { get; set; }
-    public string ZoneSetId { get; set; }
+    public string ZoneSetId { get; set; } = string.Empty;
    [Required]
-    public string LastNodeId { get; set; }
+    public string LastNodeId { get; set; } = string.Empty;
    [Required]
    public int LastNodeSequenceId { get; set; }
    [Required]
@@ -41,7 +38,7 @@ public class StateMsg
    public bool NewBaseRequest { get; set; }
    public double DistanceSinceLastNode { get; set; }
    [Required]
-    public string OperatingMode { get; set; }
+    public string OperatingMode { get; set; } = string.Empty;
    [Required]
    public NodeState[] NodeStates { get; set; } = [];
    [Required]
--- a/RobotApp.VDA5050/Type/ActionType.cs
+++ b/RobotApp.VDA5050/Type/ActionType.cs
@@ -2,16 +2,32 @@

 public enum ActionType
 {
-    START_PAUSE,
-    STOP_PAUSE,
-    START_CHARGING,
-    STOP_CHARGING,
-    INITIALIZATION_POSITION,             
-    PICK,                   
-    DROP,               
-    CANCEL_ORDER,       
-    ROTATE,
-    REQUEST_FACTSHEET,
-    REQUEST_VISUALIZATION,
-    REQUEST_STATE,
+    startPause,
+    stopPause,
+    startCharging,
+    stopCharging,
+    initPosition,
+    stateRequest,
+    factsheetRequest,
+
+    //logReport,
+    pick,
+    drop,
+    //detectObject,
+    //finePositioning,
+    //waitForTrigger,
+
+    cancelOrder,
+    //liftUp,
+    //liftDown,
+    //liftRotate,
+    //rotate,
+    //rotateKeepLift,
+    //mutedBaseOn,
+    //mutedBaseOff,
+    //mutedLoadOn,
+    //mutedLoadOff,
+    //dockTo,
+    //moveStraightToCoor,
+    //moveStraightWithDistance,
 }
--- a/RobotApp.VDA5050/Type/InformationType.cs
+++ b/RobotApp.VDA5050/Type/InformationType.cs
@@ -0,0 +1,12 @@
+namespace RobotApp.VDA5050.Type;
+
+public enum InformationType
+{
+    robot_general
+}
+
+
+public enum InformationReferencesKey
+{
+    robot_state,
+}
--- a/RobotApp.VDA5050/VDA5050Setting.cs
+++ b/RobotApp.VDA5050/VDA5050Setting.cs
@@ -1,5 +1,6 @@
 namespace RobotApp.VDA5050;

+
 public class VDA5050Setting
 {
    public string HostServer { get; set; } = string.Empty;
@@ -7,6 +8,12 @@ public class VDA5050Setting
    public string UserName { get; set; } = "robotics";
    public string Password { get; set; } = "robotics";
    public string Manufacturer { get; set; } = "PhenikaaX";
-    public string Version { get; set; } = "0.0.1";
+    public string Version { get; set; } = "2.1.0";
    public int PublishRepeat { get; set; } = 2;
+    public bool EnablePassword { get; set; } = false;
+    public bool EnableTls { get; set; } = false;
+    public string? CAFile { get; set; }
+    public string? CerFile { get; set; }
+    public string? KeyFile { get; set; }
+    public string? TopicPrefix { get; set; }
 }
--- a/RobotApp.VDA5050/Visualization/AgvPosition.cs
+++ b/RobotApp.VDA5050/Visualization/AgvPosition.cs
@@ -2,8 +2,6 @@

 namespace RobotApp.VDA5050.Visualization;

-#nullable disable
-
 public class AgvPosition
 {
    [Required]
@@ -11,7 +9,7 @@ public class AgvPosition
    [Required]
    public double Y { get; set; }
    [Required]
-    public string MapId { get; set; }
+    public string MapId { get; set; } = string.Empty;
    [Required]
    public double Theta { get; set; }
    [Required]
--- a/RobotApp.VDA5050/Visualization/Visualizationmsg.cs
+++ b/RobotApp.VDA5050/Visualization/Visualizationmsg.cs
@@ -1,16 +1,16 @@
-namespace RobotApp.VDA5050.Visualization;
+using System.ComponentModel.DataAnnotations;

-#nullable disable
+namespace RobotApp.VDA5050.Visualization;

 public class VisualizationMsg
 {
    public uint HeaderId { get; set; }
-    public string Timestamp { get; set; }
-    public string Version { get; set; }
-    public string Manufacturer { get; set; }
-    public string SerialNumber { get; set; }
-    public string MapId { get; set; }
-    public string MapDescription { get; set; }
+    public string Timestamp { get; set; } = DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
+    public string Version { get; set; } = "1.0.0";
+    public string Manufacturer { get; set; } = "PhenikaaX";
+    public string SerialNumber { get; set; } = string.Empty;
+    public string MapId { get; set; } = string.Empty;
+    public string MapDescription { get; set; } = string.Empty;
    public AgvPosition AgvPosition { get; set; } = new();
    public Velocity Velocity { get; set; } = new();
 }
--- a/RobotApp.sln
+++ b/RobotApp.sln
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 18
-VisualStudioVersion = 18.0.11018.127 d18.0
+# Visual Studio Version 17
+VisualStudioVersion = 17.14.36511.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RobotApp", "RobotApp\RobotApp.csproj", "{BF0BB137-2EF9-4E1B-944E-9BF41C5284F7}"
 EndProject
--- a/RobotApp/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
+++ b/RobotApp/Components/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs
@@ -1,14 +1,7 @@
-using System.Security.Claims;
-using System.Text.Json;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Primitives;
-using RobotApp.Components.Account.Pages;
-using RobotApp.Components.Account.Pages.Manage;
 using RobotApp.Data;
+using System.Security.Claims;

 namespace Microsoft.AspNetCore.Routing
 {
@@ -21,92 +14,15 @@ namespace Microsoft.AspNetCore.Routing

            var accountGroup = endpoints.MapGroup("/Account");

-            accountGroup.MapPost("/PerformExternalLogin", (
-                HttpContext context,
-                [FromServices] SignInManager<ApplicationUser> signInManager,
-                [FromForm] string provider,
-                [FromForm] string returnUrl) =>
-            {
-                IEnumerable<KeyValuePair<string, StringValues>> query = [
-                    new("ReturnUrl", returnUrl),
-                    new("Action", ExternalLogin.LoginCallbackAction)];
-
-                var redirectUrl = UriHelper.BuildRelative(
-                    context.Request.PathBase,
-                    "/Account/ExternalLogin",
-                    QueryString.Create(query));
-
-                var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
-                return TypedResults.Challenge(properties, [provider]);
-            });
-
            accountGroup.MapPost("/Logout", async (
                ClaimsPrincipal user,
-                [FromServices] SignInManager<ApplicationUser> signInManager,
+                SignInManager<ApplicationUser> signInManager,
                [FromForm] string returnUrl) =>
            {
                await signInManager.SignOutAsync();
                return TypedResults.LocalRedirect($"~/{returnUrl}");
            });

-            var manageGroup = accountGroup.MapGroup("/Manage").RequireAuthorization();
-
-            manageGroup.MapPost("/LinkExternalLogin", async (
-                HttpContext context,
-                [FromServices] SignInManager<ApplicationUser> signInManager,
-                [FromForm] string provider) =>
-            {
-                // Clear the existing external cookie to ensure a clean login process
-                await context.SignOutAsync(IdentityConstants.ExternalScheme);
-
-                var redirectUrl = UriHelper.BuildRelative(
-                    context.Request.PathBase,
-                    "/Account/Manage/ExternalLogins",
-                    QueryString.Create("Action", ExternalLogins.LinkLoginCallbackAction));
-
-                var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl, signInManager.UserManager.GetUserId(context.User));
-                return TypedResults.Challenge(properties, [provider]);
-            });
-
-            var loggerFactory = endpoints.ServiceProvider.GetRequiredService<ILoggerFactory>();
-            var downloadLogger = loggerFactory.CreateLogger("DownloadPersonalData");
-
-            manageGroup.MapPost("/DownloadPersonalData", async (
-                HttpContext context,
-                [FromServices] UserManager<ApplicationUser> userManager,
-                [FromServices] AuthenticationStateProvider authenticationStateProvider) =>
-            {
-                var user = await userManager.GetUserAsync(context.User);
-                if (user is null)
-                {
-                    return Results.NotFound($"Unable to load user with ID '{userManager.GetUserId(context.User)}'.");
-                }
-
-                var userId = await userManager.GetUserIdAsync(user);
-                downloadLogger.LogInformation("User with ID '{UserId}' asked for their personal data.", userId);
-
-                // Only include personal data for download
-                var personalData = new Dictionary<string, string>();
-                var personalDataProps = typeof(ApplicationUser).GetProperties().Where(
-                    prop => Attribute.IsDefined(prop, typeof(PersonalDataAttribute)));
-                foreach (var p in personalDataProps)
-                {
-                    personalData.Add(p.Name, p.GetValue(user)?.ToString() ?? "null");
-                }
-
-                var logins = await userManager.GetLoginsAsync(user);
-                foreach (var l in logins)
-                {
-                    personalData.Add($"{l.LoginProvider} external login provider key", l.ProviderKey);
-                }
-
-                personalData.Add("Authenticator Key", (await userManager.GetAuthenticatorKeyAsync(user))!);
-                var fileBytes = JsonSerializer.SerializeToUtf8Bytes(personalData);
-
-                context.Response.Headers.TryAdd("Content-Disposition", "attachment; filename=PersonalData.json");
-                return TypedResults.File(fileBytes, contentType: "application/json", fileDownloadName: "PersonalData.json");
-            });
-
            return accountGroup;
        }
    }
--- a/RobotApp/Components/Account/Pages/ConfirmEmail.razor
+++ b/RobotApp/Components/Account/Pages/ConfirmEmail.razor
@@ -1,48 +0,0 @@
-@page "/Account/ConfirmEmail"
-
-@using System.Text
-@using Microsoft.AspNetCore.Identity
-@using Microsoft.AspNetCore.WebUtilities
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject IdentityRedirectManager RedirectManager
-
-<PageTitle>Confirm email</PageTitle>
-
-<h1>Confirm email</h1>
-<StatusMessage Message="@statusMessage" />
-
-@code {
-    private string? statusMessage;
-
-    [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
-
-    [SupplyParameterFromQuery]
-    private string? UserId { get; set; }
-
-    [SupplyParameterFromQuery]
-    private string? Code { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        if (UserId is null || Code is null)
-        {
-            RedirectManager.RedirectTo("");
-        }
-
-        var user = await UserManager.FindByIdAsync(UserId);
-        if (user is null)
-        {
-            HttpContext.Response.StatusCode = StatusCodes.Status404NotFound;
-            statusMessage = $"Error loading user with ID {UserId}";
-        }
-        else
-        {
-            var code = Encoding.UTF8.GetString(WebEncoders.Base64UrlDecode(Code));
-            var result = await UserManager.ConfirmEmailAsync(user, code);
-            statusMessage = result.Succeeded ? "Thank you for confirming your email." : "Error confirming your email.";
-        }
-    }
-}
--- a/RobotApp/Components/Account/Pages/ConfirmEmailChange.razor
+++ b/RobotApp/Components/Account/Pages/ConfirmEmailChange.razor
@@ -1,68 +0,0 @@
-@page "/Account/ConfirmEmailChange"
-
-@using System.Text
-@using Microsoft.AspNetCore.Identity
-@using Microsoft.AspNetCore.WebUtilities
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject SignInManager<ApplicationUser> SignInManager
-@inject IdentityRedirectManager RedirectManager
-
-<PageTitle>Confirm email change</PageTitle>
-
-<h1>Confirm email change</h1>
-
-<StatusMessage Message="@message" />
-
-@code {
-    private string? message;
-
-    [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
-
-    [SupplyParameterFromQuery]
-    private string? UserId { get; set; }
-
-    [SupplyParameterFromQuery]
-    private string? Email { get; set; }
-
-    [SupplyParameterFromQuery]
-    private string? Code { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        if (UserId is null || Email is null || Code is null)
-        {
-            RedirectManager.RedirectToWithStatus(
-                "Account/Login", "Error: Invalid email change confirmation link.", HttpContext);
-        }
-
-        var user = await UserManager.FindByIdAsync(UserId);
-        if (user is null)
-        {
-            message = "Unable to find user with Id '{userId}'";
-            return;
-        }
-
-        var code = Encoding.UTF8.GetString(WebEncoders.Base64UrlDecode(Code));
-        var result = await UserManager.ChangeEmailAsync(user, Email, code);
-        if (!result.Succeeded)
-        {
-            message = "Error changing email.";
-            return;
-        }
-
-        // In our UI email and user name are one and the same, so when we update the email
-        // we need to update the user name.
-        var setUserNameResult = await UserManager.SetUserNameAsync(user, Email);
-        if (!setUserNameResult.Succeeded)
-        {
-            message = "Error changing user name.";
-            return;
-        }
-
-        await SignInManager.RefreshSignInAsync(user);
-        message = "Thank you for confirming your email change.";
-    }
-}
--- a/RobotApp/Components/Account/Pages/ExternalLogin.razor
+++ b/RobotApp/Components/Account/Pages/ExternalLogin.razor
@@ -1,205 +0,0 @@
-@page "/Account/ExternalLogin"
-
-@using System.ComponentModel.DataAnnotations
-@using System.Security.Claims
-@using System.Text
-@using System.Text.Encodings.Web
-@using Microsoft.AspNetCore.Identity
-@using Microsoft.AspNetCore.WebUtilities
-@using RobotApp.Data
-
-@inject SignInManager<ApplicationUser> SignInManager
-@inject UserManager<ApplicationUser> UserManager
-@inject IUserStore<ApplicationUser> UserStore
-@inject IEmailSender<ApplicationUser> EmailSender
-@inject NavigationManager NavigationManager
-@inject IdentityRedirectManager RedirectManager
-@inject ILogger<ExternalLogin> Logger
-
-<PageTitle>Register</PageTitle>
-
-<StatusMessage Message="@message" />
-<h1>Register</h1>
-<h2>Associate your @ProviderDisplayName account.</h2>
-<hr />
-
-<div  class="alert alert-info">
-    You've successfully authenticated with <strong>@ProviderDisplayName</strong>.
-    Please enter an email address for this site below and click the Register button to finish
-    logging in.
-</div>
-
-<div class="row">
-    <div class="col-md-4">
-        <EditForm Model="Input" OnValidSubmit="OnValidSubmitAsync" FormName="confirmation" method="post">
-            <DataAnnotationsValidator />
-            <ValidationSummary class="text-danger" role="alert" />
-            <div class="form-floating mb-3">
-                <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="email" placeholder="Please enter your email." />
-                <label for="Input.Email" class="form-label">Email</label>
-                <ValidationMessage For="() => Input.Email" />
-            </div>
-            <button type="submit" class="w-100 btn btn-lg btn-primary">Register</button>
-        </EditForm>
-    </div>
-</div>
-
-@code {
-    public const string LoginCallbackAction = "LoginCallback";
-
-    private string? message;
-    private ExternalLoginInfo? externalLoginInfo;
-
-    [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
-
-    [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
-
-    [SupplyParameterFromQuery]
-    private string? RemoteError { get; set; }
-
-    [SupplyParameterFromQuery]
-    private string? ReturnUrl { get; set; }
-
-    [SupplyParameterFromQuery]
-    private string? Action { get; set; }
-
-    private string? ProviderDisplayName => externalLoginInfo?.ProviderDisplayName;
-
-    protected override async Task OnInitializedAsync()
-    {
-        if (RemoteError is not null)
-        {
-            RedirectManager.RedirectToWithStatus("Account/Login", $"Error from external provider: {RemoteError}", HttpContext);
-        }
-
-        var info = await SignInManager.GetExternalLoginInfoAsync();
-        if (info is null)
-        {
-            RedirectManager.RedirectToWithStatus("Account/Login", "Error loading external login information.", HttpContext);
-        }
-
-        externalLoginInfo = info;
-
-        if (HttpMethods.IsGet(HttpContext.Request.Method))
-        {
-            if (Action == LoginCallbackAction)
-            {
-                await OnLoginCallbackAsync();
-                return;
-            }
-
-            // We should only reach this page via the login callback, so redirect back to
-            // the login page if we get here some other way.
-            RedirectManager.RedirectTo("Account/Login");
-        }
-    }
-
-    private async Task OnLoginCallbackAsync()
-    {
-        if (externalLoginInfo is null)
-        {
-            RedirectManager.RedirectToWithStatus("Account/Login", "Error loading external login information.", HttpContext);
-        }
-
-        // Sign in the user with this external login provider if the user already has a login.
-        var result = await SignInManager.ExternalLoginSignInAsync(
-            externalLoginInfo.LoginProvider,
-            externalLoginInfo.ProviderKey,
-            isPersistent: false,
-            bypassTwoFactor: true);
-
-        if (result.Succeeded)
-        {
-            Logger.LogInformation(
-                "{Name} logged in with {LoginProvider} provider.",
-                externalLoginInfo.Principal.Identity?.Name,
-                externalLoginInfo.LoginProvider);
-            RedirectManager.RedirectTo(ReturnUrl);
-        }
-        else if (result.IsLockedOut)
-        {
-            RedirectManager.RedirectTo("Account/Lockout");
-        }
-
-        // If the user does not have an account, then ask the user to create an account.
-        if (externalLoginInfo.Principal.HasClaim(c => c.Type == ClaimTypes.Email))
-        {
-            Input.Email = externalLoginInfo.Principal.FindFirstValue(ClaimTypes.Email) ?? "";
-        }
-    }
-
-    private async Task OnValidSubmitAsync()
-    {
-        if (externalLoginInfo is null)
-        {
-            RedirectManager.RedirectToWithStatus("Account/Login", "Error loading external login information during confirmation.", HttpContext);
-        }
-
-        var emailStore = GetEmailStore();
-        var user = CreateUser();
-
-        await UserStore.SetUserNameAsync(user, Input.Email, CancellationToken.None);
-        await emailStore.SetEmailAsync(user, Input.Email, CancellationToken.None);
-
-        var result = await UserManager.CreateAsync(user);
-        if (result.Succeeded)
-        {
-            result = await UserManager.AddLoginAsync(user, externalLoginInfo);
-            if (result.Succeeded)
-            {
-                Logger.LogInformation("User created an account using {Name} provider.", externalLoginInfo.LoginProvider);
-
-                var userId = await UserManager.GetUserIdAsync(user);
-                var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
-                code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
-
-                var callbackUrl = NavigationManager.GetUriWithQueryParameters(
-                    NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
-                    new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code });
-                await EmailSender.SendConfirmationLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
-
-                // If account confirmation is required, we need to show the link if we don't have a real email sender
-                if (UserManager.Options.SignIn.RequireConfirmedAccount)
-                {
-                    RedirectManager.RedirectTo("Account/RegisterConfirmation", new() { ["email"] = Input.Email });
-                }
-
-                await SignInManager.SignInAsync(user, isPersistent: false, externalLoginInfo.LoginProvider);
-                RedirectManager.RedirectTo(ReturnUrl);
-            }
-        }
-
-        message = $"Error: {string.Join(",", result.Errors.Select(error => error.Description))}";
-    }
-
-    private ApplicationUser CreateUser()
-    {
-        try
-        {
-            return Activator.CreateInstance<ApplicationUser>();
-        }
-        catch
-        {
-            throw new InvalidOperationException($"Can't create an instance of '{nameof(ApplicationUser)}'. " +
-                $"Ensure that '{nameof(ApplicationUser)}' is not an abstract class and has a parameterless constructor");
-        }
-    }
-
-    private IUserEmailStore<ApplicationUser> GetEmailStore()
-    {
-        if (!UserManager.SupportsUserEmail)
-        {
-            throw new NotSupportedException("The default UI requires a user store with email support.");
-        }
-        return (IUserEmailStore<ApplicationUser>)UserStore;
-    }
-
-    private sealed class InputModel
-    {
-        [Required]
-        [EmailAddress]
-        public string Email { get; set; } = "";
-    }
-}
--- a/RobotApp/Components/Account/Pages/ForgotPassword.razor
+++ b/RobotApp/Components/Account/Pages/ForgotPassword.razor
@@ -1,68 +0,0 @@
-@page "/Account/ForgotPassword"
-
-@using System.ComponentModel.DataAnnotations
-@using System.Text
-@using System.Text.Encodings.Web
-@using Microsoft.AspNetCore.Identity
-@using Microsoft.AspNetCore.WebUtilities
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject IEmailSender<ApplicationUser> EmailSender
-@inject NavigationManager NavigationManager
-@inject IdentityRedirectManager RedirectManager
-
-<PageTitle>Forgot your password?</PageTitle>
-
-<h1>Forgot your password?</h1>
-<h2>Enter your email.</h2>
-<hr />
-<div class="row">
-    <div class="col-md-4">
-        <EditForm Model="Input" FormName="forgot-password" OnValidSubmit="OnValidSubmitAsync" method="post">
-            <DataAnnotationsValidator />
-            <ValidationSummary class="text-danger" role="alert" />
-
-            <div class="form-floating mb-3">
-                <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
-                <label for="Input.Email" class="form-label">Email</label>
-                <ValidationMessage For="() => Input.Email" class="text-danger" />
-            </div>
-            <button type="submit" class="w-100 btn btn-lg btn-primary">Reset password</button>
-        </EditForm>
-     </div>
-</div>
-
-@code {
-    [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
-
-    private async Task OnValidSubmitAsync()
-    {
-        var user = await UserManager.FindByEmailAsync(Input.Email);
-        if (user is null || !(await UserManager.IsEmailConfirmedAsync(user)))
-        {
-            // Don't reveal that the user does not exist or is not confirmed
-            RedirectManager.RedirectTo("Account/ForgotPasswordConfirmation");
-        }
-
-        // For more information on how to enable account confirmation and password reset please
-        // visit https://go.microsoft.com/fwlink/?LinkID=532713
-        var code = await UserManager.GeneratePasswordResetTokenAsync(user);
-        code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
-        var callbackUrl = NavigationManager.GetUriWithQueryParameters(
-            NavigationManager.ToAbsoluteUri("Account/ResetPassword").AbsoluteUri,
-            new Dictionary<string, object?> { ["code"] = code });
-
-        await EmailSender.SendPasswordResetLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
-
-        RedirectManager.RedirectTo("Account/ForgotPasswordConfirmation");
-    }
-
-    private sealed class InputModel
-    {
-        [Required]
-        [EmailAddress]
-        public string Email { get; set; } = "";
-    }
-}
--- a/RobotApp/Components/Account/Pages/ForgotPasswordConfirmation.razor
+++ b/RobotApp/Components/Account/Pages/ForgotPasswordConfirmation.razor
@@ -1,8 +0,0 @@
-@page "/Account/ForgotPasswordConfirmation"
-
-<PageTitle>Forgot password confirmation</PageTitle>
-
-<h1>Forgot password confirmation</h1>
-<p role="alert">
-    Please check your email to reset your password.
-</p>
--- a/RobotApp/Components/Account/Pages/InvalidPasswordReset.razor
+++ b/RobotApp/Components/Account/Pages/InvalidPasswordReset.razor
@@ -1,8 +0,0 @@
-@page "/Account/InvalidPasswordReset"
-
-<PageTitle>Invalid password reset</PageTitle>
-
-<h1>Invalid password reset</h1>
-<p role="alert">
-    The password reset link is invalid.
-</p>
--- a/RobotApp/Components/Account/Pages/InvalidUser.razor
+++ b/RobotApp/Components/Account/Pages/InvalidUser.razor
@@ -1,7 +0,0 @@
-@page "/Account/InvalidUser"
-
-<PageTitle>Invalid user</PageTitle>
-
-<h3>Invalid user</h3>
-
-<StatusMessage />
--- a/RobotApp/Components/Account/Pages/Lockout.razor
+++ b/RobotApp/Components/Account/Pages/Lockout.razor
@@ -1,8 +0,0 @@
-@page "/Account/Lockout"
-
-<PageTitle>Locked out</PageTitle>
-
-<header>
-    <h1 class="text-danger">Locked out</h1>
-    <p class="text-danger" role="alert">This account has been locked out, please try again later.</p>
-</header>
--- a/RobotApp/Components/Account/Pages/Login.razor
+++ b/RobotApp/Components/Account/Pages/Login.razor
@@ -10,58 +10,48 @@
@inject NavigationManager NavigationManager
@inject IdentityRedirectManager RedirectManager

+
 <PageTitle>Log in</PageTitle>

-<h1>Log in</h1>
-<div class="row">
-    <div class="col-lg-6">
-        <section>
-            <StatusMessage Message="@errorMessage" />
-            <EditForm Model="Input" method="post" OnValidSubmit="LoginUser" FormName="login">
-                <DataAnnotationsValidator />
-                <h2>Use a local account to log in.</h2>
-                <hr />
-                <ValidationSummary class="text-danger" role="alert" />
-                <div class="form-floating mb-3">
-                    <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
-                    <label for="Input.Email" class="form-label">Email</label>
-                    <ValidationMessage For="() => Input.Email" class="text-danger" />
-                </div>
-                <div class="form-floating mb-3">
-                    <InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" placeholder="password" />
-                    <label for="Input.Password" class="form-label">Password</label>
-                    <ValidationMessage For="() => Input.Password" class="text-danger" />
-                </div>
-                <div class="checkbox mb-3">
-                    <label class="form-label">
-                        <InputCheckbox @bind-Value="Input.RememberMe" class="darker-border-checkbox form-check-input" />
-                        Remember me
-                    </label>
-                </div>
-                <div>
-                    <button type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
-                </div>
-                <div>
-                    <p>
-                        <a href="Account/ForgotPassword">Forgot your password?</a>
-                    </p>
-                    <p>
-                        <a href="@(NavigationManager.GetUriWithQueryParameters("Account/Register", new Dictionary<string, object?> { ["ReturnUrl"] = ReturnUrl }))">Register as a new user</a>
-                    </p>
-                    <p>
-                        <a href="Account/ResendEmailConfirmation">Resend email confirmation</a>
-                    </p>
-                </div>
-            </EditForm>
-        </section>
-    </div>
-    <div class="col-lg-4 col-lg-offset-2">
-        <section>
-            <h3>Use another service to log in.</h3>
-            <hr />
-            <ExternalLoginPicker />
-        </section>
-    </div>
+<div class="w-100 h-100 d-flex flex-column justify-content-center align-items-center">
+    <header class="brand">
+        <img src="images/logoD.svg" alt="RobotApp" class="brand-logo" />
+        <div class="brand-text">
+            <h1>RobotApp</h1>
+            <p>Sign in to your workspace</p>
+        </div>
+    </header>
+    @if (!string.IsNullOrEmpty(errorMessage))
+    {
+        var statusMessageClass = errorMessage.StartsWith("Error") ? "danger" : "success";
+        <div class="alert alert-@statusMessageClass" role="alert">
+            @errorMessage
+        </div>
+    }
+    <EditForm Model="Input" method="post" OnValidSubmit="LoginUser" FormName="login" style="width: 300px;">
+        <DataAnnotationsValidator />
+        <hr />
+        <ValidationSummary class="text-danger" role="alert" />
+        <div class="form-floating mb-3">
+            <InputText @bind-Value="Input.Username" class="form-control" autocomplete="username" aria-required="true" />
+            <label for="username" class="form-label">Username</label>
+            <ValidationMessage For="() => Input.Username" class="text-danger" />
+        </div>
+        <div class="form-floating mb-3">
+            <InputText type="password" @bind-Value="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" />
+            <label for="password" class="form-label">Password</label>
+            <ValidationMessage For="() => Input.Password" class="text-danger" />
+        </div>
+        <div class="checkbox mb-3">
+            <label class="form-label">
+                <InputCheckbox @bind-Value="Input.RememberMe" class="darker-border-checkbox form-check-input" />
+                Remember me
+            </label>
+        </div>
+        <div>
+            <button type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
+        </div>
+    </EditForm>
 </div>

@code {
@@ -83,13 +73,18 @@
            // Clear the existing external cookie to ensure a clean login process
            await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
        }
+
+        errorMessage = HttpContext.Request.Cookies[IdentityRedirectManager.StatusCookieName];
+
+        if (errorMessage is not null)
+        {
+            HttpContext.Response.Cookies.Delete(IdentityRedirectManager.StatusCookieName);
+        }
    }

    public async Task LoginUser()
    {
-        // This doesn't count login failures towards account lockout
-        // To enable password failures to trigger account lockout, set lockoutOnFailure: true
-        var result = await SignInManager.PasswordSignInAsync(Input.Email, Input.Password, Input.RememberMe, lockoutOnFailure: false);
+        var result = await SignInManager.PasswordSignInAsync(Input.Username, Input.Password, Input.RememberMe, lockoutOnFailure: false);
        if (result.Succeeded)
        {
            Logger.LogInformation("User logged in.");
@@ -115,8 +110,7 @@
    private sealed class InputModel
    {
        [Required]
-        [EmailAddress]
-        public string Email { get; set; } = "";
+        public string Username { get; set; } = "";

        [Required]
        [DataType(DataType.Password)]
--- a/RobotApp/Components/Account/Pages/Login.razor.css
+++ b/RobotApp/Components/Account/Pages/Login.razor.css
@@ -0,0 +1,38 @@
+.brand {
+    display: flex;
+    align-items: center;
+    gap: 14px;
+    margin-bottom: 18px;
+    position: relative;
+}
+
+.brand-logo {
+    width: 56px;
+    height: 56px;
+    display: block;
+    filter: drop-shadow(0 10px 22px rgba(255,122,26,.25));
+}
+
+.brand::before {
+    content: "";
+    position: absolute;
+    inset: -8px -10px auto auto;
+    height: 3px;
+    width: 120px;
+    background: linear-gradient(90deg, var(--brand-pink), var(--brand-blue));
+    border-radius: 8px;
+    opacity: .9;
+}
+
+.brand-text h1 {
+    margin: 0;
+    font-size: 20px;
+    font-weight: 800;
+    letter-spacing: .2px;
+}
+
+.brand-text p {
+    margin: 2px 0 0 0;
+    color: var(--muted);
+    font-size: 13px;
+}
--- a/RobotApp/Components/Account/Pages/LoginWith2fa.razor
+++ b/RobotApp/Components/Account/Pages/LoginWith2fa.razor
@@ -1,101 +0,0 @@
-@page "/Account/LoginWith2fa"
-
-@using System.ComponentModel.DataAnnotations
-@using Microsoft.AspNetCore.Identity
-@using RobotApp.Data
-
-@inject SignInManager<ApplicationUser> SignInManager
-@inject UserManager<ApplicationUser> UserManager
-@inject IdentityRedirectManager RedirectManager
-@inject ILogger<LoginWith2fa> Logger
-
-<PageTitle>Two-factor authentication</PageTitle>
-
-<h1>Two-factor authentication</h1>
-<hr />
-<StatusMessage Message="@message" />
-<p>Your login is protected with an authenticator app. Enter your authenticator code below.</p>
-<div class="row">
-    <div class="col-md-4">
-        <EditForm Model="Input" FormName="login-with-2fa" OnValidSubmit="OnValidSubmitAsync" method="post">
-            <input type="hidden" name="ReturnUrl" value="@ReturnUrl" />
-            <input type="hidden" name="RememberMe" value="@RememberMe" />
-            <DataAnnotationsValidator />
-            <ValidationSummary class="text-danger" role="alert" />
-            <div class="form-floating mb-3">
-                <InputText @bind-Value="Input.TwoFactorCode" id="Input.TwoFactorCode" class="form-control" autocomplete="off" />
-                <label for="Input.TwoFactorCode" class="form-label">Authenticator code</label>
-                <ValidationMessage For="() => Input.TwoFactorCode" class="text-danger" />
-            </div>
-            <div class="checkbox mb-3">
-                <label for="remember-machine" class="form-label">
-                    <InputCheckbox @bind-Value="Input.RememberMachine" />
-                    Remember this machine
-                </label>
-            </div>
-            <div>
-                <button type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
-            </div>
-        </EditForm>
-    </div>
-</div>
-<p>
-    Don't have access to your authenticator device? You can
-    <a href="Account/LoginWithRecoveryCode?ReturnUrl=@ReturnUrl">log in with a recovery code</a>.
-</p>
-
-@code {
-    private string? message;
-    private ApplicationUser user = default!;
-
-    [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
-
-    [SupplyParameterFromQuery]
-    private string? ReturnUrl { get; set; }
-
-    [SupplyParameterFromQuery]
-    private bool RememberMe { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        // Ensure the user has gone through the username & password screen first
-        user = await SignInManager.GetTwoFactorAuthenticationUserAsync() ??
-            throw new InvalidOperationException("Unable to load two-factor authentication user.");
-    }
-
-    private async Task OnValidSubmitAsync()
-    {
-        var authenticatorCode = Input.TwoFactorCode!.Replace(" ", string.Empty).Replace("-", string.Empty);
-        var result = await SignInManager.TwoFactorAuthenticatorSignInAsync(authenticatorCode, RememberMe, Input.RememberMachine);
-        var userId = await UserManager.GetUserIdAsync(user);
-
-        if (result.Succeeded)
-        {
-            Logger.LogInformation("User with ID '{UserId}' logged in with 2fa.", userId);
-            RedirectManager.RedirectTo(ReturnUrl);
-        }
-        else if (result.IsLockedOut)
-        {
-            Logger.LogWarning("User with ID '{UserId}' account locked out.", userId);
-            RedirectManager.RedirectTo("Account/Lockout");
-        }
-        else
-        {
-            Logger.LogWarning("Invalid authenticator code entered for user with ID '{UserId}'.", userId);
-            message = "Error: Invalid authenticator code.";
-        }
-    }
-
-    private sealed class InputModel
-    {
-        [Required]
-        [StringLength(7, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Text)]
-        [Display(Name = "Authenticator code")]
-        public string? TwoFactorCode { get; set; }
-
-        [Display(Name = "Remember this machine")]
-        public bool RememberMachine { get; set; }
-    }
-}
--- a/RobotApp/Components/Account/Pages/LoginWithRecoveryCode.razor
+++ b/RobotApp/Components/Account/Pages/LoginWithRecoveryCode.razor
@@ -1,85 +0,0 @@
-@page "/Account/LoginWithRecoveryCode"
-
-@using System.ComponentModel.DataAnnotations
-@using Microsoft.AspNetCore.Identity
-@using RobotApp.Data
-
-@inject SignInManager<ApplicationUser> SignInManager
-@inject UserManager<ApplicationUser> UserManager
-@inject IdentityRedirectManager RedirectManager
-@inject ILogger<LoginWithRecoveryCode> Logger
-
-<PageTitle>Recovery code verification</PageTitle>
-
-<h1>Recovery code verification</h1>
-<hr />
-<StatusMessage Message="@message" />
-<p>
-    You have requested to log in with a recovery code. This login will not be remembered until you provide
-    an authenticator app code at log in or disable 2FA and log in again.
-</p>
-<div class="row">
-    <div class="col-md-4">
-        <EditForm Model="Input" FormName="login-with-recovery-code" OnValidSubmit="OnValidSubmitAsync" method="post">
-            <DataAnnotationsValidator />
-            <ValidationSummary class="text-danger" role="alert" />
-            <div class="form-floating mb-3">
-                <InputText @bind-Value="Input.RecoveryCode" id="Input.RecoveryCode" class="form-control" autocomplete="off" placeholder="RecoveryCode" />
-                <label for="Input.RecoveryCode" class="form-label">Recovery Code</label>
-                <ValidationMessage For="() => Input.RecoveryCode" class="text-danger" />
-            </div>
-            <button type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
-        </EditForm>
-    </div>
-</div>
-
-@code {
-    private string? message;
-    private ApplicationUser user = default!;
-
-    [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
-
-    [SupplyParameterFromQuery]
-    private string? ReturnUrl { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        // Ensure the user has gone through the username & password screen first
-        user = await SignInManager.GetTwoFactorAuthenticationUserAsync() ??
-            throw new InvalidOperationException("Unable to load two-factor authentication user.");
-    }
-
-    private async Task OnValidSubmitAsync()
-    {
-        var recoveryCode = Input.RecoveryCode.Replace(" ", string.Empty);
-
-        var result = await SignInManager.TwoFactorRecoveryCodeSignInAsync(recoveryCode);
-
-        var userId = await UserManager.GetUserIdAsync(user);
-
-        if (result.Succeeded)
-        {
-            Logger.LogInformation("User with ID '{UserId}' logged in with a recovery code.", userId);
-            RedirectManager.RedirectTo(ReturnUrl);
-        }
-        else if (result.IsLockedOut)
-        {
-            Logger.LogWarning("User account locked out.");
-            RedirectManager.RedirectTo("Account/Lockout");
-        }
-        else
-        {
-            Logger.LogWarning("Invalid recovery code entered for user with ID '{UserId}' ", userId);
-            message = "Error: Invalid recovery code entered.";
-        }
-    }
-
-    private sealed class InputModel
-    {
-        [Required]
-        [DataType(DataType.Text)]
-        [Display(Name = "Recovery Code")]
-        public string RecoveryCode { get; set; } = "";
-    }
-}
--- a/RobotApp/Components/Account/Pages/Manage/ChangePassword.razor
+++ b/RobotApp/Components/Account/Pages/Manage/ChangePassword.razor
@@ -1,96 +0,0 @@
-@page "/Account/Manage/ChangePassword"
-
-@using System.ComponentModel.DataAnnotations
-@using Microsoft.AspNetCore.Identity
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject SignInManager<ApplicationUser> SignInManager
-@inject IdentityUserAccessor UserAccessor
-@inject IdentityRedirectManager RedirectManager
-@inject ILogger<ChangePassword> Logger
-
-<PageTitle>Change password</PageTitle>
-
-<h3>Change password</h3>
-<StatusMessage Message="@message" />
-<div class="row">
-    <div class="col-xl-6">
-        <EditForm Model="Input" FormName="change-password" OnValidSubmit="OnValidSubmitAsync" method="post">
-            <DataAnnotationsValidator />
-            <ValidationSummary class="text-danger" role="alert" />
-            <div class="form-floating mb-3">
-                <InputText type="password" @bind-Value="Input.OldPassword" id="Input.OldPassword" class="form-control" autocomplete="current-password" aria-required="true" placeholder="Enter the old password" />
-                <label for="Input.OldPassword" class="form-label">Old password</label>
-                <ValidationMessage For="() => Input.OldPassword" class="text-danger" />
-            </div>
-            <div class="form-floating mb-3">
-                <InputText type="password" @bind-Value="Input.NewPassword" id="Input.NewPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Enter the new password" />
-                <label for="Input.NewPassword" class="form-label">New password</label>
-                <ValidationMessage For="() => Input.NewPassword" class="text-danger" />
-            </div>
-            <div class="form-floating mb-3">
-                <InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Enter the new password" />
-                <label for="Input.ConfirmPassword" class="form-label">Confirm password</label>
-                <ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
-            </div>
-            <button type="submit" class="w-100 btn btn-lg btn-primary">Update password</button>
-        </EditForm>
-    </div>
-</div>
-
-@code {
-    private string? message;
-    private ApplicationUser user = default!;
-    private bool hasPassword;
-
-    [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
-
-    [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
-
-    protected override async Task OnInitializedAsync()
-    {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
-        hasPassword = await UserManager.HasPasswordAsync(user);
-        if (!hasPassword)
-        {
-            RedirectManager.RedirectTo("Account/Manage/SetPassword");
-        }
-    }
-
-    private async Task OnValidSubmitAsync()
-    {
-        var changePasswordResult = await UserManager.ChangePasswordAsync(user, Input.OldPassword, Input.NewPassword);
-        if (!changePasswordResult.Succeeded)
-        {
-            message = $"Error: {string.Join(",", changePasswordResult.Errors.Select(error => error.Description))}";
-            return;
-        }
-
-        await SignInManager.RefreshSignInAsync(user);
-        Logger.LogInformation("User changed their password successfully.");
-
-        RedirectManager.RedirectToCurrentPageWithStatus("Your password has been changed", HttpContext);
-    }
-
-    private sealed class InputModel
-    {
-        [Required]
-        [DataType(DataType.Password)]
-        [Display(Name = "Current password")]
-        public string OldPassword { get; set; } = "";
-
-        [Required]
-        [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Password)]
-        [Display(Name = "New password")]
-        public string NewPassword { get; set; } = "";
-
-        [DataType(DataType.Password)]
-        [Display(Name = "Confirm new password")]
-        [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; } = "";
-    }
-}
--- a/RobotApp/Components/Account/Pages/Manage/DeletePersonalData.razor
+++ b/RobotApp/Components/Account/Pages/Manage/DeletePersonalData.razor
@@ -1,86 +0,0 @@
-@page "/Account/Manage/DeletePersonalData"
-
-@using System.ComponentModel.DataAnnotations
-@using Microsoft.AspNetCore.Identity
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject SignInManager<ApplicationUser> SignInManager
-@inject IdentityUserAccessor UserAccessor
-@inject IdentityRedirectManager RedirectManager
-@inject ILogger<DeletePersonalData> Logger
-
-<PageTitle>Delete Personal Data</PageTitle>
-
-<StatusMessage Message="@message" />
-
-<h3>Delete Personal Data</h3>
-
-<div class="alert alert-warning" role="alert">
-    <p>
-        <strong>Deleting this data will permanently remove your account, and this cannot be recovered.</strong>
-    </p>
-</div>
-
-<div>
-    <EditForm Model="Input" FormName="delete-user" OnValidSubmit="OnValidSubmitAsync" method="post">
-        <DataAnnotationsValidator />
-        <ValidationSummary class="text-danger" role="alert" />
-        @if (requirePassword)
-        {
-            <div class="form-floating mb-3">
-                <InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" placeholder="Please enter your password." />
-                <label for="Input.Password" class="form-label">Password</label>
-                <ValidationMessage For="() => Input.Password" class="text-danger" />
-            </div>
-        }
-        <button class="w-100 btn btn-lg btn-danger" type="submit">Delete data and close my account</button>
-    </EditForm>
-</div>
-
-@code {
-    private string? message;
-    private ApplicationUser user = default!;
-    private bool requirePassword;
-
-    [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
-
-    [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
-
-    protected override async Task OnInitializedAsync()
-    {
-        Input ??= new();
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
-        requirePassword = await UserManager.HasPasswordAsync(user);
-    }
-
-    private async Task OnValidSubmitAsync()
-    {
-        if (requirePassword && !await UserManager.CheckPasswordAsync(user, Input.Password))
-        {
-            message = "Error: Incorrect password.";
-            return;
-        }
-
-        var result = await UserManager.DeleteAsync(user);
-        if (!result.Succeeded)
-        {
-            throw new InvalidOperationException("Unexpected error occurred deleting user.");
-        }
-
-        await SignInManager.SignOutAsync();
-
-        var userId = await UserManager.GetUserIdAsync(user);
-        Logger.LogInformation("User with ID '{UserId}' deleted themselves.", userId);
-
-        RedirectManager.RedirectToCurrentPage();
-    }
-
-    private sealed class InputModel
-    {
-        [DataType(DataType.Password)]
-        public string Password { get; set; } = "";
-    }
-}
--- a/RobotApp/Components/Account/Pages/Manage/Disable2fa.razor
+++ b/RobotApp/Components/Account/Pages/Manage/Disable2fa.razor
@@ -1,64 +0,0 @@
-@page "/Account/Manage/Disable2fa"
-
-@using Microsoft.AspNetCore.Identity
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject IdentityUserAccessor UserAccessor
-@inject IdentityRedirectManager RedirectManager
-@inject ILogger<Disable2fa> Logger
-
-<PageTitle>Disable two-factor authentication (2FA)</PageTitle>
-
-<StatusMessage />
-<h3>Disable two-factor authentication (2FA)</h3>
-
-<div class="alert alert-warning" role="alert">
-    <p>
-        <strong>This action only disables 2FA.</strong>
-    </p>
-    <p>
-        Disabling 2FA does not change the keys used in authenticator apps. If you wish to change the key
-        used in an authenticator app you should <a href="Account/Manage/ResetAuthenticator">reset your authenticator keys.</a>
-    </p>
-</div>
-
-<div>
-    <form @formname="disable-2fa" @onsubmit="OnSubmitAsync" method="post">
-        <AntiforgeryToken />
-        <button class="btn btn-danger" type="submit">Disable 2FA</button>
-    </form>
-</div>
-
-@code {
-    private ApplicationUser user = default!;
-
-    [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
-
-        if (HttpMethods.IsGet(HttpContext.Request.Method) && !await UserManager.GetTwoFactorEnabledAsync(user))
-        {
-            throw new InvalidOperationException("Cannot disable 2FA for user as it's not currently enabled.");
-        }
-    }
-
-    private async Task OnSubmitAsync()
-    {
-        var disable2faResult = await UserManager.SetTwoFactorEnabledAsync(user, false);
-        if (!disable2faResult.Succeeded)
-        {
-            throw new InvalidOperationException("Unexpected error occurred disabling 2FA.");
-        }
-
-        var userId = await UserManager.GetUserIdAsync(user);
-        Logger.LogInformation("User with ID '{UserId}' has disabled 2fa.", userId);
-        RedirectManager.RedirectToWithStatus(
-            "Account/Manage/TwoFactorAuthentication",
-            "2fa has been disabled. You can reenable 2fa when you setup an authenticator app",
-            HttpContext);
-    }
-}
--- a/RobotApp/Components/Account/Pages/Manage/Email.razor
+++ b/RobotApp/Components/Account/Pages/Manage/Email.razor
@@ -1,123 +0,0 @@
-@page "/Account/Manage/Email"
-
-@using System.ComponentModel.DataAnnotations
-@using System.Text
-@using System.Text.Encodings.Web
-@using Microsoft.AspNetCore.Identity
-@using Microsoft.AspNetCore.WebUtilities
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject IEmailSender<ApplicationUser> EmailSender
-@inject IdentityUserAccessor UserAccessor
-@inject NavigationManager NavigationManager
-
-<PageTitle>Manage email</PageTitle>
-
-<h3>Manage email</h3>
-
-<StatusMessage Message="@message"/>
-<div class="row">
-    <div class="col-xl-6">
-        <form @onsubmit="OnSendEmailVerificationAsync" @formname="send-verification" id="send-verification-form" method="post">
-            <AntiforgeryToken />
-        </form>
-        <EditForm Model="Input" FormName="change-email" OnValidSubmit="OnValidSubmitAsync" method="post">
-            <DataAnnotationsValidator />
-            <ValidationSummary class="text-danger" role="alert" />
-            @if (isEmailConfirmed)
-            {
-                <div class="form-floating mb-3 input-group">
-                    <input type="text" value="@email" id="email" class="form-control" placeholder="Enter your email" disabled />
-                    <div class="input-group-append">
-                        <span class="h-100 input-group-text text-success font-weight-bold">✓</span>
-                    </div>
-                    <label for="email" class="form-label">Email</label>
-                </div>
-            }
-            else
-            {
-                <div class="form-floating mb-3">
-                    <input type="text" value="@email" id="email" class="form-control" placeholder="Enter your email" disabled />
-                    <label for="email" class="form-label">Email</label>
-                    <button type="submit" class="btn btn-link" form="send-verification-form">Send verification email</button>
-                </div>
-            }
-            <div class="form-floating mb-3">
-                <InputText @bind-Value="Input.NewEmail" id="Input.NewEmail" class="form-control" autocomplete="email" aria-required="true" placeholder="Enter a new email" />
-                <label for="Input.NewEmail" class="form-label">New email</label>
-                <ValidationMessage For="() => Input.NewEmail" class="text-danger" />
-            </div>
-            <button type="submit" class="w-100 btn btn-lg btn-primary">Change email</button>
-        </EditForm>
-    </div>
-</div>
-
-@code {
-    private string? message;
-    private ApplicationUser user = default!;
-    private string? email;
-    private bool isEmailConfirmed;
-
-    [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
-
-    [SupplyParameterFromForm(FormName = "change-email")]
-    private InputModel Input { get; set; } = new();
-
-    protected override async Task OnInitializedAsync()
-    {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
-        email = await UserManager.GetEmailAsync(user);
-        isEmailConfirmed = await UserManager.IsEmailConfirmedAsync(user);
-
-        Input.NewEmail ??= email;
-    }
-
-    private async Task OnValidSubmitAsync()
-    {
-        if (Input.NewEmail is null || Input.NewEmail == email)
-        {
-            message = "Your email is unchanged.";
-            return;
-        }
-
-        var userId = await UserManager.GetUserIdAsync(user);
-        var code = await UserManager.GenerateChangeEmailTokenAsync(user, Input.NewEmail);
-        code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
-        var callbackUrl = NavigationManager.GetUriWithQueryParameters(
-            NavigationManager.ToAbsoluteUri("Account/ConfirmEmailChange").AbsoluteUri,
-            new Dictionary<string, object?> { ["userId"] = userId, ["email"] = Input.NewEmail, ["code"] = code });
-
-        await EmailSender.SendConfirmationLinkAsync(user, Input.NewEmail, HtmlEncoder.Default.Encode(callbackUrl));
-
-        message = "Confirmation link to change email sent. Please check your email.";
-    }
-
-    private async Task OnSendEmailVerificationAsync()
-    {
-        if (email is null)
-        {
-            return;
-        }
-
-        var userId = await UserManager.GetUserIdAsync(user);
-        var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
-        code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
-        var callbackUrl = NavigationManager.GetUriWithQueryParameters(
-            NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
-            new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code });
-
-        await EmailSender.SendConfirmationLinkAsync(user, email, HtmlEncoder.Default.Encode(callbackUrl));
-
-        message = "Verification email sent. Please check your email.";
-    }
-
-    private sealed class InputModel
-    {
-        [Required]
-        [EmailAddress]
-        [Display(Name = "New email")]
-        public string? NewEmail { get; set; }
-    }
-}
--- a/RobotApp/Components/Account/Pages/Manage/EnableAuthenticator.razor
+++ b/RobotApp/Components/Account/Pages/Manage/EnableAuthenticator.razor
@@ -1,172 +0,0 @@
-@page "/Account/Manage/EnableAuthenticator"
-
-@using System.ComponentModel.DataAnnotations
-@using System.Globalization
-@using System.Text
-@using System.Text.Encodings.Web
-@using Microsoft.AspNetCore.Identity
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject IdentityUserAccessor UserAccessor
-@inject UrlEncoder UrlEncoder
-@inject IdentityRedirectManager RedirectManager
-@inject ILogger<EnableAuthenticator> Logger
-
-<PageTitle>Configure authenticator app</PageTitle>
-
-@if (recoveryCodes is not null)
-{
-    <ShowRecoveryCodes RecoveryCodes="recoveryCodes.ToArray()" StatusMessage="@message" />
-}
-else
-{
-    <StatusMessage Message="@message" />
-    <h3>Configure authenticator app</h3>
-    <div>
-        <p>To use an authenticator app go through the following steps:</p>
-        <ol class="list">
-            <li>
-                <p>
-                    Download a two-factor authenticator app like Microsoft Authenticator for
-                    <a href="https://go.microsoft.com/fwlink/?Linkid=825072">Android</a> and
-                    <a href="https://go.microsoft.com/fwlink/?Linkid=825073">iOS</a> or
-                    Google Authenticator for
-                    <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&amp;hl=en">Android</a> and
-                    <a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a>.
-                </p>
-            </li>
-            <li>
-                <p>Scan the QR Code or enter this key <kbd>@sharedKey</kbd> into your two factor authenticator app. Spaces and casing do not matter.</p>
-                <div class="alert alert-info">Learn how to <a href="https://go.microsoft.com/fwlink/?Linkid=852423">enable QR code generation</a>.</div>
-                <div></div>
-                <div data-url="@authenticatorUri"></div>
-            </li>
-            <li>
-                <p>
-                    Once you have scanned the QR code or input the key above, your two factor authentication app will provide you
-                    with a unique code. Enter the code in the confirmation box below.
-                </p>
-                <div class="row">
-                    <div class="col-xl-6">
-                        <EditForm Model="Input" FormName="send-code" OnValidSubmit="OnValidSubmitAsync" method="post">
-                            <DataAnnotationsValidator />
-                            <div class="form-floating mb-3">
-                                <InputText @bind-Value="Input.Code" id="Input.Code" class="form-control" autocomplete="off" placeholder="Enter the code" />
-                                <label for="Input.Code" class="control-label form-label">Verification Code</label>
-                                <ValidationMessage For="() => Input.Code" class="text-danger" />
-                            </div>
-                            <button type="submit" class="w-100 btn btn-lg btn-primary">Verify</button>
-                            <ValidationSummary class="text-danger" role="alert" />
-                        </EditForm>
-                    </div>
-                </div>
-            </li>
-        </ol>
-    </div>
-}
-
-@code {
-    private const string AuthenticatorUriFormat = "otpauth://totp/{0}:{1}?secret={2}&issuer={0}&digits=6";
-
-    private string? message;
-    private ApplicationUser user = default!;
-    private string? sharedKey;
-    private string? authenticatorUri;
-    private IEnumerable<string>? recoveryCodes;
-
-    [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
-
-    [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
-
-    protected override async Task OnInitializedAsync()
-    {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
-
-        await LoadSharedKeyAndQrCodeUriAsync(user);
-    }
-
-    private async Task OnValidSubmitAsync()
-    {
-        // Strip spaces and hyphens
-        var verificationCode = Input.Code.Replace(" ", string.Empty).Replace("-", string.Empty);
-
-        var is2faTokenValid = await UserManager.VerifyTwoFactorTokenAsync(
-            user, UserManager.Options.Tokens.AuthenticatorTokenProvider, verificationCode);
-
-        if (!is2faTokenValid)
-        {
-            message = "Error: Verification code is invalid.";
-            return;
-        }
-
-        await UserManager.SetTwoFactorEnabledAsync(user, true);
-        var userId = await UserManager.GetUserIdAsync(user);
-        Logger.LogInformation("User with ID '{UserId}' has enabled 2FA with an authenticator app.", userId);
-
-        message = "Your authenticator app has been verified.";
-
-        if (await UserManager.CountRecoveryCodesAsync(user) == 0)
-        {
-            recoveryCodes = await UserManager.GenerateNewTwoFactorRecoveryCodesAsync(user, 10);
-        }
-        else
-        {
-            RedirectManager.RedirectToWithStatus("Account/Manage/TwoFactorAuthentication", message, HttpContext);
-        }
-    }
-
-    private async ValueTask LoadSharedKeyAndQrCodeUriAsync(ApplicationUser user)
-    {
-        // Load the authenticator key & QR code URI to display on the form
-        var unformattedKey = await UserManager.GetAuthenticatorKeyAsync(user);
-        if (string.IsNullOrEmpty(unformattedKey))
-        {
-            await UserManager.ResetAuthenticatorKeyAsync(user);
-            unformattedKey = await UserManager.GetAuthenticatorKeyAsync(user);
-        }
-
-        sharedKey = FormatKey(unformattedKey!);
-
-        var email = await UserManager.GetEmailAsync(user);
-        authenticatorUri = GenerateQrCodeUri(email!, unformattedKey!);
-    }
-
-    private string FormatKey(string unformattedKey)
-    {
-        var result = new StringBuilder();
-        int currentPosition = 0;
-        while (currentPosition + 4 < unformattedKey.Length)
-        {
-            result.Append(unformattedKey.AsSpan(currentPosition, 4)).Append(' ');
-            currentPosition += 4;
-        }
-        if (currentPosition < unformattedKey.Length)
-        {
-            result.Append(unformattedKey.AsSpan(currentPosition));
-        }
-
-        return result.ToString().ToLowerInvariant();
-    }
-
-    private string GenerateQrCodeUri(string email, string unformattedKey)
-    {
-        return string.Format(
-            CultureInfo.InvariantCulture,
-            AuthenticatorUriFormat,
-            UrlEncoder.Encode("Microsoft.AspNetCore.Identity.UI"),
-            UrlEncoder.Encode(email),
-            unformattedKey);
-    }
-
-    private sealed class InputModel
-    {
-        [Required]
-        [StringLength(7, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Text)]
-        [Display(Name = "Verification Code")]
-        public string Code { get; set; } = "";
-    }
-}
--- a/RobotApp/Components/Account/Pages/Manage/ExternalLogins.razor
+++ b/RobotApp/Components/Account/Pages/Manage/ExternalLogins.razor
@@ -1,140 +0,0 @@
-@page "/Account/Manage/ExternalLogins"
-
-@using Microsoft.AspNetCore.Authentication
-@using Microsoft.AspNetCore.Identity
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject SignInManager<ApplicationUser> SignInManager
-@inject IdentityUserAccessor UserAccessor
-@inject IUserStore<ApplicationUser> UserStore
-@inject IdentityRedirectManager RedirectManager
-
-<PageTitle>Manage your external logins</PageTitle>
-
-<StatusMessage />
-@if (currentLogins?.Count > 0)
-{
-    <h3>Registered Logins</h3>
-    <table class="table">
-        <tbody>
-            @foreach (var login in currentLogins)
-            {
-                <tr>
-                    <td>@login.ProviderDisplayName</td>
-                    <td>
-                        @if (showRemoveButton)
-                        {
-                            <form @formname="@($"remove-login-{login.LoginProvider}")" @onsubmit="OnSubmitAsync" method="post">
-                                <AntiforgeryToken />
-                                <div>
-                                    <input type="hidden" name="@nameof(LoginProvider)" value="@login.LoginProvider" />
-                                    <input type="hidden" name="@nameof(ProviderKey)" value="@login.ProviderKey" />
-                                    <button type="submit" class="btn btn-primary" title="Remove this @login.ProviderDisplayName login from your account">Remove</button>
-                                </div>
-                            </form>
-                        }
-                        else
-                        {
-                            @: &nbsp;
-                        }
-                    </td>
-                </tr>
-            }
-        </tbody>
-    </table>
-}
-@if (otherLogins?.Count > 0)
-{
-    <h4>Add another service to log in.</h4>
-    <hr />
-    <form class="form-horizontal" action="Account/Manage/LinkExternalLogin" method="post">
-        <AntiforgeryToken />
-        <div>
-            <p>
-                @foreach (var provider in otherLogins)
-                {
-                    <button type="submit" class="btn btn-primary" name="Provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">
-                        @provider.DisplayName
-                    </button>
-                }
-            </p>
-        </div>
-    </form>
-}
-
-@code {
-    public const string LinkLoginCallbackAction = "LinkLoginCallback";
-
-    private ApplicationUser user = default!;
-    private IList<UserLoginInfo>? currentLogins;
-    private IList<AuthenticationScheme>? otherLogins;
-    private bool showRemoveButton;
-
-    [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
-
-    [SupplyParameterFromForm]
-    private string? LoginProvider { get; set; }
-
-    [SupplyParameterFromForm]
-    private string? ProviderKey { get; set; }
-
-    [SupplyParameterFromQuery]
-    private string? Action { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
-        currentLogins = await UserManager.GetLoginsAsync(user);
-        otherLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync())
-            .Where(auth => currentLogins.All(ul => auth.Name != ul.LoginProvider))
-            .ToList();
-
-        string? passwordHash = null;
-        if (UserStore is IUserPasswordStore<ApplicationUser> userPasswordStore)
-        {
-            passwordHash = await userPasswordStore.GetPasswordHashAsync(user, HttpContext.RequestAborted);
-        }
-
-        showRemoveButton = passwordHash is not null || currentLogins.Count > 1;
-
-        if (HttpMethods.IsGet(HttpContext.Request.Method) && Action == LinkLoginCallbackAction)
-        {
-            await OnGetLinkLoginCallbackAsync();
-        }
-    }
-
-    private async Task OnSubmitAsync()
-    {
-        var result = await UserManager.RemoveLoginAsync(user, LoginProvider!, ProviderKey!);
-        if (!result.Succeeded)
-        {
-            RedirectManager.RedirectToCurrentPageWithStatus("Error: The external login was not removed.", HttpContext);
-        }
-
-        await SignInManager.RefreshSignInAsync(user);
-        RedirectManager.RedirectToCurrentPageWithStatus("The external login was removed.", HttpContext);
-    }
-
-    private async Task OnGetLinkLoginCallbackAsync()
-    {
-        var userId = await UserManager.GetUserIdAsync(user);
-        var info = await SignInManager.GetExternalLoginInfoAsync(userId);
-        if (info is null)
-        {
-            RedirectManager.RedirectToCurrentPageWithStatus("Error: Could not load external login info.", HttpContext);
-        }
-
-        var result = await UserManager.AddLoginAsync(user, info);
-        if (!result.Succeeded)
-        {
-            RedirectManager.RedirectToCurrentPageWithStatus("Error: The external login was not added. External logins can only be associated with one account.", HttpContext);
-        }
-
-        // Clear the existing external cookie to ensure a clean login process
-        await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
-
-        RedirectManager.RedirectToCurrentPageWithStatus("The external login was added.", HttpContext);
-    }
-}
--- a/RobotApp/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor
+++ b/RobotApp/Components/Account/Pages/Manage/GenerateRecoveryCodes.razor
@@ -1,68 +0,0 @@
-@page "/Account/Manage/GenerateRecoveryCodes"
-
-@using Microsoft.AspNetCore.Identity
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject IdentityUserAccessor UserAccessor
-@inject IdentityRedirectManager RedirectManager
-@inject ILogger<GenerateRecoveryCodes> Logger
-
-<PageTitle>Generate two-factor authentication (2FA) recovery codes</PageTitle>
-
-@if (recoveryCodes is not null)
-{
-    <ShowRecoveryCodes RecoveryCodes="recoveryCodes.ToArray()" StatusMessage="@message" />
-}
-else
-{
-    <h3>Generate two-factor authentication (2FA) recovery codes</h3>
-    <div class="alert alert-warning" role="alert">
-        <p>
-            <span class="glyphicon glyphicon-warning-sign"></span>
-            <strong>Put these codes in a safe place.</strong>
-        </p>
-        <p>
-            If you lose your device and don't have the recovery codes you will lose access to your account.
-        </p>
-        <p>
-            Generating new recovery codes does not change the keys used in authenticator apps. If you wish to change the key
-            used in an authenticator app you should <a href="Account/Manage/ResetAuthenticator">reset your authenticator keys.</a>
-        </p>
-    </div>
-    <div>
-        <form @formname="generate-recovery-codes" @onsubmit="OnSubmitAsync" method="post">
-            <AntiforgeryToken />
-            <button class="btn btn-danger" type="submit">Generate Recovery Codes</button>
-        </form>
-    </div>
-}
-
-@code {
-    private string? message;
-    private ApplicationUser user = default!;
-    private IEnumerable<string>? recoveryCodes;
-
-    [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
-
-        var isTwoFactorEnabled = await UserManager.GetTwoFactorEnabledAsync(user);
-        if (!isTwoFactorEnabled)
-        {
-            throw new InvalidOperationException("Cannot generate recovery codes for user because they do not have 2FA enabled.");
-        }
-    }
-
-    private async Task OnSubmitAsync()
-    {
-        var userId = await UserManager.GetUserIdAsync(user);
-        recoveryCodes = await UserManager.GenerateNewTwoFactorRecoveryCodesAsync(user, 10);
-        message = "You have generated new recovery codes.";
-
-        Logger.LogInformation("User with ID '{UserId}' has generated new 2FA recovery codes.", userId);
-    }
-}
--- a/RobotApp/Components/Account/Pages/Manage/Index.razor
+++ b/RobotApp/Components/Account/Pages/Manage/Index.razor
@@ -1,77 +0,0 @@
-@page "/Account/Manage"
-
-@using System.ComponentModel.DataAnnotations
-@using Microsoft.AspNetCore.Identity
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject SignInManager<ApplicationUser> SignInManager
-@inject IdentityUserAccessor UserAccessor
-@inject IdentityRedirectManager RedirectManager
-
-<PageTitle>Profile</PageTitle>
-
-<h3>Profile</h3>
-<StatusMessage />
-
-<div class="row">
-    <div class="col-xl-6">
-        <EditForm Model="Input" FormName="profile" OnValidSubmit="OnValidSubmitAsync" method="post">
-            <DataAnnotationsValidator />
-            <ValidationSummary class="text-danger" role="alert" />
-            <div class="form-floating mb-3">
-                <input type="text" value="@username" id="username" class="form-control" placeholder="Choose your username." disabled />
-                <label for="username" class="form-label">Username</label>
-            </div>
-            <div class="form-floating mb-3">
-                <InputText @bind-Value="Input.PhoneNumber" id="Input.PhoneNumber" class="form-control" placeholder="Enter your phone number" />
-                <label for="Input.PhoneNumber" class="form-label">Phone number</label>
-                <ValidationMessage For="() => Input.PhoneNumber" class="text-danger" />
-            </div>
-            <button type="submit" class="w-100 btn btn-lg btn-primary">Save</button>
-        </EditForm>
-    </div>
-</div>
-
-@code {
-    private ApplicationUser user = default!;
-    private string? username;
-    private string? phoneNumber;
-
-    [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
-
-    [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
-
-    protected override async Task OnInitializedAsync()
-    {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
-        username = await UserManager.GetUserNameAsync(user);
-        phoneNumber = await UserManager.GetPhoneNumberAsync(user);
-
-        Input.PhoneNumber ??= phoneNumber;
-    }
-
-    private async Task OnValidSubmitAsync()
-    {
-        if (Input.PhoneNumber != phoneNumber)
-        {
-            var setPhoneResult = await UserManager.SetPhoneNumberAsync(user, Input.PhoneNumber);
-            if (!setPhoneResult.Succeeded)
-            {
-                RedirectManager.RedirectToCurrentPageWithStatus("Error: Failed to set phone number.", HttpContext);
-            }
-        }
-
-        await SignInManager.RefreshSignInAsync(user);
-        RedirectManager.RedirectToCurrentPageWithStatus("Your profile has been updated", HttpContext);
-    }
-
-    private sealed class InputModel
-    {
-        [Phone]
-        [Display(Name = "Phone number")]
-        public string? PhoneNumber { get; set; }
-    }
-}
--- a/RobotApp/Components/Account/Pages/Manage/PersonalData.razor
+++ b/RobotApp/Components/Account/Pages/Manage/PersonalData.razor
@@ -1,34 +0,0 @@
-@page "/Account/Manage/PersonalData"
-
-@inject IdentityUserAccessor UserAccessor
-
-<PageTitle>Personal Data</PageTitle>
-
-<StatusMessage />
-<h3>Personal Data</h3>
-
-<div class="row">
-    <div class="col-md-6">
-        <p>Your account contains personal data that you have given us. This page allows you to download or delete that data.</p>
-        <p>
-            <strong>Deleting this data will permanently remove your account, and this cannot be recovered.</strong>
-        </p>
-        <form action="Account/Manage/DownloadPersonalData" method="post">
-            <AntiforgeryToken />
-            <button class="btn btn-primary" type="submit">Download</button>
-        </form>
-        <p>
-            <a href="Account/Manage/DeletePersonalData" class="btn btn-danger">Delete</a>
-        </p>
-    </div>
-</div>
-
-@code {
-    [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        _ = await UserAccessor.GetRequiredUserAsync(HttpContext);
-    }
-}
--- a/RobotApp/Components/Account/Pages/Manage/ResetAuthenticator.razor
+++ b/RobotApp/Components/Account/Pages/Manage/ResetAuthenticator.razor
@@ -1,52 +0,0 @@
-@page "/Account/Manage/ResetAuthenticator"
-
-@using Microsoft.AspNetCore.Identity
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject SignInManager<ApplicationUser> SignInManager
-@inject IdentityUserAccessor UserAccessor
-@inject IdentityRedirectManager RedirectManager
-@inject ILogger<ResetAuthenticator> Logger
-
-<PageTitle>Reset authenticator key</PageTitle>
-
-<StatusMessage />
-<h3>Reset authenticator key</h3>
-<div class="alert alert-warning" role="alert">
-    <p>
-        <span class="glyphicon glyphicon-warning-sign"></span>
-        <strong>If you reset your authenticator key your authenticator app will not work until you reconfigure it.</strong>
-    </p>
-    <p>
-        This process disables 2FA until you verify your authenticator app.
-        If you do not complete your authenticator app configuration you may lose access to your account.
-    </p>
-</div>
-<div>
-    <form @formname="reset-authenticator" @onsubmit="OnSubmitAsync" method="post">
-        <AntiforgeryToken />
-        <button class="btn btn-danger" type="submit">Reset authenticator key</button>
-    </form>
-</div>
-
-@code {
-    [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
-
-    private async Task OnSubmitAsync()
-    {
-        var user = await UserAccessor.GetRequiredUserAsync(HttpContext);
-        await UserManager.SetTwoFactorEnabledAsync(user, false);
-        await UserManager.ResetAuthenticatorKeyAsync(user);
-        var userId = await UserManager.GetUserIdAsync(user);
-        Logger.LogInformation("User with ID '{UserId}' has reset their authentication app key.", userId);
-
-        await SignInManager.RefreshSignInAsync(user);
-
-        RedirectManager.RedirectToWithStatus(
-            "Account/Manage/EnableAuthenticator",
-            "Your authenticator app key has been reset, you will need to configure your authenticator app using the new key.",
-            HttpContext);
-    }
-}
--- a/RobotApp/Components/Account/Pages/Manage/SetPassword.razor
+++ b/RobotApp/Components/Account/Pages/Manage/SetPassword.razor
@@ -1,87 +0,0 @@
-@page "/Account/Manage/SetPassword"
-
-@using System.ComponentModel.DataAnnotations
-@using Microsoft.AspNetCore.Identity
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject SignInManager<ApplicationUser> SignInManager
-@inject IdentityUserAccessor UserAccessor
-@inject IdentityRedirectManager RedirectManager
-
-<PageTitle>Set password</PageTitle>
-
-<h3>Set your password</h3>
-<StatusMessage Message="@message" />
-<p class="text-info">
-    You do not have a local username/password for this site. Add a local
-    account so you can log in without an external login.
-</p>
-<div class="row">
-    <div class="col-xl-6">
-        <EditForm Model="Input" FormName="set-password" OnValidSubmit="OnValidSubmitAsync" method="post">
-            <DataAnnotationsValidator />
-            <ValidationSummary class="text-danger" role="alert" />
-            <div class="form-floating mb-3">
-                <InputText type="password" @bind-Value="Input.NewPassword" id="Input.NewPassword" class="form-control" autocomplete="new-password" placeholder="Enter the new password" />
-                <label for="Input.NewPassword" class="form-label">New password</label>
-                <ValidationMessage For="() => Input.NewPassword" class="text-danger" />
-            </div>
-            <div class="form-floating mb-3">
-                <InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" placeholder="Enter the new password" />
-                <label for="Input.ConfirmPassword" class="form-label">Confirm password</label>
-                <ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
-            </div>
-            <button type="submit" class="w-100 btn btn-lg btn-primary">Set password</button>
-        </EditForm>
-     </div>
-</div>
-
-@code {
-    private string? message;
-    private ApplicationUser user = default!;
-
-    [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
-
-    [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
-
-    protected override async Task OnInitializedAsync()
-    {
-        user = await UserAccessor.GetRequiredUserAsync(HttpContext);
-
-        var hasPassword = await UserManager.HasPasswordAsync(user);
-        if (hasPassword)
-        {
-            RedirectManager.RedirectTo("Account/Manage/ChangePassword");
-        }
-    }
-
-    private async Task OnValidSubmitAsync()
-    {
-        var addPasswordResult = await UserManager.AddPasswordAsync(user, Input.NewPassword!);
-        if (!addPasswordResult.Succeeded)
-        {
-            message = $"Error: {string.Join(",", addPasswordResult.Errors.Select(error => error.Description))}";
-            return;
-        }
-
-        await SignInManager.RefreshSignInAsync(user);
-        RedirectManager.RedirectToCurrentPageWithStatus("Your password has been set.", HttpContext);
-    }
-
-    private sealed class InputModel
-    {
-        [Required]
-        [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Password)]
-        [Display(Name = "New password")]
-        public string? NewPassword { get; set; }
-
-        [DataType(DataType.Password)]
-        [Display(Name = "Confirm new password")]
-        [Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
-        public string? ConfirmPassword { get; set; }
-    }
-}
--- a/RobotApp/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
+++ b/RobotApp/Components/Account/Pages/Manage/TwoFactorAuthentication.razor
@@ -1,101 +0,0 @@
-@page "/Account/Manage/TwoFactorAuthentication"
-
-@using Microsoft.AspNetCore.Http.Features
-@using Microsoft.AspNetCore.Identity
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject SignInManager<ApplicationUser> SignInManager
-@inject IdentityUserAccessor UserAccessor
-@inject IdentityRedirectManager RedirectManager
-
-<PageTitle>Two-factor authentication (2FA)</PageTitle>
-
-<StatusMessage />
-<h3>Two-factor authentication (2FA)</h3>
-@if (canTrack)
-{
-    if (is2faEnabled)
-    {
-        if (recoveryCodesLeft == 0)
-        {
-            <div class="alert alert-danger">
-                <strong>You have no recovery codes left.</strong>
-                <p>You must <a href="Account/Manage/GenerateRecoveryCodes">generate a new set of recovery codes</a> before you can log in with a recovery code.</p>
-            </div>
-        }
-        else if (recoveryCodesLeft == 1)
-        {
-            <div class="alert alert-danger">
-                <strong>You have 1 recovery code left.</strong>
-                <p>You can <a href="Account/Manage/GenerateRecoveryCodes">generate a new set of recovery codes</a>.</p>
-            </div>
-        }
-        else if (recoveryCodesLeft <= 3)
-        {
-            <div class="alert alert-warning">
-                <strong>You have @recoveryCodesLeft recovery codes left.</strong>
-                <p>You should <a href="Account/Manage/GenerateRecoveryCodes">generate a new set of recovery codes</a>.</p>
-            </div>
-        }
-
-        if (isMachineRemembered)
-        {
-            <form style="display: inline-block" @formname="forget-browser" @onsubmit="OnSubmitForgetBrowserAsync" method="post">
-                <AntiforgeryToken />
-                <button type="submit" class="btn btn-primary">Forget this browser</button>
-            </form>
-        }
-
-        <a href="Account/Manage/Disable2fa" class="btn btn-primary">Disable 2FA</a>
-        <a href="Account/Manage/GenerateRecoveryCodes" class="btn btn-primary">Reset recovery codes</a>
-    }
-
-    <h4>Authenticator app</h4>
-    @if (!hasAuthenticator)
-    {
-        <a href="Account/Manage/EnableAuthenticator" class="btn btn-primary">Add authenticator app</a>
-    }
-    else
-    {
-        <a href="Account/Manage/EnableAuthenticator" class="btn btn-primary">Set up authenticator app</a>
-        <a href="Account/Manage/ResetAuthenticator" class="btn btn-primary">Reset authenticator app</a>
-    }
-}
-else
-{
-    <div class="alert alert-danger">
-        <strong>Privacy and cookie policy have not been accepted.</strong>
-        <p>You must accept the policy before you can enable two factor authentication.</p>
-    </div>
-}
-
-@code {
-    private bool canTrack;
-    private bool hasAuthenticator;
-    private int recoveryCodesLeft;
-    private bool is2faEnabled;
-    private bool isMachineRemembered;
-
-    [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
-
-    protected override async Task OnInitializedAsync()
-    {
-        var user = await UserAccessor.GetRequiredUserAsync(HttpContext);
-        canTrack = HttpContext.Features.Get<ITrackingConsentFeature>()?.CanTrack ?? true;
-        hasAuthenticator = await UserManager.GetAuthenticatorKeyAsync(user) is not null;
-        is2faEnabled = await UserManager.GetTwoFactorEnabledAsync(user);
-        isMachineRemembered = await SignInManager.IsTwoFactorClientRememberedAsync(user);
-        recoveryCodesLeft = await UserManager.CountRecoveryCodesAsync(user);
-    }
-
-    private async Task OnSubmitForgetBrowserAsync()
-    {
-        await SignInManager.ForgetTwoFactorClientAsync();
-
-        RedirectManager.RedirectToCurrentPageWithStatus(
-            "The current browser has been forgotten. When you login again from this browser you will be prompted for your 2fa code.",
-            HttpContext);
-    }
-}
--- a/RobotApp/Components/Account/Pages/Manage/_Imports.razor
+++ b/RobotApp/Components/Account/Pages/Manage/_Imports.razor
@@ -1,2 +0,0 @@
-@layout ManageLayout
-@attribute [Microsoft.AspNetCore.Authorization.Authorize]
--- a/RobotApp/Components/Account/Pages/Register.razor
+++ b/RobotApp/Components/Account/Pages/Register.razor
@@ -1,145 +0,0 @@
-@page "/Account/Register"
-
-@using System.ComponentModel.DataAnnotations
-@using System.Text
-@using System.Text.Encodings.Web
-@using Microsoft.AspNetCore.Identity
-@using Microsoft.AspNetCore.WebUtilities
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject IUserStore<ApplicationUser> UserStore
-@inject SignInManager<ApplicationUser> SignInManager
-@inject IEmailSender<ApplicationUser> EmailSender
-@inject ILogger<Register> Logger
-@inject NavigationManager NavigationManager
-@inject IdentityRedirectManager RedirectManager
-
-<PageTitle>Register</PageTitle>
-
-<h1>Register</h1>
-
-<div class="row">
-    <div class="col-lg-6">
-        <StatusMessage Message="@Message" />
-        <EditForm Model="Input" asp-route-returnUrl="@ReturnUrl" method="post" OnValidSubmit="RegisterUser" FormName="register">
-            <DataAnnotationsValidator />
-            <h2>Create a new account.</h2>
-            <hr />
-            <ValidationSummary class="text-danger" role="alert" />
-            <div class="form-floating mb-3">
-                <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
-                <label for="Input.Email">Email</label>
-                <ValidationMessage For="() => Input.Email" class="text-danger" />
-            </div>
-            <div class="form-floating mb-3">
-                <InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
-                <label for="Input.Password">Password</label>
-                <ValidationMessage For="() => Input.Password" class="text-danger" />
-            </div>
-            <div class="form-floating mb-3">
-                <InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
-                <label for="Input.ConfirmPassword">Confirm Password</label>
-                <ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
-            </div>
-            <button type="submit" class="w-100 btn btn-lg btn-primary">Register</button>
-        </EditForm>
-    </div>
-    <div class="col-lg-4 col-lg-offset-2">
-        <section>
-            <h3>Use another service to register.</h3>
-            <hr />
-            <ExternalLoginPicker />
-        </section>
-    </div>
-</div>
-
-@code {
-    private IEnumerable<IdentityError>? identityErrors;
-
-    [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
-
-    [SupplyParameterFromQuery]
-    private string? ReturnUrl { get; set; }
-
-    private string? Message => identityErrors is null ? null : $"Error: {string.Join(", ", identityErrors.Select(error => error.Description))}";
-
-    public async Task RegisterUser(EditContext editContext)
-    {
-        var user = CreateUser();
-
-        await UserStore.SetUserNameAsync(user, Input.Email, CancellationToken.None);
-        var emailStore = GetEmailStore();
-        await emailStore.SetEmailAsync(user, Input.Email, CancellationToken.None);
-        var result = await UserManager.CreateAsync(user, Input.Password);
-
-        if (!result.Succeeded)
-        {
-            identityErrors = result.Errors;
-            return;
-        }
-
-        Logger.LogInformation("User created a new account with password.");
-
-        var userId = await UserManager.GetUserIdAsync(user);
-        var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
-        code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
-        var callbackUrl = NavigationManager.GetUriWithQueryParameters(
-            NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
-            new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code, ["returnUrl"] = ReturnUrl });
-
-        await EmailSender.SendConfirmationLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
-
-        if (UserManager.Options.SignIn.RequireConfirmedAccount)
-        {
-            RedirectManager.RedirectTo(
-                "Account/RegisterConfirmation",
-                new() { ["email"] = Input.Email, ["returnUrl"] = ReturnUrl });
-        }
-
-        await SignInManager.SignInAsync(user, isPersistent: false);
-        RedirectManager.RedirectTo(ReturnUrl);
-    }
-
-    private ApplicationUser CreateUser()
-    {
-        try
-        {
-            return Activator.CreateInstance<ApplicationUser>();
-        }
-        catch
-        {
-            throw new InvalidOperationException($"Can't create an instance of '{nameof(ApplicationUser)}'. " +
-                $"Ensure that '{nameof(ApplicationUser)}' is not an abstract class and has a parameterless constructor.");
-        }
-    }
-
-    private IUserEmailStore<ApplicationUser> GetEmailStore()
-    {
-        if (!UserManager.SupportsUserEmail)
-        {
-            throw new NotSupportedException("The default UI requires a user store with email support.");
-        }
-        return (IUserEmailStore<ApplicationUser>)UserStore;
-    }
-
-    private sealed class InputModel
-    {
-        [Required]
-        [EmailAddress]
-        [Display(Name = "Email")]
-        public string Email { get; set; } = "";
-
-        [Required]
-        [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Password)]
-        [Display(Name = "Password")]
-        public string Password { get; set; } = "";
-
-        [DataType(DataType.Password)]
-        [Display(Name = "Confirm password")]
-        [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; } = "";
-    }
-}
--- a/RobotApp/Components/Account/Pages/RegisterConfirmation.razor
+++ b/RobotApp/Components/Account/Pages/RegisterConfirmation.razor
@@ -1,68 +0,0 @@
-@page "/Account/RegisterConfirmation"
-
-@using System.Text
-@using Microsoft.AspNetCore.Identity
-@using Microsoft.AspNetCore.WebUtilities
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject IEmailSender<ApplicationUser> EmailSender
-@inject NavigationManager NavigationManager
-@inject IdentityRedirectManager RedirectManager
-
-<PageTitle>Register confirmation</PageTitle>
-
-<h1>Register confirmation</h1>
-
-<StatusMessage Message="@statusMessage" />
-
-@if (emailConfirmationLink is not null)
-{
-    <p>
-        This app does not currently have a real email sender registered, see <a href="https://aka.ms/aspaccountconf">these docs</a> for how to configure a real email sender.
-        Normally this would be emailed: <a href="@emailConfirmationLink">Click here to confirm your account</a>
-    </p>
-}
-else
-{
-    <p role="alert">Please check your email to confirm your account.</p>
-}
-
-@code {
-    private string? emailConfirmationLink;
-    private string? statusMessage;
-
-    [CascadingParameter]
-    private HttpContext HttpContext { get; set; } = default!;
-
-    [SupplyParameterFromQuery]
-    private string? Email { get; set; }
-
-    [SupplyParameterFromQuery]
-    private string? ReturnUrl { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        if (Email is null)
-        {
-            RedirectManager.RedirectTo("");
-        }
-
-        var user = await UserManager.FindByEmailAsync(Email);
-        if (user is null)
-        {
-            HttpContext.Response.StatusCode = StatusCodes.Status404NotFound;
-            statusMessage = "Error finding user for unspecified email";
-        }
-        else if (EmailSender is IdentityNoOpEmailSender)
-        {
-            // Once you add a real email sender, you should remove this code that lets you confirm the account
-            var userId = await UserManager.GetUserIdAsync(user);
-            var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
-            code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
-            emailConfirmationLink = NavigationManager.GetUriWithQueryParameters(
-                NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
-                new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code, ["returnUrl"] = ReturnUrl });
-        }
-    }
-}
--- a/RobotApp/Components/Account/Pages/ResendEmailConfirmation.razor
+++ b/RobotApp/Components/Account/Pages/ResendEmailConfirmation.razor
@@ -1,68 +0,0 @@
-@page "/Account/ResendEmailConfirmation"
-
-@using System.ComponentModel.DataAnnotations
-@using System.Text
-@using System.Text.Encodings.Web
-@using Microsoft.AspNetCore.Identity
-@using Microsoft.AspNetCore.WebUtilities
-@using RobotApp.Data
-
-@inject UserManager<ApplicationUser> UserManager
-@inject IEmailSender<ApplicationUser> EmailSender
-@inject NavigationManager NavigationManager
-@inject IdentityRedirectManager RedirectManager
-
-<PageTitle>Resend email confirmation</PageTitle>
-
-<h1>Resend email confirmation</h1>
-<h2>Enter your email.</h2>
-<hr />
-<StatusMessage Message="@message" />
-<div class="row">
-    <div class="col-md-4">
-        <EditForm Model="Input" FormName="resend-email-confirmation" OnValidSubmit="OnValidSubmitAsync" method="post">
-            <DataAnnotationsValidator />
-            <ValidationSummary class="text-danger" role="alert" />
-            <div class="form-floating mb-3">
-                <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" aria-required="true" placeholder="name@example.com" />
-                <label for="Input.Email" class="form-label">Email</label>
-                <ValidationMessage For="() => Input.Email" class="text-danger" />
-            </div>
-            <button type="submit" class="w-100 btn btn-lg btn-primary">Resend</button>
-        </EditForm>
-    </div>
-</div>
-
-@code {
-    private string? message;
-
-    [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
-
-    private async Task OnValidSubmitAsync()
-    {
-        var user = await UserManager.FindByEmailAsync(Input.Email!);
-        if (user is null)
-        {
-            message = "Verification email sent. Please check your email.";
-            return;
-        }
-
-        var userId = await UserManager.GetUserIdAsync(user);
-        var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
-        code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
-        var callbackUrl = NavigationManager.GetUriWithQueryParameters(
-            NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
-            new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code });
-        await EmailSender.SendConfirmationLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
-
-        message = "Verification email sent. Please check your email.";
-    }
-
-    private sealed class InputModel
-    {
-        [Required]
-        [EmailAddress]
-        public string Email { get; set; } = "";
-    }
-}
--- a/RobotApp/Components/Account/Pages/ResetPassword.razor
+++ b/RobotApp/Components/Account/Pages/ResetPassword.razor
@@ -1,103 +0,0 @@
-@page "/Account/ResetPassword"
-
-@using System.ComponentModel.DataAnnotations
-@using System.Text
-@using Microsoft.AspNetCore.Identity
-@using Microsoft.AspNetCore.WebUtilities
-@using RobotApp.Data
-
-@inject IdentityRedirectManager RedirectManager
-@inject UserManager<ApplicationUser> UserManager
-
-<PageTitle>Reset password</PageTitle>
-
-<h1>Reset password</h1>
-<h2>Reset your password.</h2>
-<hr />
-<div class="row">
-    <div class="col-md-4">
-        <StatusMessage Message="@Message" />
-        <EditForm Model="Input" FormName="reset-password" OnValidSubmit="OnValidSubmitAsync" method="post">
-            <DataAnnotationsValidator />
-            <ValidationSummary class="text-danger" role="alert" />
-
-            <input type="hidden" name="Input.Code" value="@Input.Code" />
-            <div class="form-floating mb-3">
-                <InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
-                <label for="Input.Email" class="form-label">Email</label>
-                <ValidationMessage For="() => Input.Email" class="text-danger" />
-            </div>
-            <div class="form-floating mb-3">
-                <InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Please enter your password." />
-                <label for="Input.Password" class="form-label">Password</label>
-                <ValidationMessage For="() => Input.Password" class="text-danger" />
-            </div>
-            <div class="form-floating mb-3">
-                <InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Please confirm your password." />
-                <label for="Input.ConfirmPassword" class="form-label">Confirm password</label>
-                <ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
-            </div>
-            <button type="submit" class="w-100 btn btn-lg btn-primary">Reset</button>
-        </EditForm>
-    </div>
-</div>
-
-@code {
-    private IEnumerable<IdentityError>? identityErrors;
-
-    [SupplyParameterFromForm]
-    private InputModel Input { get; set; } = new();
-
-    [SupplyParameterFromQuery]
-    private string? Code { get; set; }
-
-    private string? Message => identityErrors is null ? null : $"Error: {string.Join(", ", identityErrors.Select(error => error.Description))}";
-
-    protected override void OnInitialized()
-    {
-        if (Code is null)
-        {
-            RedirectManager.RedirectTo("Account/InvalidPasswordReset");
-        }
-
-        Input.Code = Encoding.UTF8.GetString(WebEncoders.Base64UrlDecode(Code));
-    }
-
-    private async Task OnValidSubmitAsync()
-    {
-        var user = await UserManager.FindByEmailAsync(Input.Email);
-        if (user is null)
-        {
-            // Don't reveal that the user does not exist
-            RedirectManager.RedirectTo("Account/ResetPasswordConfirmation");
-        }
-
-        var result = await UserManager.ResetPasswordAsync(user, Input.Code, Input.Password);
-        if (result.Succeeded)
-        {
-            RedirectManager.RedirectTo("Account/ResetPasswordConfirmation");
-        }
-
-        identityErrors = result.Errors;
-    }
-
-    private sealed class InputModel
-    {
-        [Required]
-        [EmailAddress]
-        public string Email { get; set; } = "";
-
-        [Required]
-        [StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
-        [DataType(DataType.Password)]
-        public string Password { get; set; } = "";
-
-        [DataType(DataType.Password)]
-        [Display(Name = "Confirm password")]
-        [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
-        public string ConfirmPassword { get; set; } = "";
-
-        [Required]
-        public string Code { get; set; } = "";
-    }
-}
--- a/RobotApp/Components/Account/Pages/ResetPasswordConfirmation.razor
+++ b/RobotApp/Components/Account/Pages/ResetPasswordConfirmation.razor
@@ -1,7 +0,0 @@
-@page "/Account/ResetPasswordConfirmation"
-<PageTitle>Reset password confirmation</PageTitle>
-
-<h1>Reset password confirmation</h1>
-<p role="alert">
-    Your password has been reset. Please <a href="Account/Login">click here to log in</a>.
-</p>
--- a/RobotApp/Components/Account/Shared/ExternalLoginPicker.razor
+++ b/RobotApp/Components/Account/Shared/ExternalLoginPicker.razor
@@ -1,43 +0,0 @@
-@using Microsoft.AspNetCore.Authentication
-@using Microsoft.AspNetCore.Identity
-@using RobotApp.Data
-
-@inject SignInManager<ApplicationUser> SignInManager
-@inject IdentityRedirectManager RedirectManager
-
-@if (externalLogins.Length == 0)
-{
-    <div>
-        <p>
-            There are no external authentication services configured. See this <a href="https://go.microsoft.com/fwlink/?LinkID=532715">article
-            about setting up this ASP.NET application to support logging in via external services</a>.
-        </p>
-    </div>
-}
-else
-{
-    <form class="form-horizontal" action="Account/PerformExternalLogin" method="post">
-        <div>
-            <AntiforgeryToken />
-            <input type="hidden" name="ReturnUrl" value="@ReturnUrl" />
-            <p>
-                @foreach (var provider in externalLogins)
-                {
-                    <button type="submit" class="btn btn-primary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
-                }
-            </p>
-        </div>
-    </form>
-}
-
-@code {
-    private AuthenticationScheme[] externalLogins = [];
-
-    [SupplyParameterFromQuery]
-    private string? ReturnUrl { get; set; }
-
-    protected override async Task OnInitializedAsync()
-    {
-        externalLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync()).ToArray();
-    }
-}
--- a/RobotApp/Components/Account/Shared/ManageLayout.razor
+++ b/RobotApp/Components/Account/Shared/ManageLayout.razor
@@ -1,17 +0,0 @@
-@inherits LayoutComponentBase
-@layout RobotApp.Client.Layout.MainLayout
-
-<h1>Manage your account</h1>
-
-<div>
-    <h2>Change your account settings</h2>
-    <hr />
-    <div class="row">
-        <div class="col-lg-3">
-            <ManageNavMenu />
-        </div>
-        <div class="col-lg-9">
-            @Body
-        </div>
-    </div>
-</div>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Đăng Nguyễn	6cd32f8c98	update	2025-12-20 15:16:59 +07:00
Đăng Nguyễn	dd8c17cb6c	update	2025-12-17 15:34:15 +07:00
Đăng Nguyễn	c35da9a73f	update with speed 2.0 m/s	2025-11-13 10:02:04 +07:00
Đăng Nguyễn	3b088a6d5d	update connect synaos	2025-11-12 14:03:04 +07:00
Đăng Nguyễn	8736bad3e7	update	2025-11-06 14:14:10 +07:00
Đăng Nguyễn	99716cc414	update	2025-11-06 09:22:55 +07:00
Đăng Nguyễn	73038de662	update	2025-11-04 10:57:41 +07:00
Đăng Nguyễn	70e27da4a2	update	2025-11-03 10:29:18 +07:00
Đăng Nguyễn	aea55d52f1	update	2025-10-31 15:03:37 +07:00
Đăng Nguyễn	aa2146e383	update	2025-10-30 13:34:44 +07:00
Đăng Nguyễn	643a34a4b4	update	2025-10-28 17:28:46 +07:00
Đăng Nguyễn	6eeed8c7b4	update	2025-10-24 17:09:00 +07:00
Đăng Nguyễn	a01f140f2e	update	2025-10-24 10:24:59 +07:00
Đăng Nguyễn	ab5d3e1a1a	update	2025-10-22 11:16:19 +07:00
Đăng Nguyễn	9ac5270885	update	2025-10-17 09:24:45 +07:00
Đăng Nguyễn	90dcb67b60	update	2025-10-16 14:53:22 +07:00
Đăng Nguyễn	b2df5b22b7	update	2025-10-13 13:17:32 +07:00
Đăng Nguyễn	511614df72	update	2025-10-03 11:37:39 +07:00
Đăng Nguyễn	c5686e4ecf	update	2025-10-03 11:31:14 +07:00
Đăng Nguyễn	2853340856	draw images map	2025-10-02 17:28:04 +07:00
Đăng Nguyễn	811a5821ba	update mouse indicator	2025-10-02 14:16:20 +07:00
Đăng Nguyễn	3b44ea6d8d	update ruller	2025-10-02 11:02:44 +07:00
Đăng Nguyễn	93097412b0	update move. scale mapping	2025-10-02 09:49:16 +07:00
Đăng Nguyễn	2640fb92c1	update	2025-09-27 14:47:42 +07:00
Đăng Nguyễn	2bbcc19076	merge	2025-09-26 13:41:14 +07:00
Đăng Nguyễn	4330879411	udpate main layout	2025-09-26 10:55:39 +07:00
Đăng Nguyễn	7c4404ec3d	update	2025-09-26 09:44:36 +07:00
Đăng Nguyễn	70eac8a9c8	update identity	2025-09-26 09:37:06 +07:00
Đăng Nguyễn	a3ecde2815	merge dungtt	2025-09-26 08:51:23 +07:00
Đăng Nguyễn	d6fe1d9d52	update	2025-09-26 08:48:50 +07:00
dungtt	52c5ef0d54	đổi layout login	2025-09-10 17:44:48 +07:00
dungtt	a91717d880	thay dổi layout	2025-09-10 15:55:04 +07:00