diff --git a/DB.sql b/DB.sql index 2040a15d..77a96cfd 100644 Binary files a/DB.sql and b/DB.sql differ diff --git a/OpenAuth.App/LoginApp.cs b/OpenAuth.App/LoginApp.cs index 56535765..b4166d37 100644 --- a/OpenAuth.App/LoginApp.cs +++ b/OpenAuth.App/LoginApp.cs @@ -34,11 +34,12 @@ namespace OpenAuth.App } else { + resp.UserId = user.UserId; + resp.Success = true; foreach (var role in user.Roles) { resp.UserRoleNames.Add(role.FullName); } - resp.Success = true; } return resp; } diff --git a/OpenAuth.Domain/Model/Button.cs b/OpenAuth.Domain/Model/Button.cs index 04f9db2e..c0cb1c56 100644 --- a/OpenAuth.Domain/Model/Button.cs +++ b/OpenAuth.Domain/Model/Button.cs @@ -17,7 +17,7 @@ namespace OpenAuth.Domain.Model public string Control_ID { get; set; } public string Category { get; set; } public string Description { get; set; } - public Nullable Enabled { get; set; } + public bool Enabled { get; set; } public Nullable SortCode { get; set; } public virtual ICollection RoleMenuButtons { get; set; } } diff --git a/OpenAuth.Domain/Model/Department.cs b/OpenAuth.Domain/Model/Department.cs index d411bbeb..c1917f2a 100644 --- a/OpenAuth.Domain/Model/Department.cs +++ b/OpenAuth.Domain/Model/Department.cs @@ -15,9 +15,9 @@ namespace OpenAuth.Domain.Model public string ParentId { get; set; } public string FullName { get; set; } public string Description { get; set; } - public Nullable Enabled { get; set; } + public bool Enabled { get; set; } public Nullable SortCode { get; set; } - public Nullable DeleteMark { get; set; } + public bool DeleteMark { get; set; } public virtual ICollection Roles { get; set; } public virtual ICollection Users { get; set; } } diff --git a/OpenAuth.Domain/Model/Menu.cs b/OpenAuth.Domain/Model/Menu.cs index f4ab6f05..7d33e1f4 100644 --- a/OpenAuth.Domain/Model/Menu.cs +++ b/OpenAuth.Domain/Model/Menu.cs @@ -20,8 +20,8 @@ namespace OpenAuth.Domain.Model public string NavigateUrl { get; set; } public string FormName { get; set; } public string Target { get; set; } - public Nullable IsUnfold { get; set; } - public Nullable Enabled { get; set; } + public bool IsUnfold { get; set; } + public bool Enabled { get; set; } public Nullable SortCode { get; set; } public virtual ICollection + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OpenAuth.Web/Views/Shared/_Header.cshtml b/OpenAuth.Web/Views/Shared/_Header.cshtml new file mode 100644 index 00000000..9403fbea --- /dev/null +++ b/OpenAuth.Web/Views/Shared/_Header.cshtml @@ -0,0 +1,197 @@ + \ No newline at end of file diff --git a/OpenAuth.Web/Views/Shared/_Layout.cshtml b/OpenAuth.Web/Views/Shared/_Layout.cshtml index fc01c32f..28d22bb7 100644 --- a/OpenAuth.Web/Views/Shared/_Layout.cshtml +++ b/OpenAuth.Web/Views/Shared/_Layout.cshtml @@ -1,20 +1,53 @@  - @ViewBag.Title - - + + Dashboard - Ace Admin + + + + + + + + + + + + + - - - - - - -
-

@ViewBag.Title

-
+ + + + + + + + + + + + + + + + + + + + + + @RenderBody() diff --git a/OpenAuth.Web/Views/Web.config b/OpenAuth.Web/Views/Web.config index ec8e5dd0..d89963ed 100644 --- a/OpenAuth.Web/Views/Web.config +++ b/OpenAuth.Web/Views/Web.config @@ -8,6 +8,7 @@ + diff --git a/OpenAuth.Web/Web.config b/OpenAuth.Web/Web.config index b35a50e5..3aa1f37d 100644 --- a/OpenAuth.Web/Web.config +++ b/OpenAuth.Web/Web.config @@ -12,6 +12,8 @@ + +