move using from every viewpage to _viewimports 🍈

Lu-Lucifer · Apr 5, 2019 · 442f753 · 442f753
1 parent a6f9ba8
commit 442f753
Show file tree

Hide file tree

Showing 23 changed files with 30 additions and 34 deletions.
diff --git a/Christ3D.UI.Web/Views/Account/ExternalLogin.cshtml b/Christ3D.UI.Web/Views/Account/ExternalLogin.cshtml
@@ -1,4 +1,4 @@
-@model Christ3D.Infrastruct.Identity.Models.AccountViewModels.ExternalLoginViewModel
+@model ExternalLoginViewModel
 @{
     ViewData["Title"] = "Register";
 }

diff --git a/Christ3D.UI.Web/Views/Account/ForgotPassword.cshtml b/Christ3D.UI.Web/Views/Account/ForgotPassword.cshtml
@@ -1,4 +1,4 @@
-@model Christ3D.Infrastruct.Identity.Models.AccountViewModels.ForgotPasswordViewModel
+@model ForgotPasswordViewModel
 @{
     ViewData["Title"] = "Forgot your password?";
 }

diff --git a/Christ3D.UI.Web/Views/Account/Login.cshtml b/Christ3D.UI.Web/Views/Account/Login.cshtml
@@ -2,8 +2,8 @@
 @using System.Linq
 @using Microsoft.AspNetCore.Http
 @using Microsoft.AspNetCore.Http.Authentication
-@model Christ3D.Infrastruct.Identity.Models.AccountViewModels.LoginViewModel
-@inject Microsoft.AspNetCore.Identity.SignInManager<Christ3D.Infrastruct.Identity.Models.ApplicationUser> SignInManager
+@model LoginViewModel
+@inject SignInManager<ApplicationUser> SignInManager
 
 @{
     ViewData["Title"] = "Log in";

diff --git a/Christ3D.UI.Web/Views/Account/LoginWith2fa.cshtml b/Christ3D.UI.Web/Views/Account/LoginWith2fa.cshtml
@@ -1,4 +1,4 @@
-@model Christ3D.Infrastruct.Identity.Models.AccountViewModels.LoginWith2faViewModel
+@model LoginWith2faViewModel
 @{
     ViewData["Title"] = "Two-factor authentication";
 }

diff --git a/Christ3D.UI.Web/Views/Account/LoginWithRecoveryCode.cshtml b/Christ3D.UI.Web/Views/Account/LoginWithRecoveryCode.cshtml
@@ -1,4 +1,4 @@
-@model Christ3D.Infrastruct.Identity.Models.AccountViewModels.LoginWithRecoveryCodeViewModel
+@model LoginWithRecoveryCodeViewModel
 @{
     ViewData["Title"] = "Recovery code verification";
 }

diff --git a/Christ3D.UI.Web/Views/Account/Register.cshtml b/Christ3D.UI.Web/Views/Account/Register.cshtml
@@ -1,4 +1,4 @@
-@model Christ3D.Infrastruct.Identity.Models.AccountViewModels.RegisterViewModel
+@model RegisterViewModel
 @{
     ViewData["Title"] = "Register";
 }

diff --git a/Christ3D.UI.Web/Views/Account/ResetPassword.cshtml b/Christ3D.UI.Web/Views/Account/ResetPassword.cshtml
@@ -1,4 +1,4 @@
-@model Christ3D.Infrastruct.Identity.Models.AccountViewModels.ResetPasswordViewModel
+@model ResetPasswordViewModel
 @{
     ViewData["Title"] = "Reset password";
 }

diff --git a/Christ3D.UI.Web/Views/Manage/ChangePassword.cshtml b/Christ3D.UI.Web/Views/Manage/ChangePassword.cshtml
@@ -1,5 +1,4 @@
-@using Christ3D.UI.Web.Views.Manage
-@model Christ3D.Infrastruct.Identity.Models.ManageViewModels.ChangePasswordViewModel
+@model ChangePasswordViewModel
 @{
     ViewData["Title"] = "Change password";
     ViewData.AddActivePage(ManageNavPages.ChangePassword);

diff --git a/Christ3D.UI.Web/Views/Manage/Disable2fa.cshtml b/Christ3D.UI.Web/Views/Manage/Disable2fa.cshtml
@@ -1,5 +1,4 @@
-@using Christ3D.UI.Web.Views.Manage
-@{
+@{
     ViewData["Title"] = "Disable two-factor authentication (2FA)";
     ViewData.AddActivePage(ManageNavPages.TwoFactorAuthentication);
 }

diff --git a/Christ3D.UI.Web/Views/Manage/EnableAuthenticator.cshtml b/Christ3D.UI.Web/Views/Manage/EnableAuthenticator.cshtml
@@ -1,6 +1,4 @@
-@using Christ3D.Infrastruct.Identity.Models.ManageViewModels
-@using Christ3D.UI.Web.Views.Manage
-@model EnableAuthenticatorViewModel
+@model EnableAuthenticatorViewModel
 @{
     ViewData["Title"] = "Enable authenticator";
     ViewData.AddActivePage(ManageNavPages.TwoFactorAuthentication);

diff --git a/Christ3D.UI.Web/Views/Manage/ExternalLogins.cshtml b/Christ3D.UI.Web/Views/Manage/ExternalLogins.cshtml
@@ -1,5 +1,4 @@
-@using Christ3D.UI.Web.Views.Manage
-@model Christ3D.Infrastruct.Identity.Models.ManageViewModels.ExternalLoginsViewModel
+@model ExternalLoginsViewModel
 @{
     ViewData["Title"] = "Manage your external logins";
     ViewData.AddActivePage(ManageNavPages.ExternalLogins);

diff --git a/Christ3D.UI.Web/Views/Manage/GenerateRecoveryCodes.cshtml b/Christ3D.UI.Web/Views/Manage/GenerateRecoveryCodes.cshtml
@@ -1,5 +1,4 @@
-@using Christ3D.UI.Web.Views.Manage
-@model Christ3D.Infrastruct.Identity.Models.ManageViewModels.GenerateRecoveryCodesViewModel
+@model GenerateRecoveryCodesViewModel
 @{
     ViewData["Title"] = "Recovery codes";
     ViewData.AddActivePage(ManageNavPages.TwoFactorAuthentication);

diff --git a/Christ3D.UI.Web/Views/Manage/Index.cshtml b/Christ3D.UI.Web/Views/Manage/Index.cshtml
@@ -1,5 +1,4 @@
-@using Christ3D.UI.Web.Views.Manage
-@model Christ3D.Infrastruct.Identity.Models.ManageViewModels.IndexViewModel
+@model IndexViewModel
 @{
     ViewData["Title"] = "Profile";
     ViewData.AddActivePage(ManageNavPages.Index);

diff --git a/Christ3D.UI.Web/Views/Manage/ResetAuthenticator.cshtml b/Christ3D.UI.Web/Views/Manage/ResetAuthenticator.cshtml
@@ -1,5 +1,4 @@
-@using Christ3D.UI.Web.Views.Manage
-@{
+@{
     ViewData["Title"] = "Reset authenticator key";
     ViewData.AddActivePage(ManageNavPages.TwoFactorAuthentication);
 }

diff --git a/Christ3D.UI.Web/Views/Manage/SetPassword.cshtml b/Christ3D.UI.Web/Views/Manage/SetPassword.cshtml
@@ -1,5 +1,4 @@
-@using Christ3D.UI.Web.Views.Manage
-@model Christ3D.Infrastruct.Identity.Models.ManageViewModels.SetPasswordViewModel
+@model SetPasswordViewModel
 @{
     ViewData["Title"] = "Set password";
     ViewData.AddActivePage(ManageNavPages.ChangePassword);

diff --git a/Christ3D.UI.Web/Views/Manage/TwoFactorAuthentication.cshtml b/Christ3D.UI.Web/Views/Manage/TwoFactorAuthentication.cshtml
@@ -1,5 +1,4 @@
-@using Christ3D.UI.Web.Views.Manage
-@model Christ3D.Infrastruct.Identity.Models.ManageViewModels.TwoFactorAuthenticationViewModel
+@model TwoFactorAuthenticationViewModel
 @{
     ViewData["Title"] = "Two-factor authentication";
     ViewData.AddActivePage(ManageNavPages.TwoFactorAuthentication);

diff --git a/Christ3D.UI.Web/Views/Manage/_ManageNav.cshtml b/Christ3D.UI.Web/Views/Manage/_ManageNav.cshtml
@@ -1,5 +1,4 @@
-@using Christ3D.UI.Web.Views.Manage
-@inject Microsoft.AspNetCore.Identity.SignInManager<Christ3D.Infrastruct.Identity.Models.ApplicationUser> SignInManager
+@inject SignInManager<ApplicationUser> SignInManager
 @{
     var hasExternalLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync()).Any();
 }

diff --git a/Christ3D.UI.Web/Views/Student/Create.cshtml b/Christ3D.UI.Web/Views/Student/Create.cshtml
@@ -1,4 +1,4 @@
-@model Christ3D.Application.ViewModels.StudentViewModel
+@model StudentViewModel
 @{
     ViewData["Title"] = "Register new Student";
 }

diff --git a/Christ3D.UI.Web/Views/Student/Delete.cshtml b/Christ3D.UI.Web/Views/Student/Delete.cshtml
@@ -1,4 +1,4 @@
-@model Christ3D.Application.ViewModels.StudentViewModel
+@model StudentViewModel
 @{
     ViewData["Title"] = "Delete Student";
 }

diff --git a/Christ3D.UI.Web/Views/Student/Details.cshtml b/Christ3D.UI.Web/Views/Student/Details.cshtml
@@ -1,4 +1,4 @@
-@model Christ3D.Application.ViewModels.StudentViewModel
+@model StudentViewModel
 @{
     ViewData["Title"] = "Student Details";
 }

diff --git a/Christ3D.UI.Web/Views/Student/Edit.cshtml b/Christ3D.UI.Web/Views/Student/Edit.cshtml
@@ -1,4 +1,4 @@
-@model Christ3D.Application.ViewModels.StudentViewModel
+@model StudentViewModel
 @{
     ViewData["Title"] = "Edit Student";
 }

diff --git a/Christ3D.UI.Web/Views/Student/Index.cshtml b/Christ3D.UI.Web/Views/Student/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<Christ3D.Application.ViewModels.StudentViewModel>
+@model IEnumerable<StudentViewModel>
 @{
     ViewData["Title"] = "Student Management";
 }

diff --git a/Christ3D.UI.Web/Views/_ViewImports.cshtml b/Christ3D.UI.Web/Views/_ViewImports.cshtml
@@ -1,4 +1,11 @@
 @using Christ3D.UI.Web
 @using Christ3D.UI.Web.Models
+@using Christ3D.Infrastruct.Identity.Models.AccountViewModels
+@using Christ3D.Infrastruct.Identity.Models
+@using Microsoft.AspNetCore.Identity
+@using Christ3D.UI.Web.Views.Manage
+@using Christ3D.Infrastruct.Identity.Models.ManageViewModels
+@using Christ3D.Application.ViewModels
+
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper "*, Christ3D.UI.Web"