Sections fix

sunengine · Jan 18, 2021 · 2e90a3d · 2e90a3d
1 parent 2122851
commit 2e90a3d
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 15 deletions.
diff --git a/Client/package.json b/Client/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sunengine-client",
-    "version": "2.12.0",
+    "version": "2.12.1",
     "description": "SunEngine - web engine with support of blog, forum and articles functionality",
     "productName": "SunEngine",
     "author": "Dmitrij Polianin",

diff --git a/README.RU.md b/README.RU.md
@@ -9,7 +9,7 @@
 
 # SunEngine
 
-<a href="#"><img src="https://img.shields.io/static/v1?label=%D0%92%D0%B5%D1%80%D1%81%D0%B8%D1%8F&message=v2.12.0&color=green"></a>
+<a href="#"><img src="https://img.shields.io/static/v1?label=%D0%92%D0%B5%D1%80%D1%81%D0%B8%D1%8F&message=v2.12.1&color=green"></a>
 <a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/.NET%20Core/badge.svg" ></a>
 <a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/Quasar/badge.svg" ></a>
 <br/>

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Build on AspNet Core, VueJS, Quasar.</h3>
 
 # SunEngine
 
-<a href="#"><img src="https://img.shields.io/static/v1?label=Version&message=v2.12.0&color=green"></a>
+<a href="#"><img src="https://img.shields.io/static/v1?label=Version&message=v2.12.1&color=green"></a>
 <a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/.NET%20Core/badge.svg" ></a>
 <a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/Quasar/badge.svg" ></a>
 <br/>

diff --git a/Scripts/BUILD b/Scripts/BUILD
@@ -6,5 +6,5 @@ SERVER_PATH="${PROJECT_ROOT}/Server"
 CLIENT_PATH="${PROJECT_ROOT}/Client"
 CONFIG_PATH="${PROJECT_ROOT}/Config.server.template"
 BUILD_PATH="${PROJECT_ROOT}/build"
-NPM_UTIL="yarn"
+NPM_UTIL="npm"
 
diff --git a/Scripts/publish.sh b/Scripts/publish.sh
@@ -51,16 +51,25 @@ echo -e "${GREEN} REMOTE_SYSTEMD_SERVICE_NAME = ${REMOTE_SYSTEMD_SERVICE_NAME} $
 
 echo  -e "\n${GREEN}Syncing build ${NC}\n"
 
+echo "rsync"
+echo "rsync -arvzhe ssh --progress --stats  --exclude 'Config'  $LOCAL_BUILD_PATH/. -a $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIRECTORY"
+
+#rsync -arvzhe ssh --progress --stats  --exclude 'Config'  $LOCAL_BUILD_PATH/. -a $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIRECTORY
 rsync -arvzhe ssh --progress --stats  --exclude 'Config'  --chown=$REMOTE_DIRECTORY_OWNER:$REMOTE_DIRECTORY_GROUP  $LOCAL_BUILD_PATH/. -a $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIRECTORY
 
+
 echo  -e "\n${GREEN}Syncing Config ignore-existing ${NC}\n"
 
+#rsync -arvzhe ssh --progress --stats --ignore-existing  $LOCAL_BUILD_PATH/Config/. -a $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIRECTORY/Config
 rsync -arvzhe ssh --progress --stats --ignore-existing   --chown=$REMOTE_DIRECTORY_OWNER:$REMOTE_DIRECTORY_GROUP  $LOCAL_BUILD_PATH/Config/. -a $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIRECTORY/Config
 
+
 echo  -e "\n${GREEN}Restarting systemd service and reload nginx ${NC}\n"
 
 ssh ${REMOTE_USER}@${REMOTE_HOST} << EOF
 
+ #chown $REMOTE_DIRECTORY_OWNER:$REMOTE_DIRECTORY_GROUP $REMOTE_DIRECTORY/*
+
  cd ${REMOTE_DIRECTORY}/Server
  if  dotnet SunEngine.dll test-db-con nologo; then
  {

diff --git a/Server/SunEngine.Admin/SunEngine.Admin.csproj b/Server/SunEngine.Admin/SunEngine.Admin.csproj
@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="NJsonSchema" Version="10.3.2" />
+        <PackageReference Include="NJsonSchema" Version="10.3.3" />
         <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
         <PackageReference Include="System.Runtime.Caching" Version="5.0.0" />
     </ItemGroup>

diff --git a/Server/SunEngine.Cli/SunEngine.Cli.csproj b/Server/SunEngine.Cli/SunEngine.Cli.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
         <LangVersion>latest</LangVersion>
-        <Version>2.12.0</Version>
+        <Version>2.12.1</Version>
         <Title>SunEngine</Title>
         <Authors>Dmitrij Polianin</Authors>
         <Description>Site engine with blog, forum and articles functionalities on Asp.Net Core and Vue.Js.</Description>

diff --git a/Server/SunEngine.Core/Cache/Services/SectionsCache.cs b/Server/SunEngine.Core/Cache/Services/SectionsCache.cs
@@ -71,8 +71,8 @@ public void Initialize()
 				try
 				{
 					serverSectionsTmp.Add(section.Name,
-						new SectionServerCached(section, sectionTypes.Sections[section.Name].ServerSectionType, rolesCache));
-					clientSectionsTmp.Add(new SectionClientCached(section, sectionTypes.Sections[section.Name].ClientSectionType, rolesCache));
+						new SectionServerCached(section, sectionTypes.Sections[section.Type].ServerSectionType, rolesCache));
+					clientSectionsTmp.Add(new SectionClientCached(section, sectionTypes.Sections[section.Type].ClientSectionType, rolesCache));
 				}
 				catch
 				{
@@ -83,4 +83,4 @@ public void Initialize()
 			ClientSections = clientSectionsTmp.ToImmutableList();
 		}
 	}
-}
+}
diff --git a/Server/SunEngine.Core/SunEngine.Core.csproj b/Server/SunEngine.Core/SunEngine.Core.csproj
@@ -2,23 +2,23 @@
 
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
-        <Version>2.12.0</Version>
+        <Version>2.12.1</Version>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Flurl" Version="3.0.1" />
-        <PackageReference Include="HtmlSanitizer" Version="5.0.372" />
+        <PackageReference Include="HtmlSanitizer" Version="5.0.376" />
         <PackageReference Include="linq2db" Version="3.2.3" />
         <PackageReference Include="linq2db.Identity" Version="3.2.0" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
         <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="5.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="5.0.2" />
         <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
         <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.8.0" />
-        <PackageReference Include="NJsonSchema" Version="10.3.2" />
+        <PackageReference Include="NJsonSchema" Version="10.3.3" />
         <PackageReference Include="Npgsql" Version="5.0.1.1" />
         <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta0013" />
         <PackageReference Include="SixLabors.ImageSharp" Version="1.0.2" />

diff --git a/Server/SunEngine.DataSeed/SunEngine.DataSeed.csproj b/Server/SunEngine.DataSeed/SunEngine.DataSeed.csproj
@@ -9,7 +9,7 @@
         <PackageReference Include="linq2db" Version="3.2.3" />
         <PackageReference Include="linq2db.Identity" Version="3.2.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
-        <PackageReference Include="NJsonSchema" Version="10.3.2" />
+        <PackageReference Include="NJsonSchema" Version="10.3.3" />
         <PackageReference Include="Npgsql" Version="5.0.1.1" />
     </ItemGroup>
 

diff --git a/SunEngine.md b/SunEngine.md
@@ -1,5 +1,5 @@
 # SunEngine
-**Version 2.12.0**
+**Version 2.12.1**
 ***************************************************************
 Do not delete this file! This file need to detect project root.
 ***************************************************************