From 53921ccea49bd8a7840d5bbc71c57c8691ed92bf Mon Sep 17 00:00:00 2001 From: Syndamia Date: Thu, 6 May 2021 18:29:43 +0300 Subject: Removed unnecessary usings, space identation got updated to tab identation and added authentication in Startup.cs --- ExamTemplate/Web/Controllers/HomeController.cs | 48 ++++++-------- ExamTemplate/Web/Models/ErrorViewModel.cs | 12 ++-- ExamTemplate/Web/Program.cs | 32 ++++----- ExamTemplate/Web/Startup.cs | 92 ++++++++++++-------------- ExamTemplate/Web/Views/Home/Index.cshtml | 6 +- ExamTemplate/Web/Views/Home/Privacy.cshtml | 2 +- ExamTemplate/Web/Views/Shared/Error.cshtml | 18 ++--- ExamTemplate/Web/Views/Shared/_Layout.cshtml | 80 +++++++++++----------- ExamTemplate/Web/Views/_ViewStart.cshtml | 2 +- 9 files changed, 138 insertions(+), 154 deletions(-) (limited to 'ExamTemplate/Web') diff --git a/ExamTemplate/Web/Controllers/HomeController.cs b/ExamTemplate/Web/Controllers/HomeController.cs index 3c5b6ec..9f96a95 100644 --- a/ExamTemplate/Web/Controllers/HomeController.cs +++ b/ExamTemplate/Web/Controllers/HomeController.cs @@ -1,37 +1,33 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Threading.Tasks; +using System.Diagnostics; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Web.Models; namespace Web.Controllers { - public class HomeController : Controller - { - private readonly ILogger _logger; + public class HomeController : Controller + { + private readonly ILogger _logger; - public HomeController(ILogger logger) - { - _logger = logger; - } + public HomeController(ILogger logger) + { + _logger = logger; + } - public IActionResult Index() - { - return View(); - } + public IActionResult Index() + { + return View(); + } - public IActionResult Privacy() - { - return View(); - } + public IActionResult Privacy() + { + return View(); + } - [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] - public IActionResult Error() - { - return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); - } - } + [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] + public IActionResult Error() + { + return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); + } + } } diff --git a/ExamTemplate/Web/Models/ErrorViewModel.cs b/ExamTemplate/Web/Models/ErrorViewModel.cs index f603890..bd01707 100644 --- a/ExamTemplate/Web/Models/ErrorViewModel.cs +++ b/ExamTemplate/Web/Models/ErrorViewModel.cs @@ -1,11 +1,9 @@ -using System; - namespace Web.Models { - public class ErrorViewModel - { - public string RequestId { get; set; } + public class ErrorViewModel + { + public string RequestId { get; set; } - public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); - } + public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); + } } diff --git a/ExamTemplate/Web/Program.cs b/ExamTemplate/Web/Program.cs index fb68b7f..f16e26c 100644 --- a/ExamTemplate/Web/Program.cs +++ b/ExamTemplate/Web/Program.cs @@ -1,26 +1,20 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; namespace Web { - public class Program - { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } + public class Program + { + public static void Main(string[] args) + { + CreateHostBuilder(args).Build().Run(); + } - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }); - } + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }); + } } diff --git a/ExamTemplate/Web/Startup.cs b/ExamTemplate/Web/Startup.cs index 51a6797..007f311 100644 --- a/ExamTemplate/Web/Startup.cs +++ b/ExamTemplate/Web/Startup.cs @@ -1,57 +1,53 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.HttpsPolicy; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; namespace Web { - public class Startup - { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - services.AddControllersWithViews(); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - else - { - app.UseExceptionHandler("/Home/Error"); - // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. - app.UseHsts(); - } - app.UseHttpsRedirection(); - app.UseStaticFiles(); - - app.UseRouting(); - - app.UseAuthorization(); - - app.UseEndpoints(endpoints => - { - endpoints.MapControllerRoute( - name: "default", - pattern: "{controller=Home}/{action=Index}/{id?}"); - }); - } - } + public class Startup + { + public Startup(IConfiguration configuration) + { + Configuration = configuration; + } + + public IConfiguration Configuration { get; } + + // This method gets called by the runtime. Use this method to add services to the container. + public void ConfigureServices(IServiceCollection services) + { + services.AddControllersWithViews(); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + else + { + app.UseExceptionHandler("/Home/Error"); + // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. + app.UseHsts(); + } + + app.UseStaticFiles(); + + app.UseRouting(); + + app.UseAuthorization(); + app.UseAuthentication(); + + app.UseEndpoints(endpoints => + { + endpoints.MapControllerRoute( + name: "default", + pattern: "{controller=Home}/{action=Index}/{id?}"); + }); + } + } } diff --git a/ExamTemplate/Web/Views/Home/Index.cshtml b/ExamTemplate/Web/Views/Home/Index.cshtml index 1fcf97d..2016fc4 100644 --- a/ExamTemplate/Web/Views/Home/Index.cshtml +++ b/ExamTemplate/Web/Views/Home/Index.cshtml @@ -1,8 +1,8 @@ @{ - ViewData["Title"] = "Home Page"; + ViewData["Title"] = "Home Page"; }
-

Welcome

-

Learn about building Web apps with ASP.NET Core.

+

Welcome

+

Learn about building Web apps with ASP.NET Core.

diff --git a/ExamTemplate/Web/Views/Home/Privacy.cshtml b/ExamTemplate/Web/Views/Home/Privacy.cshtml index a850e76..da6d969 100644 --- a/ExamTemplate/Web/Views/Home/Privacy.cshtml +++ b/ExamTemplate/Web/Views/Home/Privacy.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "Privacy Policy"; + ViewData["Title"] = "Privacy Policy"; }

@ViewData["Title"]

diff --git a/ExamTemplate/Web/Views/Shared/Error.cshtml b/ExamTemplate/Web/Views/Shared/Error.cshtml index 08a315d..5a7ce95 100644 --- a/ExamTemplate/Web/Views/Shared/Error.cshtml +++ b/ExamTemplate/Web/Views/Shared/Error.cshtml @@ -1,6 +1,6 @@ @model ErrorViewModel @{ - ViewData["Title"] = "Error"; + ViewData["Title"] = "Error"; }

Error.

@@ -8,18 +8,18 @@ @if (Model.ShowRequestId) { -

- Request ID: @Model.RequestId -

+

+ Request ID: @Model.RequestId +

}

Development Mode

- Swapping to Development environment will display more detailed information about the error that occurred. + Swapping to Development environment will display more detailed information about the error that occurred.

- The Development environment shouldn't be enabled for deployed applications. - It can result in displaying sensitive information from exceptions to end users. - For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development - and restarting the app. + The Development environment shouldn't be enabled for deployed applications. + It can result in displaying sensitive information from exceptions to end users. + For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development + and restarting the app.

diff --git a/ExamTemplate/Web/Views/Shared/_Layout.cshtml b/ExamTemplate/Web/Views/Shared/_Layout.cshtml index b94d4ee..8ae73f3 100644 --- a/ExamTemplate/Web/Views/Shared/_Layout.cshtml +++ b/ExamTemplate/Web/Views/Shared/_Layout.cshtml @@ -1,48 +1,48 @@  - - - @ViewData["Title"] - Web - - + + + @ViewData["Title"] - Web + + -
- -
-
-
- @RenderBody() -
-
+
+ +
+
+
+ @RenderBody() +
+
- - - - - @RenderSection("Scripts", required: false) + + + + + @RenderSection("Scripts", required: false) diff --git a/ExamTemplate/Web/Views/_ViewStart.cshtml b/ExamTemplate/Web/Views/_ViewStart.cshtml index 66b5da2..3a04d05 100644 --- a/ExamTemplate/Web/Views/_ViewStart.cshtml +++ b/ExamTemplate/Web/Views/_ViewStart.cshtml @@ -1,3 +1,3 @@ @{ - Layout = "_Layout"; + Layout = "_Layout"; } -- cgit v1.2.3