Standardize namespaces to all be under the Microsoft.eShopOnWeb namespace and update default namespaces. (#102)

src/Web/Constants.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.eShopWeb
+namespace Microsoft.eShopWeb.Web
 {
     public static class Constants
     {

src/Web/Controllers/AccountController.cs

@@ -1,15 +1,14 @@
-using ApplicationCore.Interfaces;
-using Infrastructure.Identity;
+using Microsoft.eShopWeb.ApplicationCore.Interfaces;
+using Microsoft.eShopWeb.Infrastructure.Identity;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.eShopWeb.ViewModels.Account;
+using Microsoft.eShopWeb.Web.ViewModels.Account;
 using System;
 using System.Threading.Tasks;
-using Web.ViewModels.Account;
 
-namespace Microsoft.eShopWeb.Controllers
+namespace Microsoft.eShopWeb.Web.Controllers
 {
 
     [Route("[controller]/[action]")]

src/Web/Controllers/Api/BaseApiController.cs

@@ -1,8 +1,8 @@
-using Microsoft.eShopWeb.Services;
+using Microsoft.eShopWeb.Web.Services;
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopWeb.Controllers.Api
+namespace Microsoft.eShopWeb.Web.Controllers.Api
 {
     [Route("api/[controller]/[action]")]
     public class BaseApiController : Controller

src/Web/Controllers/Api/CatalogController.cs

@@ -1,8 +1,8 @@
-using Microsoft.eShopWeb.Services;
+using Microsoft.eShopWeb.Web.Services;
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopWeb.Controllers.Api
+namespace Microsoft.eShopWeb.Web.Controllers.Api
 {
     public class CatalogController : BaseApiController
     {

src/Web/Controllers/BasketController.cs

@@ -1,17 +1,17 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
-using ApplicationCore.Interfaces;
+using Microsoft.eShopWeb.ApplicationCore.Interfaces;
 using Microsoft.AspNetCore.Http;
-using Microsoft.eShopWeb.ViewModels;
+using Microsoft.eShopWeb.Web.ViewModels;
 using Microsoft.AspNetCore.Identity;
-using Infrastructure.Identity;
+using Microsoft.eShopWeb.Infrastructure.Identity;
 using System;
 using System.Collections.Generic;
-using ApplicationCore.Entities.OrderAggregate;
+using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.eShopWeb.Interfaces;
+using Microsoft.eShopWeb.Web.Interfaces;
 
-namespace Microsoft.eShopWeb.Controllers
+namespace Microsoft.eShopWeb.Web.Controllers
 {
     [Route("[controller]/[action]")]
     public class BasketController : Controller

src/Web/Controllers/CatalogController.cs

@@ -1,8 +1,8 @@
-using Microsoft.eShopWeb.Services;
+using Microsoft.eShopWeb.Web.Services;
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopWeb.Controllers
+namespace Microsoft.eShopWeb.Web.Controllers
 {
     [Route("")]
     public class CatalogController : Controller

src/Web/Controllers/ManageController.cs

@@ -1,18 +1,18 @@
-using ApplicationCore.Interfaces;
-using Infrastructure.Identity;
+using Microsoft.eShopWeb.ApplicationCore.Interfaces;
+using Microsoft.eShopWeb.Infrastructure.Identity;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.eShopWeb.ViewModels.Manage;
-using Microsoft.eShopWeb.Services;
+using Microsoft.eShopWeb.Web.ViewModels.Manage;
+using Microsoft.eShopWeb.Web.Services;
 using System;
 using System.Linq;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopWeb.Controllers
+namespace Microsoft.eShopWeb.Web.Controllers
 {
     [Authorize]
     [Route("[controller]/[action]")]

src/Web/Controllers/OrderController.cs

@@ -1,14 +1,14 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.eShopWeb.ViewModels;
+using Microsoft.eShopWeb.Web.ViewModels;
 using System;
-using ApplicationCore.Entities.OrderAggregate;
-using ApplicationCore.Interfaces;
+using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
+using Microsoft.eShopWeb.ApplicationCore.Interfaces;
 using System.Linq;
-using ApplicationCore.Specifications;
+using Microsoft.eShopWeb.ApplicationCore.Specifications;
 
-namespace Microsoft.eShopWeb.Controllers
+namespace Microsoft.eShopWeb.Web.Controllers
 {
     [Authorize]
     [Route("[controller]/[action]")]

src/Web/Extensions/EmailSenderExtensions.cs

@@ -1,8 +1,8 @@
-using ApplicationCore.Interfaces;
+using Microsoft.eShopWeb.ApplicationCore.Interfaces;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopWeb.Services
+namespace Microsoft.eShopWeb.Web.Services
 {
     public static class EmailSenderExtensions
     {

src/Web/Extensions/UrlHelperExtensions.cs

@@ -1,4 +1,4 @@
-using Microsoft.eShopWeb.Controllers;
+using Microsoft.eShopWeb.Web.Controllers;
 
 namespace Microsoft.AspNetCore.Mvc
 {

src/Web/Interfaces/IBasketService.cs

@@ -1,7 +1,7 @@
-using Microsoft.eShopWeb.ViewModels;
+using Microsoft.eShopWeb.Web.ViewModels;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopWeb.Interfaces
+namespace Microsoft.eShopWeb.Web.Interfaces
 {
     public interface IBasketViewModelService
     {

src/Web/Interfaces/ICatalogService.cs

@@ -1,9 +1,9 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.eShopWeb.ViewModels;
+using Microsoft.eShopWeb.Web.ViewModels;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopWeb.Services
+namespace Microsoft.eShopWeb.Web.Services
 {
     public interface ICatalogService
     {

src/Web/Program.cs

@@ -1,13 +1,13 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore;
 using Microsoft.Extensions.DependencyInjection;
-using Infrastructure.Data;
+using Microsoft.eShopWeb.Infrastructure.Data;
 using System;
 using Microsoft.Extensions.Logging;
-using Infrastructure.Identity;
+using Microsoft.eShopWeb.Infrastructure.Identity;
 using Microsoft.AspNetCore.Identity;
 
-namespace Microsoft.eShopWeb
+namespace Microsoft.eShopWeb.Web
 {
     public class Program
     {

src/Web/Services/BasketViewModelService.cs

@@ -1,14 +1,14 @@
-using ApplicationCore.Interfaces;
-using ApplicationCore.Specifications;
+using Microsoft.eShopWeb.ApplicationCore.Interfaces;
+using Microsoft.eShopWeb.ApplicationCore.Specifications;
 using Microsoft.eShopWeb.ApplicationCore.Entities;
 using Microsoft.eShopWeb.ApplicationCore.Entities.BasketAggregate;
-using Microsoft.eShopWeb.Interfaces;
-using Microsoft.eShopWeb.ViewModels;
+using Microsoft.eShopWeb.Web.Interfaces;
+using Microsoft.eShopWeb.Web.ViewModels;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Microsoft.eShopWeb.Services
+namespace Microsoft.eShopWeb.Web.Services
 {
     public class BasketViewModelService : IBasketViewModelService
     {

src/Web/Services/CachedCatalogService.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.eShopWeb.ViewModels;
+using Microsoft.eShopWeb.Web.ViewModels;
 using Microsoft.Extensions.Caching.Memory;
 using System;
 
-namespace Microsoft.eShopWeb.Services
+namespace Microsoft.eShopWeb.Web.Services
 {
     public class CachedCatalogService : ICatalogService
     {

src/Web/Services/CatalogService.cs

@@ -2,14 +2,14 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.eShopWeb.ViewModels;
+using Microsoft.eShopWeb.Web.ViewModels;
 using Microsoft.eShopWeb.ApplicationCore.Entities;
 using Microsoft.Extensions.Logging;
-using ApplicationCore.Interfaces;
+using Microsoft.eShopWeb.ApplicationCore.Interfaces;
 using System;
-using ApplicationCore.Specifications;
+using Microsoft.eShopWeb.ApplicationCore.Specifications;
 
-namespace Microsoft.eShopWeb.Services
+namespace Microsoft.eShopWeb.Web.Services
 {
     /// <summary>
     /// This is a UI-specific service so belongs in UI project. It does not contain any business logic and works

src/Web/Startup.cs

@@ -1,22 +1,22 @@
-using ApplicationCore.Interfaces;
-using ApplicationCore.Services;
-using Infrastructure.Data;
-using Infrastructure.Identity;
-using Infrastructure.Logging;
-using Infrastructure.Services;
+using Microsoft.eShopWeb.ApplicationCore.Interfaces;
+using Microsoft.eShopWeb.ApplicationCore.Services;
+using Microsoft.eShopWeb.Infrastructure.Data;
+using Microsoft.eShopWeb.Infrastructure.Identity;
+using Microsoft.eShopWeb.Infrastructure.Logging;
+using Microsoft.eShopWeb.Infrastructure.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.eShopWeb.Interfaces;
-using Microsoft.eShopWeb.Services;
+using Microsoft.eShopWeb.Web.Interfaces;
+using Microsoft.eShopWeb.Web.Services;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Text;
 
-namespace Microsoft.eShopWeb
+namespace Microsoft.eShopWeb.Web
 {
     public class Startup
     {

src/Web/ViewComponents/Basket.cs

@@ -1,14 +1,14 @@
-using Infrastructure.Identity;
+using Microsoft.eShopWeb.Infrastructure.Identity;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.eShopWeb;
-using Microsoft.eShopWeb.Interfaces;
-using Microsoft.eShopWeb.ViewModels;
+using Microsoft.eShopWeb.Web.Interfaces;
+using Microsoft.eShopWeb.Web.ViewModels;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Web.ViewComponents
+namespace Microsoft.eShopWeb.Web.ViewComponents
 {
     public class Basket : ViewComponent
     {

src/Web/ViewModels/Account/LoginViewModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.ViewModels.Account
+namespace Microsoft.eShopWeb.Web.ViewModels.Account
 {
     public class LoginViewModel
     {

src/Web/ViewModels/Account/LoginWith2faViewModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.ViewModels.Account
+namespace Microsoft.eShopWeb.Web.ViewModels.Account
 {
     public class LoginWith2faViewModel
     {

src/Web/ViewModels/Account/RegisterViewModel.cs

@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.ViewModels.Account
+namespace Microsoft.eShopWeb.Web.ViewModels.Account
 {
     public class RegisterViewModel
     {

src/Web/ViewModels/Account/ResetPasswordViewModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Web.ViewModels.Account
+namespace Microsoft.eShopWeb.Web.ViewModels.Account
 {
     public class ResetPasswordViewModel
     {

src/Web/ViewModels/BasketComponentViewModel.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.eShopWeb.ViewModels
+namespace Microsoft.eShopWeb.Web.ViewModels
 {
     public class BasketComponentViewModel
     {

src/Web/ViewModels/BasketItemViewModel.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.eShopWeb.ViewModels
+namespace Microsoft.eShopWeb.Web.ViewModels
 {
     public class BasketItemViewModel
     {

src/Web/ViewModels/BasketViewModel.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.eShopWeb.ViewModels
+namespace Microsoft.eShopWeb.Web.ViewModels
 {
     public class BasketViewModel
     {

src/Web/ViewModels/CatalogIndexViewModel.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using System.Collections.Generic;
 
-namespace Microsoft.eShopWeb.ViewModels
+namespace Microsoft.eShopWeb.Web.ViewModels
 {
     public class CatalogIndexViewModel
     {

src/Web/ViewModels/CatalogItemViewModel.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.eShopWeb.ViewModels
+namespace Microsoft.eShopWeb.Web.ViewModels
 {
     public class CatalogItemViewModel
     {

src/Web/ViewModels/Manage/ChangePasswordViewModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.ViewModels.Manage
+namespace Microsoft.eShopWeb.Web.ViewModels.Manage
 {
     public class ChangePasswordViewModel
     {

src/Web/ViewModels/Manage/EnableAuthenticatorViewModel.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.ViewModels.Manage
+namespace Microsoft.eShopWeb.Web.ViewModels.Manage
 {
     public class EnableAuthenticatorViewModel
     {

src/Web/ViewModels/Manage/ExternalLoginsViewModel.cs

@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Identity;
 using System.Collections.Generic;
 
-namespace Microsoft.eShopWeb.ViewModels.Manage
+namespace Microsoft.eShopWeb.Web.ViewModels.Manage
 {
     public class ExternalLoginsViewModel
     {

src/Web/ViewModels/Manage/GenerateRecoveryCodesViewModel.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.eShopWeb.ViewModels.Manage
+namespace Microsoft.eShopWeb.Web.ViewModels.Manage
 {
     public class GenerateRecoveryCodesViewModel
     {

src/Web/ViewModels/Manage/IndexViewModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.ViewModels.Manage
+namespace Microsoft.eShopWeb.Web.ViewModels.Manage
 {
     public class IndexViewModel
     {

src/Web/ViewModels/Manage/RemoveLoginViewModel.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.eShopWeb.ViewModels.Manage
+namespace Microsoft.eShopWeb.Web.ViewModels.Manage
 {
     public class RemoveLoginViewModel
     {

src/Web/ViewModels/Manage/SetPasswordViewModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.ViewModels.Manage
+namespace Microsoft.eShopWeb.Web.ViewModels.Manage
 {
     public class SetPasswordViewModel
     {

src/Web/ViewModels/Manage/TwoFactorAuthenticationViewModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.ViewModels.Manage
+namespace Microsoft.eShopWeb.Web.ViewModels.Manage
 {
     public class TwoFactorAuthenticationViewModel
     {

src/Web/ViewModels/OrderItemViewModel.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Microsoft.eShopWeb.ViewModels
+namespace Microsoft.eShopWeb.Web.ViewModels
 {
     public class OrderItemViewModel
     {

src/Web/ViewModels/OrderViewModel.cs

@@ -1,8 +1,8 @@
-using ApplicationCore.Entities.OrderAggregate;
+using Microsoft.eShopWeb.ApplicationCore.Entities.OrderAggregate;
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.eShopWeb.ViewModels
+namespace Microsoft.eShopWeb.Web.ViewModels
 {
     public class OrderViewModel
     {

src/Web/ViewModels/PaginationInfoViewModel.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.eShopWeb.ViewModels
+namespace Microsoft.eShopWeb.Web.ViewModels
 {
     public class PaginationInfoViewModel
     {

src/Web/Views/Account/LoginWith2fa.cshtml

@@ -1,3 +1,4 @@
+@using Microsoft.eShopWeb.Web.ViewModels.Account
 @model LoginWith2faViewModel
 @{
     ViewData["Title"] = "Two-factor authentication";

src/Web/Views/Account/Register.cshtml

@@ -1,55 +1,56 @@
 @using System.Collections.Generic
 @using Microsoft.AspNetCore.Http
 @using Microsoft.AspNetCore.Http.Authentication
+@using Microsoft.eShopWeb.Web.ViewModels.Account
 @model RegisterViewModel
 @{
     ViewData["Title"] = "Register";
 }
-    <div class="brand-header-block">
-        <ul class="container">
-            <li class="active" style="margin-right: 65px;">Already have an account? <a asp-action="Signin">LOGIN</a></li>
-        </ul>
-    </div>
-    <div class="container account-login-container">
-        <div class="row">
-            <div class="col-md-12">
-                <section>
-                    <form asp-controller="Account" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
-                        <div asp-validation-summary="All" class="text-danger"></div>
-                        <div class="form-group">
-                            <label asp-for="Email" class="col-md-2 control-label"></label>
-                            <div class="col-md-10">
-                                <input asp-for="Email" class="form-control" />
-                                <span asp-validation-for="Email" class="text-danger"></span>
-                            </div>
+<div class="brand-header-block">
+    <ul class="container">
+        <li class="active" style="margin-right: 65px;">Already have an account? <a asp-action="Signin">LOGIN</a></li>
+    </ul>
+</div>
+<div class="container account-login-container">
+    <div class="row">
+        <div class="col-md-12">
+            <section>
+                <form asp-controller="Account" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
+                    <div asp-validation-summary="All" class="text-danger"></div>
+                    <div class="form-group">
+                        <label asp-for="Email" class="col-md-2 control-label"></label>
+                        <div class="col-md-10">
+                            <input asp-for="Email" class="form-control" />
+                            <span asp-validation-for="Email" class="text-danger"></span>
                         </div>
-                        <div class="form-group">
-                            <label asp-for="Password" class="col-md-2 control-label"></label>
-                            <div class="col-md-10">
-                                <input asp-for="Password" class="form-control" />
-                                <span asp-validation-for="Password" class="text-danger"></span>
-                            </div>
+                    </div>
+                    <div class="form-group">
+                        <label asp-for="Password" class="col-md-2 control-label"></label>
+                        <div class="col-md-10">
+                            <input asp-for="Password" class="form-control" />
+                            <span asp-validation-for="Password" class="text-danger"></span>
                         </div>
-                        <div class="form-group">
-                            <label asp-for="ConfirmPassword" class="col-md-2 control-label"></label>
-                            <div class="col-md-10">
-                                <input asp-for="ConfirmPassword" class="form-control" />
-                                <span asp-validation-for="ConfirmPassword" class="text-danger"></span>
-                            </div>
+                    </div>
+                    <div class="form-group">
+                        <label asp-for="ConfirmPassword" class="col-md-2 control-label"></label>
+                        <div class="col-md-10">
+                            <input asp-for="ConfirmPassword" class="form-control" />
+                            <span asp-validation-for="ConfirmPassword" class="text-danger"></span>
                         </div>
-                        <div class="form-group">
-                            <button type="submit" class="btn btn-default btn-brand btn-brand-big">&nbsp;REGISTER&nbsp;</button>
-                        </div>
-                        <p>
-                            Note that for demo purposes you don't need to register! Use the credentials shown below the 
-                            <a asp-action="signin">login screen</a>.
-                        </p>
-                    </form>
-                </section>
-            </div>
+                    </div>
+                    <div class="form-group">
+                        <button type="submit" class="btn btn-default btn-brand btn-brand-big">&nbsp;REGISTER&nbsp;</button>
+                    </div>
+                    <p>
+                        Note that for demo purposes you don't need to register! Use the credentials shown below the
+                        <a asp-action="signin">login screen</a>.
+                    </p>
+                </form>
+            </section>
         </div>
     </div>
+</div>
 
-    @section Scripts {
-        @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
-    }
+@section Scripts {
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}

src/Web/Views/Account/Signin.cshtml

@@ -1,60 +1,60 @@
-@using Microsoft.eShopWeb.ViewModels.Account
+@using Microsoft.eShopWeb.Web.ViewModels.Account
 @model LoginViewModel
 @{
     ViewData["Title"] = "Log in";
 }
-    <div class="brand-header-block">
-        <ul class="container">
-            @*<li><a asp-area="" asp-controller="Account" asp-action="Register">REGISTER</a></li>*@
-            <li class="active" style="margin-right: 65px;">LOGIN</li>
-        </ul>
-    </div>
-    <div class="container account-login-container">
-        <div class="row">
-            <div class="col-md-12">
-                <section>
-                    <form asp-controller="Account" asp-action="SignIn" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
-                        <h4>ARE YOU REGISTERED?</h4>
-                        <div asp-validation-summary="All" class="text-danger"></div>
-                        <div class="form-group">
-                            <label asp-for="Email" class="control-label form-label"></label>
-                            <input asp-for="Email" class="form-control form-input form-input-center" />
-                            <span asp-validation-for="Email" class="text-danger"></span>
+<div class="brand-header-block">
+    <ul class="container">
+        @*<li><a asp-area="" asp-controller="Account" asp-action="Register">REGISTER</a></li>*@
+        <li class="active" style="margin-right: 65px;">LOGIN</li>
+    </ul>
+</div>
+<div class="container account-login-container">
+    <div class="row">
+        <div class="col-md-12">
+            <section>
+                <form asp-controller="Account" asp-action="SignIn" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
+                    <h4>ARE YOU REGISTERED?</h4>
+                    <div asp-validation-summary="All" class="text-danger"></div>
+                    <div class="form-group">
+                        <label asp-for="Email" class="control-label form-label"></label>
+                        <input asp-for="Email" class="form-control form-input form-input-center" />
+                        <span asp-validation-for="Email" class="text-danger"></span>
+                    </div>
+                    <div class="form-group">
+                        <label asp-for="Password" class="control-label form-label"></label>
+                        <input asp-for="Password" class="form-control form-input form-input-center" />
+                        <span asp-validation-for="Password" class="text-danger"></span>
+                    </div>
+                    <div class="form-group">
+                        <div class="checkbox">
+                            <label asp-for="RememberMe">
+                                <input asp-for="RememberMe" />
+                                @Html.DisplayNameFor(m => m.RememberMe)
+                            </label>
                         </div>
-                        <div class="form-group">
-                            <label asp-for="Password" class="control-label form-label"></label>
-                            <input asp-for="Password" class="form-control form-input form-input-center" />
-                            <span asp-validation-for="Password" class="text-danger"></span>
-                        </div>
-                        <div class="form-group">
-                            <div class="checkbox">
-                                <label asp-for="RememberMe">
-                                    <input asp-for="RememberMe" />
-                                    @Html.DisplayNameFor(m => m.RememberMe)
-                                </label>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <button type="submit" class="btn btn-default btn-brand btn-brand-big">&nbsp;LOG IN&nbsp;</button>
-                        </div>
-                        <p>
-                            <a asp-action="Register" asp-route-returnurl="@ViewData["ReturnUrl"]" class="text">Register as a new user?</a>
-                        </p>
-                        <p>
-                            Note that for demo purposes you don't need to register and can login with these credentials:
-                        </p>
-                        <p>
-                            User:     <b>demouser@microsoft.com</b>
-                        </p>
-                        <p>
-                            Password: <b>Pass@word1</b>
-                        </p>
-                    </form>
-                </section>
-            </div>
+                    </div>
+                    <div class="form-group">
+                        <button type="submit" class="btn btn-default btn-brand btn-brand-big">&nbsp;LOG IN&nbsp;</button>
+                    </div>
+                    <p>
+                        <a asp-action="Register" asp-route-returnurl="@ViewData["ReturnUrl"]" class="text">Register as a new user?</a>
+                    </p>
+                    <p>
+                        Note that for demo purposes you don't need to register and can login with these credentials:
+                    </p>
+                    <p>
+                        User:     <b>demouser@microsoft.com</b>
+                    </p>
+                    <p>
+                        Password: <b>Pass@word1</b>
+                    </p>
+                </form>
+            </section>
         </div>
     </div>
+</div>
 
-    @section Scripts {
-        @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
-    }
+@section Scripts {
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+}

src/Web/Views/Basket/Checkout.cshtml

@@ -1,4 +1,4 @@
-@using Microsoft.eShopWeb.ViewModels
+@using Microsoft.eShopWeb.Web.ViewModels
 @{
     ViewData["Title"] = "Checkout Complete";
     @model BasketViewModel

src/Web/Views/Basket/Index.cshtml

@@ -1,4 +1,4 @@
-@using Microsoft.eShopWeb.ViewModels
+@using Microsoft.eShopWeb.Web.ViewModels
 @model BasketViewModel
 @{
     ViewData["Title"] = "Basket";

src/Web/Views/Manage/ManageNavPages.cs

@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 
-namespace Microsoft.eShopWeb.Views.Manage
+namespace Microsoft.eShopWeb.Web.Views.Manage
 {
     public static class ManageNavPages
     {

src/Web/Views/Manage/_ViewImports.cshtml

@@ -1 +1 @@
-@using Microsoft.eShopWeb.Views.Manage
+@using Microsoft.eShopWeb.Web.Views.Manage

src/Web/Views/Order/Detail.cshtml

@@ -1,4 +1,4 @@
-@using Microsoft.eShopWeb.ViewModels
+@using Microsoft.eShopWeb.Web.ViewModels
 @model OrderViewModel
 @{
     ViewData["Title"] = "My Order History";

src/Web/Views/Order/Index.cshtml

@@ -1,4 +1,4 @@
-@using Microsoft.eShopWeb.ViewModels
+@using Microsoft.eShopWeb.Web.ViewModels
 @model IEnumerable<OrderViewModel>
 @{
     ViewData["Title"] = "My Order History";

src/Web/Views/_ViewImports.cshtml

@@ -1,7 +1,7 @@
-@using Microsoft.eShopWeb
-@using Microsoft.eShopWeb.ViewModels
-@using Microsoft.eShopWeb.ViewModels.Account
-@using Microsoft.eShopWeb.ViewModels.Manage
+@using Microsoft.eShopWeb.Web
+@using Microsoft.eShopWeb.Web.ViewModels
+@using Microsoft.eShopWeb.Web.ViewModels.Account
+@using Microsoft.eShopWeb.Web.ViewModels.Manage
 @using Microsoft.AspNetCore.Identity
-@using Infrastructure.Identity
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@using Microsoft.eShopWeb.Infrastructure.Identity
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

src/Web/Web.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
+    <RootNamespace>Microsoft.eShopWeb.Web</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>