Merge pull request #172 from fluentcms/171-cleanup-for-bootstrap-blaz…

…or-server-app #171 Program.cs cleanup and default page revision
fluentcms · Nov 16, 2023 · f0d41b7 · f0d41b7
2 parents 3515c1c + 7c26f06
commit f0d41b7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/src/FluentCMS.Web.UI/Layout/Sidebar.razor b/src/FluentCMS.Web.UI/Layout/Sidebar.razor
@@ -1,6 +1,6 @@
 <ul class="nav flex-column">
     <li class="nav-item">
-        <NavLink class="nav-link d-flex align-items-center gap-2" href="/admin" Match="NavLinkMatch.All">
+        <NavLink class="nav-link d-flex align-items-center gap-2" href="/" Match="NavLinkMatch.All">
             Dashboard
         </NavLink>
     </li>

diff --git a/src/FluentCMS.Web.UI/Pages/Home.razor b/src/FluentCMS.Web.UI/Pages/Home.razor
@@ -1,7 +1,6 @@
-@page "/admin"
+@page "/"
 
 <PageTitle>Home</PageTitle>
-<a href="api/WeatherForecast/GetAll" target="_blank">Call Weather Api</a>
 
 <Label>This is label</Label>
 <Button>Submit</Button>

diff --git a/src/FluentCMS.Web.UI/Program.cs b/src/FluentCMS.Web.UI/Program.cs
@@ -34,6 +34,8 @@
 
 services.AddHttpContextAccessor();
 
+// TODO: Add JWT to request header, accept-language, etc.
+// TODO: Move to somewhere else
 services.AddScoped(sp =>
 {
     var httpContextAccessor = sp.GetRequiredService<IHttpContextAccessor>();
@@ -46,7 +48,7 @@
     };
 });
 
-
+// TODO: Move to somewhere else
 #region Identity
 
 var options = builder.Configuration.GetInstance<JwtOptions>("Jwt");
@@ -79,19 +81,22 @@
 #endregion
 
 var app = builder.Build();
+
+app.Services.SeedDefaultData(@".\SeedData\");
+
 if (app.Environment.IsDevelopment())
 {
     app.UseDeveloperExceptionPage();
-    app.Services.SeedDefaultData(@".\SeedData\");
-}
-else
-{
-    app.UseHsts();
-    app.UseHttpsRedirection();
-    app.UseExceptionHandler("/Error", createScopeForErrors: true);
 }
 
+app.UseHsts();
+
+app.UseHttpsRedirection();
+
+app.UseExceptionHandler("/Error", createScopeForErrors: true);
+
 app.UseRouting();
+
 app.UseStaticFiles();
 
 app.UseAntiforgery();
@@ -102,14 +107,6 @@
 
 app.UseAuthorization();
 
-app.UseEndpoints(endpoints =>
-{
-    _ = endpoints.MapGet("/", (context) =>
-    {
-        context.Response.Redirect("/admin");
-        return Task.CompletedTask;
-    });
-});
 app.MapControllers();
 
 app.MapRazorComponents<App>()