Browse Source

Add RedirectToLogin

pull/4/head
liangshiwei 4 years ago
parent
commit
ff70008d82
  1. 20
      delete-bin-obj-folders.bat
  2. 9
      lsw.Abp.AntDesignUI.sln
  3. 16
      modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Themes/AntDesignTheme/RedirectToLogin.razor
  4. 2
      modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/wwwroot/libs/abp/css/theme.css
  5. 172
      samples/BookStore/src/BookStore.Blazor/wwwroot/global.css
  6. 4
      samples/BookStore/src/BookStore.Blazor/wwwroot/index.html
  7. 14
      src/Lsw.Abp.AntDesignUI/Components/UiPageProgress.razor

20
delete-bin-obj-folders.bat

@ -1,20 +0,0 @@
@ECHO off
cls
ECHO Deleting all BIN and OBJ folders...
ECHO.
FOR /d /r . %%d in (bin,obj) DO (
IF EXIST "%%d" (
ECHO %%d | FIND /I "\node_modules\" > Nul && (
ECHO.Skipping: %%d
) || (
ECHO.Deleting: %%d
rd /s/q "%%d"
)
)
)
ECHO.
ECHO.BIN and OBJ folders have been successfully deleted. Press any key to exit.
pause > nul

9
lsw.Abp.AntDesignUI.sln

@ -78,6 +78,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lsw.Abp.SettingManagement.B
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BookStore.BlazorServer", "samples\BookStore\BookStore.BlazorServer\BookStore.BlazorServer.csproj", "{1E5B082C-96F6-44B4-856E-AC26A5395243}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AntDesignTheme", "AntDesignTheme", "{9F013513-EC16-46DF-BDEF-C9B5F0DA6C12}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -85,9 +87,6 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{9EA4AA35-DEFC-4C25-8333-78137853EC5D} = {6C9F4322-BDC7-42DA-ACBD-1AC641B907B4}
{75753009-1BE9-4994-8D2E-890829844C46} = {0C432416-770F-4331-84E6-5835408A9BD8}
{7C86BBAF-609E-4651-B1AF-FBF3EA669E3A} = {0C432416-770F-4331-84E6-5835408A9BD8}
{84F26612-0056-4CD1-849B-B0B8F046350D} = {0C432416-770F-4331-84E6-5835408A9BD8}
{1F85F600-70F9-4286-B8BD-6A124D9DC43D} = {E36D7268-C7A6-4A7F-81DB-57070F4B049C}
{39E479A5-92DB-4F5B-918A-1920886D4D60} = {1F85F600-70F9-4286-B8BD-6A124D9DC43D}
{BBBBFA7B-B24D-4ED4-9DAE-71A60EDAA640} = {1F85F600-70F9-4286-B8BD-6A124D9DC43D}
@ -120,6 +119,10 @@ Global
{3D8714C4-B78B-4B5E-8675-F6531C21AE2C} = {CCAB1F41-EAB4-4564-B956-C32ED0B03EC2}
{F3ADEF50-755E-4FCB-9746-C946CB0306B3} = {CCAB1F41-EAB4-4564-B956-C32ED0B03EC2}
{1E5B082C-96F6-44B4-856E-AC26A5395243} = {1F85F600-70F9-4286-B8BD-6A124D9DC43D}
{9F013513-EC16-46DF-BDEF-C9B5F0DA6C12} = {0C432416-770F-4331-84E6-5835408A9BD8}
{7C86BBAF-609E-4651-B1AF-FBF3EA669E3A} = {9F013513-EC16-46DF-BDEF-C9B5F0DA6C12}
{75753009-1BE9-4994-8D2E-890829844C46} = {9F013513-EC16-46DF-BDEF-C9B5F0DA6C12}
{84F26612-0056-4CD1-849B-B0B8F046350D} = {9F013513-EC16-46DF-BDEF-C9B5F0DA6C12}
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9EA4AA35-DEFC-4C25-8333-78137853EC5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

16
modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Themes/AntDesignTheme/RedirectToLogin.razor

@ -0,0 +1,16 @@
@inject NavigationManager Navigation
@inject IJSRuntime JSRuntime
@code {
protected override void OnInitialized()
{
if (JSRuntime is IJSInProcessRuntime)
{
Navigation.NavigateTo($"authentication/login?returnUrl={Uri.EscapeDataString(Navigation.Uri)}");
}
else
{
Navigation.NavigateTo($"account/login?returnUrl={Uri.EscapeDataString(Navigation.Uri)}", true);
}
}
}

2
modules/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/wwwroot/libs/abp/css/theme.css

@ -25,7 +25,7 @@ app {
.ant-design-header-left {
background-color: white;
box-shadow: 0 1px 4px rgb(0 21 41 / 8%)
box-shadow: 0 -2px 4px;
}
.ant-design-header-left-light {

172
samples/BookStore/src/BookStore.Blazor/wwwroot/global.css

File diff suppressed because one or more lines are too long

4
samples/BookStore/src/BookStore.Blazor/wwwroot/index.html

@ -8,7 +8,7 @@
<base href="/" />
<!--ABP:Styles-->
<link href="global.css?_v=637821817205844804" rel="stylesheet"/>
<link href="global.css?_v=637826928136708632" rel="stylesheet"/>
<link href="main.css" rel="stylesheet"/>
<!--/ABP:Styles-->
<link href="BookStore.Blazor.styles.css" rel="stylesheet"/>
@ -23,7 +23,7 @@
</div>
<!--ABP:Scripts-->
<script src="global.js?_v=637821817207650731"></script>
<script src="global.js?_v=637826928139057747"></script>
<!--/ABP:Scripts-->
</body>
</html>

14
src/Lsw.Abp.AntDesignUI/Components/UiPageProgress.razor

@ -1,18 +1,18 @@
<div Class="@_css">

@if (_progressStatus == ProgressStatus.Active)
{
<Progress Status="_progressStatus" StrokeColor="_gradients" Percent="@_percent" ShowInfo="false"></Progress>
<Progress class="@_css" Status="_progressStatus" StrokeColor="_gradients" Percent="@_percent" ShowInfo="false"></Progress>
}
else
{
<Progress Status="_progressStatus" ShowInfo="false" Percent=@_percent></Progress>
<Progress class="@_css" Status="_progressStatus" ShowInfo="false" Percent=@_percent></Progress>
}
</div>
<style>
.uiPageProgress{
top: 0 !important;
.uiPageProgress {
top: -10px !important;
left: 0 !important;
width: 100% !important;
z-index: 9999 !important;
@ -20,7 +20,7 @@
display: none;
}
.uiPageProgress-show{
.uiPageProgress-show {
display: block;
}
</style>

Loading…
Cancel
Save