Skip to content
This repository has been archived by the owner on Jan 10, 2025. It is now read-only.

Commit

Permalink
Merge pull request #267 from abpframework/ABP8_3_1
Browse files Browse the repository at this point in the history
Upgrade to ABP version 8.3.1
  • Loading branch information
EngincanV authored Oct 10, 2024
2 parents eab6174 + 773196e commit 8d1be26
Show file tree
Hide file tree
Showing 793 changed files with 68,849 additions and 75,691 deletions.
50 changes: 25 additions & 25 deletions apps/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,35 +12,35 @@
},
"private": true,
"dependencies": {
"@abp/ng.account": "^8.1.3",
"@abp/ng.components": "^8.1.3",
"@abp/ng.core": "^8.1.3",
"@abp/ng.identity": "^8.1.3",
"@abp/ng.oauth": "^8.1.3",
"@abp/ng.setting-management": "^8.1.3",
"@abp/ng.tenant-management": "^8.1.3",
"@abp/ng.theme.basic": "^8.1.3",
"@abp/ng.theme.lepton-x": "~3.0.0",
"@abp/ng.theme.shared": "^8.1.3",
"@angular/animations": "~17.0.0",
"@angular/common": "~17.0.0",
"@angular/compiler": "~17.0.0",
"@angular/core": "~17.0.0",
"@angular/forms": "~17.0.0",
"@angular/localize": "~17.0.0",
"@angular/platform-browser": "~17.0.0",
"@angular/platform-browser-dynamic": "~17.0.0",
"@angular/router": "~17.0.0",
"@abp/ng.account": "^8.3.1",
"@abp/ng.components": "^8.3.1",
"@abp/ng.core": "^8.3.1",
"@abp/ng.identity": "^8.3.1",
"@abp/ng.oauth": "^8.3.1",
"@abp/ng.setting-management": "^8.3.1",
"@abp/ng.tenant-management": "^8.3.1",
"@abp/ng.theme.basic": "^8.3.1",
"@abp/ng.theme.lepton-x": "~3.3.1",
"@abp/ng.theme.shared": "^8.3.1",
"@angular/animations": "~18.1.0",
"@angular/common": "~18.1.0",
"@angular/compiler": "~18.1.0",
"@angular/core": "~18.1.0",
"@angular/forms": "~18.1.0",
"@angular/localize": "~18.1.0",
"@angular/platform-browser": "~18.1.0",
"@angular/platform-browser-dynamic": "~18.1.0",
"@angular/router": "~18.1.0",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.14.2"
},
"devDependencies": {
"@abp/ng.schematics": "^8.1.3",
"@angular-devkit/build-angular": "~17.0.0",
"@angular/cli": "~17.0.0",
"@angular/compiler-cli": "~17.0.0",
"@angular/language-service": "~17.0.0",
"@abp/ng.schematics": "^8.3.1",
"@angular-devkit/build-angular": "~18.1.0",
"@angular/cli": "~18.1.0",
"@angular/compiler-cli": "~18.1.0",
"@angular/language-service": "~18.1.0",
"@types/jasmine": "~3.5.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
Expand All @@ -57,6 +57,6 @@
"protractor": "~7.0.0",
"ts-node": "~8.3.0",
"tslint": "~6.1.0",
"typescript": "~5.2.2"
"typescript": "~5.4.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.5" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.4" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="8.1.3" />
<PackageReference Include="Volo.CmsKit.Public.Web" Version="8.1.3" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="8.3.1" />
<PackageReference Include="Volo.CmsKit.Public.Web" Version="8.3.1" />
<PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.1.3" />
<PackageReference Include="Volo.Abp.EventBus.RabbitMQ" Version="8.1.3" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="8.1.3" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="8.1.3" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client" Version="8.1.3" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="3.1.0-*" />
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="8.1.3" />
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="8.1.3" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.3.1" />
<PackageReference Include="Volo.Abp.EventBus.RabbitMQ" Version="8.3.1" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="3.3.1" />
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="8.3.1" />
<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="8.3.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
@foreach (var product in Model.Products)
{
var productPrice = product.Price.ToString("C", new CultureInfo("en-US"));
string productImage = !product.ImageName.IsNullOrEmpty() ? $"product-images/{product.ImageName}" : $"product-images/@product.ImageName";
string productImage = !product.ImageName.IsNullOrEmpty() ? $"products/product-images/{product.ImageName}" : $"products/product-images/@product.ImageName";
string buyText = L["Index:AddToBasket"];
<div class="product-container">
<div class="product-list-item" data-product-id="@product.Id.ToString()">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "http://localhost:5035",
"applicationUrl": "http://localhost:5035;https://localhost:44335",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
Expand Down
6 changes: 3 additions & 3 deletions apps/public-web/src/EShopOnAbp.PublicWeb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"name": "EShopOnAbpPublicWeb",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.0.0",
"@abp/signalr": "^8.1.3",
"@abp/cms-kit": "^8.1.3"
"@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~3.3.1",
"@abp/signalr": "^8.3.1",
"@abp/cms-kit": "^8.3.1"
}
}
112 changes: 56 additions & 56 deletions apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/libs/abp/core/abp.css
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
@keyframes spin {
0% {
transform: translateZ(0) rotate(0deg);
}

100% {
transform: translateZ(0) rotate(360deg);
}
}

.abp-block-area {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 102;
background-color: #fff;
opacity: .8;
transition: opacity .25s;
}

.abp-block-area.abp-block-area-disappearing {
opacity: 0;
}

.abp-block-area.abp-block-area-busy:after {
content: attr(data-text);
display: block;
max-width: 125px;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
font-size: 20px;
font-family: sans-serif;
color: #343a40;
text-align: center;
text-transform: uppercase;
}

.abp-block-area.abp-block-area-busy:before {
content: "";
display: block;
width: 150px;
height: 150px;
border-radius: 50%;
border-width: 2px;
border-style: solid;
border-color: transparent #228ae6 #228ae6 #228ae6;
position: absolute;
top: calc(50% - 75px);
left: calc(50% - 75px);
will-change: transform;
animation: spin .75s infinite ease-in-out;
}
@keyframes spin {
0% {
transform: translateZ(0) rotate(0deg);
}

100% {
transform: translateZ(0) rotate(360deg);
}
}

.abp-block-area {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 102;
background-color: #fff;
opacity: .8;
transition: opacity .25s;
}

.abp-block-area.abp-block-area-disappearing {
opacity: 0;
}

.abp-block-area.abp-block-area-busy:after {
content: attr(data-text);
display: block;
max-width: 125px;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
font-size: 20px;
font-family: sans-serif;
color: #343a40;
text-align: center;
text-transform: uppercase;
}

.abp-block-area.abp-block-area-busy:before {
content: "";
display: block;
width: 150px;
height: 150px;
border-radius: 50%;
border-width: 2px;
border-style: solid;
border-color: transparent #228ae6 #228ae6 #228ae6;
position: absolute;
top: calc(50% - 75px);
left: calc(50% - 75px);
will-change: transform;
animation: spin .75s infinite ease-in-out;
}
Loading

0 comments on commit 8d1be26

Please sign in to comment.