Update components

devkimchi · Oct 16, 2023 · 6308044 · 6308044
1 parent 60bde7f
commit 6308044
Show file tree

Hide file tree

Showing 19 changed files with 53 additions and 3,259 deletions.
diff --git a/YouTubeSummariser.sln b/YouTubeSummariser.sln
@@ -13,12 +13,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YouTubeSummariser.Services"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YouTubeSummariser.Components", "src\YouTubeSummariser.Components\YouTubeSummariser.Components.csproj", "{8F0B64D6-E1A2-487F-8978-AA91A2732AF3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YouTubeSummariser.Components2", "src\YouTubeSummariser.Components2\YouTubeSummariser.Components2.csproj", "{43651591-F6BB-4401-B3D2-6AA1D8017BD8}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YouTubeSummariser.WebApp.Wasm", "src\YouTubeSummariser.WebApp.Wasm\YouTubeSummariser.WebApp.Wasm.csproj", "{BA0E2490-C014-4325-85C3-5132FEBE1844}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YouTubeSummariser.WebApp.Teams", "src\YouTubeSummariser.WebApp.Teams\YouTubeSummariser.WebApp.Teams.csproj", "{277E49A0-CB06-427A-8066-9A8456310673}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YouTubeSummariser.Components.Facade", "src\YouTubeSummariser.Components.Facade\YouTubeSummariser.Components.Facade.csproj", "{7767F63C-E137-4469-9D90-63BEB45889FB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,10 +41,6 @@ Global
 		{8F0B64D6-E1A2-487F-8978-AA91A2732AF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8F0B64D6-E1A2-487F-8978-AA91A2732AF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8F0B64D6-E1A2-487F-8978-AA91A2732AF3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{43651591-F6BB-4401-B3D2-6AA1D8017BD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43651591-F6BB-4401-B3D2-6AA1D8017BD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43651591-F6BB-4401-B3D2-6AA1D8017BD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{43651591-F6BB-4401-B3D2-6AA1D8017BD8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BA0E2490-C014-4325-85C3-5132FEBE1844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BA0E2490-C014-4325-85C3-5132FEBE1844}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BA0E2490-C014-4325-85C3-5132FEBE1844}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +51,10 @@ Global
 		{277E49A0-CB06-427A-8066-9A8456310673}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{277E49A0-CB06-427A-8066-9A8456310673}.Release|Any CPU.Build.0 = Release|Any CPU
 		{277E49A0-CB06-427A-8066-9A8456310673}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{7767F63C-E137-4469-9D90-63BEB45889FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7767F63C-E137-4469-9D90-63BEB45889FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7767F63C-E137-4469-9D90-63BEB45889FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7767F63C-E137-4469-9D90-63BEB45889FB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -64,9 +64,9 @@ Global
 		{CEB81668-3BE6-4BBC-BA78-7AD7F64F80C6} = {F0754B28-F0B2-414C-83DB-06854DBF508E}
 		{47F2E24C-23E7-4E07-B52A-7A33C5165645} = {F0754B28-F0B2-414C-83DB-06854DBF508E}
 		{8F0B64D6-E1A2-487F-8978-AA91A2732AF3} = {F0754B28-F0B2-414C-83DB-06854DBF508E}
-		{43651591-F6BB-4401-B3D2-6AA1D8017BD8} = {F0754B28-F0B2-414C-83DB-06854DBF508E}
 		{BA0E2490-C014-4325-85C3-5132FEBE1844} = {F0754B28-F0B2-414C-83DB-06854DBF508E}
 		{277E49A0-CB06-427A-8066-9A8456310673} = {F0754B28-F0B2-414C-83DB-06854DBF508E}
+		{7767F63C-E137-4469-9D90-63BEB45889FB} = {F0754B28-F0B2-414C-83DB-06854DBF508E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3E8AEBE9-75D2-45E8-8795-38BB5E81FEFD}

diff --git a/...ubeSummariser.Components/OpenAPIs/v3.yaml → ...ariser.Components.Facade/OpenAPIs/v3.yaml b/...ubeSummariser.Components/OpenAPIs/v3.yaml → ...ariser.Components.Facade/OpenAPIs/v3.yaml
diff --git a/src/YouTubeSummariser.Components.Facade/YouTubeSummariser.Components.Facade.csproj b/src/YouTubeSummariser.Components.Facade/YouTubeSummariser.Components.Facade.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+
+    <AssemblyName>YouTubeSummariser.Components.Facade</AssemblyName>
+    <RootNamespace>YouTubeSummariser.Components.Facade</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="7.0.12">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="NSwag.ApiDescription.Client" Version="13.20.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <OpenApiReference Include="OpenAPIs\v3.yaml" CodeGenerator="NSwagCSharp" Namespace="YouTubeSummariser.Components.Facade" ClassName="YouTubeSummariserClient">
+      <SourceUri>http://localhost:7071/api/openapi/v3.yaml</SourceUri>
+    </OpenApiReference>
+  </ItemGroup>
+
+</Project>
diff --git a/src/YouTubeSummariser.Components/YouTubeSummariser.Components.csproj b/src/YouTubeSummariser.Components/YouTubeSummariser.Components.csproj
@@ -1,6 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <!--<TargetFramework>net7.0</TargetFramework>-->
+    <!--<TargetFrameworks>net6.0;net7.0</TargetFrameworks>-->
+
     <AssemblyName>YouTubeSummariser.Components</AssemblyName>
     <RootNamespace>YouTubeSummariser.Components</RootNamespace>
 
@@ -12,23 +16,16 @@
     <SupportedPlatform Include="browser" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.11" />
-    <PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="7.0.11">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NSwag.ApiDescription.Client" Version="13.20.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.23" />
   </ItemGroup>
 
+  <!--<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.12" />
+  </ItemGroup>-->
+
   <ItemGroup>
-    <OpenApiReference Include="OpenAPIs\v3.yaml" CodeGenerator="NSwagCSharp" Namespace="YouTubeSummariser.Components.Facade" ClassName="YouTubeSummariserClient">
-      <SourceUri>http://localhost:7071/api/openapi/v3.yaml</SourceUri>
-    </OpenApiReference>
+    <ProjectReference Include="..\YouTubeSummariser.Components.Facade\YouTubeSummariser.Components.Facade.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/YouTubeSummariser.Components/YouTubeSummariserComponent.razor b/src/YouTubeSummariser.Components/YouTubeSummariserComponent.razor
@@ -21,7 +21,9 @@
                 <label for="summary-language-code" class="form-label"><strong>Summary Language</strong></label>
                 <select class="form-select" id="summary-language-code" aria-label="Summary language code" @bind="SummaryLanguageCode">
                     <option value="en" selected>English</option>
+                    <option value="ja">Japanese</option>
                     <option value="ko">Korean</option>
+                    <option value="ms">Malay</option>
                 </select>
             </div>
         </div>
@@ -34,11 +36,11 @@
         </div>
     </div>
 
-    <div class="row">
+    @* <div class="row">
         <div class="mb-3">
             <div id="progressBar" hidden="@SummaryCompleted"></div>
         </div>
-    </div>
+    </div> *@
 
     <div class="row">
         <div class="mb-3">

diff --git a/src/YouTubeSummariser.Components/YouTubeSummariserComponent.razor.cs b/src/YouTubeSummariser.Components/YouTubeSummariserComponent.razor.cs
@@ -58,7 +58,7 @@ protected async Task CompleteAsync(MouseEventArgs ev)
 
         this.Summary = default;
         this.SummaryCompleted = false;
-        await this.JSR.InvokeVoidAsync("YouTube.RenderProgressBar");
+        // await this.JSR.InvokeVoidAsync("YouTube.RenderProgressBar");
         //await this.ProgressBar.RenderAsync();
 
         var request = new SummariseRequestModel