[Front] 1.1.5 (#66)

* [Front] 1.1.5

* [Back] 1.1.5

.github/workflows/Build.yml

@@ -30,7 +30,7 @@ jobs:
           version: "latest"
           run_install: false
 
-      - name: Get pnpm store directory
+      - name: Get pnpm store
         id: pnpm-cache
         run: |
           echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
@@ -43,8 +43,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
-      - name: Install
-        run: pnpm install
+      - name: Build React
+        run: pnpm install && pnpm build
+
+      - name: Move wwwroot
+        run: mv dist TSystems.LoveOTC/wwwroot
 
       - name: Build
         run: |

TSystems.LoveOTC/AdminHub/IAdminClient.cs

@@ -1,4 +1,5 @@
 namespace TSystems.LoveOTC.AdminHub;
 
 public interface IAdminClient {
+
 }

TSystems.LoveOTC/Hub/User/Get.cs

@@ -8,7 +8,7 @@ internal partial class ShopHub {
      * <remarks>
      * @author Aloento
      * @since 0.5.0
-     * @version 0.1.0
+     * @version 0.1.1
      * </remarks>
      */
     [Authorize]
@@ -30,6 +30,7 @@ internal partial class ShopHub {
                 x.EMail,
                 x.Phone,
                 x.Address,
+                x.Admin,
                 x.Version
             })
             .SingleOrDefaultAsync();

TSystems.LoveOTC/Migrations/20231223181315_Init.cs → TSystems.LoveOTC/Migrations/20240107210741_Init.cs

@@ -66,7 +66,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     ProductId = table.Column<long>(type: "bigint", nullable: false),
                     Name = table.Column<string>(type: "character varying(50)", maxLength: 50, nullable: false),
                     CategoryId = table.Column<long>(type: "bigint", nullable: true),
-                    Description = table.Column<string>(type: "jsonb", nullable: true),
+                    Description = table.Column<string>(type: "json", maxLength: 65535, nullable: true),
                     IsArchived = table.Column<bool>(type: "boolean", nullable: true),
                     xmin = table.Column<uint>(type: "xid", rowVersion: true, nullable: false)
                 },

TSystems.LoveOTC/Migrations/ShopContextModelSnapshot.cs

@@ -254,7 +254,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("bigint");
 
                     b.Property<string>("Description")
-                        .HasColumnType("jsonb");
+                        .HasMaxLength(65535)
+                        .HasColumnType("json");
 
                     b.Property<bool?>("IsArchived")
                         .HasColumnType("boolean");

TSystems.LoveOTC/Models/Product.cs

@@ -11,7 +11,7 @@ namespace TSystems.LoveOTC.Models;
  * <remarks>
  * @author Aloento
  * @since 0.1.0
- * @version 0.1.1
+ * @version 0.1.0
  * </remarks>
  */
 [Index(nameof(Name), IsUnique = true)]
@@ -27,7 +27,8 @@ public class Product : Concurrency, IArchive {
 
     public virtual ICollection<Photo> Photos { get; init; }
 
-    [Column(TypeName = "jsonb")]
+    [Column(TypeName = "json")]
+    [StringLength(ushort.MaxValue)]
     public string? Description { get; set; }
 
     public bool? IsArchived { get; set; }

TSystems.LoveOTC/TSystems.LoveOTC.csproj

@@ -21,7 +21,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <PackageProjectUrl>http://shop.eco.tsi-dev.otc-service.com</PackageProjectUrl>
 
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -41,29 +41,13 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.1" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
   </ItemGroup>
 
   <ItemGroup>
     <Content Update="wwwroot">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 
-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent" Condition="'$(Configuration)'=='Release'">
-    <Message Text="Start Build React" Importance="high" />
-    <Exec Command="cd ..  &amp; pnpm build" />
-
-    <ItemGroup>
-      <DistFiles Include="../dist/**/*" />
-      <WWWDir Include="wwwroot" />
-    </ItemGroup>
-
-    <Message Text="Remove Current wwwroot" Importance="high" />
-    <RemoveDir Directories="@(WWWDir)" />
-
-    <Message Text="Copy dist to wwwroot" Importance="high" />
-    <Copy SourceFiles="@(DistFiles)" DestinationFiles="@(DistFiles->'wwwroot\%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>
-
 </Project>

package.json

@@ -15,7 +15,7 @@
     "update": "npx npm-check-updates -u"
   },
   "dependencies": {
-    "@fluentui/react-components": "^9.43.3",
+    "@fluentui/react-components": "^9.44.0",
     "@fluentui/react-hooks": "^8.6.34",
     "@fluentui/react-icons": "^2.0.224",
     "@griffel/react": "^1.5.19",
@@ -50,10 +50,10 @@
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
-    "@types/react": "^18.2.45",
+    "@types/react": "^18.2.47",
     "@types/react-dom": "^18.2.18",
     "@vitejs/plugin-react-swc": "^3.5.0",
     "typescript": "^5.3.3",
-    "vite": "^5.0.10"
+    "vite": "^5.0.11"
   }
 }