From 43308794118e497f7885be1e90c00c533b04baa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90=C4=83ng=20Nguy=E1=BB=85n?= <dangnv2512@gmail.com>
Date: Fri, 26 Sep 2025 10:55:39 +0700
Subject: [PATCH] udpate main layout

---
 RobotApp.Client/Layout/MainLayout.razor.css |  14 ++++++++---
 RobotApp.Client/Layout/NavMenu.razor        |  21 +++++++++++++++-
 RobotApp.Client/Layout/NavMenu.razor.css    |  11 ++++-----
 RobotApp.Client/Pages/Home.razor            |   2 +-
 RobotApp.Client/Routes.razor                |  18 --------------
 RobotApp/Components/App.razor               |  26 +++++++++++++++-----
 RobotApp/Program.cs                         |   1 +
 RobotApp/RobotApp.csproj                    |   1 -
 RobotApp/libman.json                        |  15 -----------
 RobotApp/robot.db                           | Bin 167936 -> 167936 bytes
 RobotApp/wwwroot/app.css                    |   2 ++
 RobotApp/wwwroot/favicon.png                | Bin 1148 -> 0 bytes
 RobotApp/wwwroot/favicon.svg                |   5 ++++
 13 files changed, 64 insertions(+), 52 deletions(-)
 delete mode 100644 RobotApp.Client/Routes.razor
 delete mode 100644 RobotApp/libman.json
 delete mode 100644 RobotApp/wwwroot/favicon.png
 create mode 100644 RobotApp/wwwroot/favicon.svg

diff --git a/RobotApp.Client/Layout/MainLayout.razor.css b/RobotApp.Client/Layout/MainLayout.razor.css
index 784b896..da43ded 100644
--- a/RobotApp.Client/Layout/MainLayout.razor.css
+++ b/RobotApp.Client/Layout/MainLayout.razor.css
@@ -1,11 +1,17 @@
 
 .app-shell {
     display: flex;
-    min-height: 100vh; 
+    min-height: 100vh;
+    min-width: 100vw;
+    width: 100vw;
+    height: 100vh;
+    overflow: hidden;
+    flex-direction: row;
 }
 
 .page {
-    flex: 1 1 auto; 
-    min-width: 0; 
-    overflow: auto; 
+    flex: 1 1 auto;
+    min-width: 0;
+    display: flex;
+    overflow: hidden;
 }
diff --git a/RobotApp.Client/Layout/NavMenu.razor b/RobotApp.Client/Layout/NavMenu.razor
index 9e1e064..da332e9 100644
--- a/RobotApp.Client/Layout/NavMenu.razor
+++ b/RobotApp.Client/Layout/NavMenu.razor
@@ -31,6 +31,25 @@
         }
     </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 name" 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>
 
@@ -45,7 +64,7 @@
 
     public NavModel[] Navs = [
         new(){Icon = "mdi-view-dashboard", Path="/", Label = "Dashboard", Match = NavLinkMatch.All},
-        new(){Icon = "mdi-map-legend", Path="/", Label = "Maps-manager", Match = NavLinkMatch.All},
+        new(){Icon = "mdi-map-legend", Path="/Maps-manager", Label = "Mapping", Match = NavLinkMatch.All},
     ];
 
     private bool collapseNavMenu = true;
diff --git a/RobotApp.Client/Layout/NavMenu.razor.css b/RobotApp.Client/Layout/NavMenu.razor.css
index 681b4a7..f4221f4 100644
--- a/RobotApp.Client/Layout/NavMenu.razor.css
+++ b/RobotApp.Client/Layout/NavMenu.razor.css
@@ -48,10 +48,9 @@
                 display: flex;
             }
 
-    /*.sidebar .title .button {
-        display: flex;
-        border-radius: 20px;
-    }*/
+        .sidebar.collapsed .nav-label {
+            display: none;
+        }
 
     .sidebar .title .button:hover {
         background-color: rgb(5, 39, 80);
@@ -67,8 +66,8 @@
         display: none !important;
     }
 
-    .sidebar.collapsed .nav-label {
-        display: none;
+    .sidebar.collapsed .user .nav-label {
+        display: none !important;
     }
 
 .nav-item {
diff --git a/RobotApp.Client/Pages/Home.razor b/RobotApp.Client/Pages/Home.razor
index 2f4fa1a..84411a1 100644
--- a/RobotApp.Client/Pages/Home.razor
+++ b/RobotApp.Client/Pages/Home.razor
@@ -1,4 +1,4 @@
 @page "/"
 @using Microsoft.AspNetCore.Authorization
 @attribute [Authorize]
-<h1>Welcome to RobotApp!</h1>
\ No newline at end of file
+<h1>Welcome to RobotApp!</h1>
diff --git a/RobotApp.Client/Routes.razor b/RobotApp.Client/Routes.razor
deleted file mode 100644
index f913b39..0000000
--- a/RobotApp.Client/Routes.razor
+++ /dev/null
@@ -1,18 +0,0 @@
-@using RobotApp.Client.Layout
-
-<CascadingAuthenticationState>
-    <Router AppAssembly="@typeof(Program).Assembly">
-        <Found Context="routeData">
-            <AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(MainLayout)">
-                <NotAuthorized>
-                    <RedirectToLogin />
-                </NotAuthorized>
-            </AuthorizeRouteView>
-        </Found>
-        <NotFound>
-            <LayoutView Layout="typeof(MainLayout)">
-                <p>Không tìm thấy trang.</p>
-            </LayoutView>
-        </NotFound>
-    </Router>
-</CascadingAuthenticationState>
diff --git a/RobotApp/Components/App.razor b/RobotApp/Components/App.razor
index d164f11..e304093 100644
--- a/RobotApp/Components/App.razor
+++ b/RobotApp/Components/App.razor
@@ -5,27 +5,41 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <base href="/" />
-    <link rel="stylesheet" href="_content/MudBlazor/MudBlazor.min.css" />
     <link rel="stylesheet" href="@Assets["lib/bootstrap/css/bootstrap.min.css"]" />
     <link rel="stylesheet" href="@Assets["lib/mdi/font/css/materialdesignicons.min.css"]" />
-    <link rel="stylesheet" href="@Assets["lib/bootstrap/dist/css/bootstrap.min.css"]" />
     <link rel="stylesheet" href="@Assets["app.css"]" />
     <link rel="stylesheet" href="@Assets["RobotApp.styles.css"]" />
-    <ImportMap />
+    <link rel="stylesheet" href="@Assets["_content/MudBlazor/MudBlazor.min.css"]" />
     <link rel="icon" type="image/png" href="favicon.png" />
+    <ImportMap />
     <ImportMap @rendermode="InteractiveServer" />
     <HeadOutlet @rendermode="InteractiveServer" />
 </head>
 
 <body>
-   
-    <Routes />
+    <CascadingAuthenticationState>
+        <Router AppAssembly="@typeof(Program).Assembly">
+            <Found Context="routeData">
+                <AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(RobotApp.Client.Layout.MainLayout)">
+                    <NotAuthorized>
+                        <RedirectToLogin />
+                    </NotAuthorized>
+                </AuthorizeRouteView>
+            </Found>
+            <NotFound>
+                <PageTitle>Not found</PageTitle>
+                <LayoutView Layout="typeof(RobotApp.Client.Layout.MainLayout)">
+                    <p>Không tìm thấy trang.</p>
+                </LayoutView>
+            </NotFound>
+        </Router>
+    </CascadingAuthenticationState>
+
 
     <script src="_framework/blazor.web.js"></script>
     <script src="@Assets["lib/bootstrap/js/bootstrap.bundle.min.js"]"></script>
     <script src="@Assets["lib/bootstrap/js/bootstrap.min.js"]"></script>
     <script src="_content/MudBlazor/MudBlazor.min.js"></script>
-    
 </body>
 
 </html>
diff --git a/RobotApp/Program.cs b/RobotApp/Program.cs
index e81d55c..353c5dd 100644
--- a/RobotApp/Program.cs
+++ b/RobotApp/Program.cs
@@ -6,6 +6,7 @@ using RobotApp.Components;
 using RobotApp.Components.Account;
 using RobotApp.Data;
 using RobotApp.Services.Robot;
+using RobotApp.Client;
 
 var builder = WebApplication.CreateBuilder(args);
 
diff --git a/RobotApp/RobotApp.csproj b/RobotApp/RobotApp.csproj
index 2e851d5..64234bd 100644
--- a/RobotApp/RobotApp.csproj
+++ b/RobotApp/RobotApp.csproj
@@ -32,7 +32,6 @@
 
   <ItemGroup>
     <Folder Include="Services\Robot\Simulation\" />
-    <Folder Include="wwwroot\lib\" />
   </ItemGroup>
 
 </Project>
diff --git a/RobotApp/libman.json b/RobotApp/libman.json
deleted file mode 100644
index f2868d8..0000000
--- a/RobotApp/libman.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "version": "3.0",
-  "defaultProvider": "jsdelivr",
-  "libraries": [
-    {
-      "library": "@mdi/font@7.4.47",
-      "destination": "wwwroot/lib/mdi/font/"
-    },
-    {
-      "provider": "cdnjs",
-      "library": "bootstrap@5.3.8",
-      "destination": "wwwroot/lib/bootstrap/"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/RobotApp/robot.db b/RobotApp/robot.db
index fa4a3f5516333b458dac1571157eeee8395fb3d2..835920118d498b80551cd9a6bb1ba48a016a1330 100644
GIT binary patch
delta 47
zcmZozz}2vTYl1YR?L--8M%#@E-ST|KR;H#_hDLhEMh3>_hRr|a+keV4ZvQFI#9jaZ
DRa6d&

delta 47
zcmZozz}2vTYl1YR<U|=~M#+r{-ST`!Rwl+)hK70u78WKZCe1(P+keV4ZvQFI#9jaZ
DOQ#M=

diff --git a/RobotApp/wwwroot/app.css b/RobotApp/wwwroot/app.css
index 73a69d6..20751b3 100644
--- a/RobotApp/wwwroot/app.css
+++ b/RobotApp/wwwroot/app.css
@@ -1,5 +1,7 @@
 html, body {
     font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+    width: 100vw;
+    height: 100vh;
 }
 
 a, .btn-link {
diff --git a/RobotApp/wwwroot/favicon.png b/RobotApp/wwwroot/favicon.png
deleted file mode 100644
index 8422b59695935d180d11d5dbe99653e711097819..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1148
zcmV-?1cUpDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000C-Nkl<ZcwWU;
zO>9h26h2-Cs%i*@Moc3?#6qJID|D#|3|2Hn7gTIYEkr|%Xjp);YgvFmB&0#2E2b=|
zkVr)lMv9=KqwN&%obTp-$<51T%rx*NCwceh-E+=&e(oLO`@Z~7gybJ#U|^tB2Pai}
zRN@5%1qsZ1e@R(XC8n~)nU1S0QdzEYlWPdUpH{wJ2Pd4V8kI3BM=)sG^IkUXF2-j{
zrPTYA6sxpQ`Q1c6mtar~gG<Lg%I#~t@~C|P!>~#;lt=s^6_OccmRd>o{*=>)KS=lM
zZ!)i<P%Q0|?EEU1kAD=P?OLDADld?120$rj+hRS4NDjEA-oeZ6H{WIDhOq)rd1LKs
zA;16)&u9P=#L^a~SIN#V=AeH4CR_zLG~LHFk%dc(1ZX{<f>G|8G0-9s3VLm`bsa6e
ze*TlRxAjXtm^F8V`M1%s5d@tYS>&+_ga#xKGb|!oUBx3uc@mj1%=MaH4GR0tPBG_&
z9OZE;->dO@`Q)nr<%<fXa`k8?4Z&C%dLP~UEct@Ycvd;GyUtY(kGCF}DD?*?%J`C@
za^}znBof7pft}4I*oXatZ^gDnYP?fW&Vym4QPg@NB|*Sz%!45`7VK}R>dHAsEZRKl
zedN6+3+uGHejJp;Q==pskSAcRcyh@6mjm2z-uG;s%dM-u0*u##7OxI7wwyCGpS?4U
zBFAr(%GBv5j$jS@@t@iI8?ZqE36I^4t+P^<BNtG=RK6b>J9D^ELb<D+?^4>S5KMtZ
z{Qn#JnSd$15nJ$ggkF%I4yUQC+BjDF^}AtB7w348EL>7#sAsLWs}ndp8^DsAcOIL9
zTOO!!0!k2`9BLk25)NeZp7ev>I1Mn={cWI3Yhx2Q#DnAo4IphoV~R^c0x&nw*MoIV
zPthX?{6{u}sMS(MxD*dmd5rU(YazQE59b|TsB5Tm)I4a!VaN@HYOR)DwH1U5y(E)z
zQqQU*B%MwtRQ$%x&;1p%ANmc|PkoFJZ%<-uq%PX&C!c-7ypis=eP+FCeuv+B@h#{4
zGx1m0PjS~FJt}3mdt4c!lel`1;4W|03kcZRG+DzkTy|7-F~eDsV2Tx!73dM0H0CTh
zl)F-YUkE1zEzEW(;JXc|KR5{ox%YTh<unqM?>{$%F$a36JP6Nb<0%#NbSh$dMYF-{
z1_x(Vx<DO3w>)}fs?5_|!5xBTWiiIQHG<%)*e=45Fhjw_tlnmlixq;mUdC$R8v#j(
zhQ$9YR-o%i5Uc`S?6EC51!bTRK=Xkyb<18FkCKnS2;o*qlij1YA@-nRpq#O<q4G=!
zzKEi>MTX&RbL<^2q@0qja!uIvI;j$6>~k@IMwD42=8$$!+R^@5o6HX(*n~<o%gZYY
znQ+7&mAGYA@-ZOzGKNGXHzZ*=gl!fWtN{d{Ym^|M2oxuRROe;D|HLmw44&4v_=AK1
O0000<MNUMnLSTZaoDyOH

diff --git a/RobotApp/wwwroot/favicon.svg b/RobotApp/wwwroot/favicon.svg
new file mode 100644
index 0000000..b07dbc4
--- /dev/null
+++ b/RobotApp/wwwroot/favicon.svg
@@ -0,0 +1,5 @@
+<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>
\ No newline at end of file