-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update for dotnet 5 and private prerelease of CSLA 5.4.0
- Loading branch information
1 parent
06e2f36
commit bc25f58
Showing
22 changed files
with
450 additions
and
393 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,37 @@ | ||
|
|
||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| # Visual Studio Version 16 | ||
| VisualStudioVersion = 16.0.30001.183 | ||
| VisualStudioVersion = 16.0.30717.126 | ||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorCslaAuthentication.Server", "BlazorCslaAuthentication\Server\BlazorCslaAuthentication.Server.csproj", "{00B2DEFC-74AC-419C-8B54-27A2CBCBA559}" | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorCslaAuthentication.Server", "BlazorCslaAuthentication\Server\BlazorCslaAuthentication.Server.csproj", "{EF65DC2B-09EB-4FC0-81A4-C252217DAEE2}" | ||
| EndProject | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorCslaAuthentication.Client", "BlazorCslaAuthentication\Client\BlazorCslaAuthentication.Client.csproj", "{C3BE9F38-5720-432E-9268-BA6963D4D852}" | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorCslaAuthentication.Client", "BlazorCslaAuthentication\Client\BlazorCslaAuthentication.Client.csproj", "{DB551421-DEA4-45BE-80FA-A58CAE414E24}" | ||
| EndProject | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorCslaAuthentication.Shared", "BlazorCslaAuthentication\Shared\BlazorCslaAuthentication.Shared.csproj", "{FD4AA7EE-FDEB-4993-909A-865E52A798DA}" | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorCslaAuthentication.Shared", "BlazorCslaAuthentication\Shared\BlazorCslaAuthentication.Shared.csproj", "{704C28BF-1D0F-4B05-984F-64D9E4592041}" | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|Any CPU = Debug|Any CPU | ||
| Release|Any CPU = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {00B2DEFC-74AC-419C-8B54-27A2CBCBA559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {00B2DEFC-74AC-419C-8B54-27A2CBCBA559}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {00B2DEFC-74AC-419C-8B54-27A2CBCBA559}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {00B2DEFC-74AC-419C-8B54-27A2CBCBA559}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {C3BE9F38-5720-432E-9268-BA6963D4D852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {C3BE9F38-5720-432E-9268-BA6963D4D852}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {C3BE9F38-5720-432E-9268-BA6963D4D852}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {C3BE9F38-5720-432E-9268-BA6963D4D852}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {FD4AA7EE-FDEB-4993-909A-865E52A798DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {FD4AA7EE-FDEB-4993-909A-865E52A798DA}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {FD4AA7EE-FDEB-4993-909A-865E52A798DA}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {FD4AA7EE-FDEB-4993-909A-865E52A798DA}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {EF65DC2B-09EB-4FC0-81A4-C252217DAEE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {EF65DC2B-09EB-4FC0-81A4-C252217DAEE2}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {EF65DC2B-09EB-4FC0-81A4-C252217DAEE2}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {EF65DC2B-09EB-4FC0-81A4-C252217DAEE2}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {DB551421-DEA4-45BE-80FA-A58CAE414E24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {DB551421-DEA4-45BE-80FA-A58CAE414E24}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {DB551421-DEA4-45BE-80FA-A58CAE414E24}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {DB551421-DEA4-45BE-80FA-A58CAE414E24}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {704C28BF-1D0F-4B05-984F-64D9E4592041}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {704C28BF-1D0F-4B05-984F-64D9E4592041}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {704C28BF-1D0F-4B05-984F-64D9E4592041}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {704C28BF-1D0F-4B05-984F-64D9E4592041}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| GlobalSection(ExtensibilityGlobals) = postSolution | ||
| SolutionGuid = {5FB7346C-099A-40E4-BB31-D45DDDF6EF0B} | ||
| SolutionGuid = {C6BA5FD3-57AD-48D8-B744-FA73366E5918} | ||
| EndGlobalSection | ||
| EndGlobal |
17 changes: 7 additions & 10 deletions
17
...CslaAuthentication/BlazorCslaAuthentication/Client/BlazorCslaAuthentication.Client.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 20 additions & 18 deletions
38
BlazorCslaAuthentication/BlazorCslaAuthentication/Client/Shared/MainLayout.razor
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,26 @@ | ||
| @inherits LayoutComponentBase | ||
|
|
||
| <div class="sidebar"> | ||
| <NavMenu /> | ||
| </div> | ||
|
|
||
| <div class="main"> | ||
| <div class="top-row px-4"> | ||
| <AuthorizeView> | ||
| <Authorized> | ||
| Hello, @context.User.Identity.Name | ||
| <a href="/Logout">Log out</a> | ||
| </Authorized> | ||
| <NotAuthorized> | ||
| <a href="/Login">Log in</a> | ||
| </NotAuthorized> | ||
| </AuthorizeView> | ||
| <a href="https://cslanet.com" target="_blank">About</a> | ||
| <div class="page"> | ||
| <div class="sidebar"> | ||
| <NavMenu /> | ||
| </div> | ||
|
|
||
| <div class="content px-4"> | ||
| @Body | ||
| <div class="main"> | ||
| <div class="top-row px-4 auth"> | ||
| <AuthorizeView> | ||
| <Authorized> | ||
| Hello, @context.User.Identity.Name | ||
| <a href="/Logout">Log out</a> | ||
| </Authorized> | ||
| <NotAuthorized> | ||
| <a href="/Login">Log in</a> | ||
| </NotAuthorized> | ||
| </AuthorizeView> | ||
| <a href="https://cslanet.com" target="_blank">About</a> | ||
| </div> | ||
|
|
||
| <div class="content px-4"> | ||
| @Body | ||
| </div> | ||
| </div> | ||
| </div> |
70 changes: 70 additions & 0 deletions
70
BlazorCslaAuthentication/BlazorCslaAuthentication/Client/Shared/MainLayout.razor.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| .page { | ||
| position: relative; | ||
| display: flex; | ||
| flex-direction: column; | ||
| } | ||
|
|
||
| .main { | ||
| flex: 1; | ||
| } | ||
|
|
||
| .sidebar { | ||
| background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); | ||
| } | ||
|
|
||
| .top-row { | ||
| background-color: #f7f7f7; | ||
| border-bottom: 1px solid #d6d5d5; | ||
| justify-content: flex-end; | ||
| height: 3.5rem; | ||
| display: flex; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .top-row ::deep a, .top-row .btn-link { | ||
| white-space: nowrap; | ||
| margin-left: 1.5rem; | ||
| } | ||
|
|
||
| .top-row a:first-child { | ||
| overflow: hidden; | ||
| text-overflow: ellipsis; | ||
| } | ||
|
|
||
| @media (max-width: 640.98px) { | ||
| .top-row:not(.auth) { | ||
| display: none; | ||
| } | ||
|
|
||
| .top-row.auth { | ||
| justify-content: space-between; | ||
| } | ||
|
|
||
| .top-row a, .top-row .btn-link { | ||
| margin-left: 0; | ||
| } | ||
| } | ||
|
|
||
| @media (min-width: 641px) { | ||
| .page { | ||
| flex-direction: row; | ||
| } | ||
|
|
||
| .sidebar { | ||
| width: 250px; | ||
| height: 100vh; | ||
| position: sticky; | ||
| top: 0; | ||
| } | ||
|
|
||
| .top-row { | ||
| position: sticky; | ||
| top: 0; | ||
| z-index: 1; | ||
| } | ||
|
|
||
| .main > div { | ||
| padding-left: 2rem !important; | ||
| padding-right: 1.5rem !important; | ||
| } | ||
| } |
62 changes: 62 additions & 0 deletions
62
BlazorCslaAuthentication/BlazorCslaAuthentication/Client/Shared/NavMenu.razor.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| .navbar-toggler { | ||
| background-color: rgba(255, 255, 255, 0.1); | ||
| } | ||
|
|
||
| .top-row { | ||
| height: 3.5rem; | ||
| background-color: rgba(0,0,0,0.4); | ||
| } | ||
|
|
||
| .navbar-brand { | ||
| font-size: 1.1rem; | ||
| } | ||
|
|
||
| .oi { | ||
| width: 2rem; | ||
| font-size: 1.1rem; | ||
| vertical-align: text-top; | ||
| top: -2px; | ||
| } | ||
|
|
||
| .nav-item { | ||
| font-size: 0.9rem; | ||
| padding-bottom: 0.5rem; | ||
| } | ||
|
|
||
| .nav-item:first-of-type { | ||
| padding-top: 1rem; | ||
| } | ||
|
|
||
| .nav-item:last-of-type { | ||
| padding-bottom: 1rem; | ||
| } | ||
|
|
||
| .nav-item ::deep a { | ||
| color: #d7d7d7; | ||
| border-radius: 4px; | ||
| height: 3rem; | ||
| display: flex; | ||
| align-items: center; | ||
| line-height: 3rem; | ||
| } | ||
|
|
||
| .nav-item ::deep a.active { | ||
| background-color: rgba(255,255,255,0.25); | ||
| color: white; | ||
| } | ||
|
|
||
| .nav-item ::deep a:hover { | ||
| background-color: rgba(255,255,255,0.1); | ||
| color: white; | ||
| } | ||
|
|
||
| @media (min-width: 641px) { | ||
| .navbar-toggler { | ||
| display: none; | ||
| } | ||
|
|
||
| .collapse { | ||
| /* Never collapse the sidebar for wide screens */ | ||
| display: block; | ||
| } | ||
| } |
16 changes: 0 additions & 16 deletions
16
BlazorCslaAuthentication/BlazorCslaAuthentication/Client/Shared/SurveyPrompt.razor
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.