NetinaShop
/
Api
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: NetinaShop:81b78d16d0e271233ea5d7f355038545c1974d9c
Branches Tags
NetinaShop:master
NetinaShop:subProduct
NetinaShop:release
..
compare: NetinaShop:e45d48d8b3b74b5c7190d141bc1fb1fac6e4f3a4
Branches Tags
NetinaShop:master
NetinaShop:subProduct
NetinaShop:release

No commits in common. "81b78d16d0e271233ea5d7f355038545c1974d9c" and "e45d48d8b3b74b5c7190d141bc1fb1fac6e4f3a4" have entirely different histories.
81b78d16d0 ... e45d48d8b3

4 changed files with 9 additions and 20 deletions
Show Stats Expand all files Collapse all files

8
Netina.Common/Netina.Common.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <!--<PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
@ -13,9 +13,9 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.0.2" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.0.2" />
</ItemGroup> </ItemGroup>-->
<!--<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
@ -26,7 +26,7 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
</ItemGroup>--> </ItemGroup>
<ItemGroup> <ItemGroup>
<Using Include="MD.PersianDateTime.Standard" /> <Using Include="MD.PersianDateTime.Standard" />

4
Netina.Core/BaseServices/PageService.cs
View File

@ -56,9 +56,7 @@ public class PageService(
Type = entity.Type, Type = entity.Type,
Slug = entity.Slug, Slug = entity.Slug,
CreatedAt = DateTime.Now, CreatedAt = DateTime.Now,
CreatedBy = currentUserService.UserName ?? string.Empty, CreatedBy = currentUserService.UserName ?? string.Empty
Indexing = entity.Indexing,
Sections = entity.Sections
}; };
if (!basePage.Type.IsNullOrEmpty()) if (!basePage.Type.IsNullOrEmpty())
{ {

9
Netina.Domain/MartenEntities/Pages/BasePage.cs
View File

@ -22,15 +22,6 @@ public class BasePageSection
public string CTARoute { get; set; } = string.Empty; public string CTARoute { get; set; } = string.Empty;
public BasePageSectionType Type { get; set; } public BasePageSectionType Type { get; set; }
public string Query { get; set; } = string.Empty; public string Query { get; set; } = string.Empty;
public List<SectionItem> SectionItems { get; set; } = [];
}
public class SectionItem
{
public string Title { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public string ImageLocation { get; set; } = string.Empty;
public string Url { get; set; } = string.Empty;
} }
public enum BasePageSectionType public enum BasePageSectionType

8
Netina.Domain/Netina.Domain.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <!--<PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
@ -16,9 +16,9 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.8" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.8" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.8" /> <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.8" />
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" /> <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" />
</ItemGroup> </ItemGroup>-->
<!--<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
@ -34,7 +34,7 @@
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="5.0.0" /> <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="5.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" /> <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" />
</ItemGroup>--> </ItemGroup>
<ItemGroup> <ItemGroup>