Merge pull request #148 from pticostaricags/development

merge "development" into "main"
pticostaricags · Oct 15, 2024 · ea8a907 · ea8a907
2 parents fce67f7 + a700ff8
commit ea8a907
Show file tree

Hide file tree

Showing 111 changed files with 1,629 additions and 237 deletions.
diff --git a/src/FairPlayCombinedSln/FairPlayAdminPortal.MAUI/FairPlayAdminPortal.MAUI.csproj b/src/FairPlayCombinedSln/FairPlayAdminPortal.MAUI/FairPlayAdminPortal.MAUI.csproj
@@ -48,7 +48,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
     <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.0-preview.4.10690" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-preview.4.24266.19" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.0-rc.1.24453.9" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-rc.1.24431.7" />
   </ItemGroup>
 </Project>
diff --git a/src/FairPlayCombinedSln/FairPlayAdminPortal/FairPlayAdminPortal.csproj b/src/FairPlayCombinedSln/FairPlayAdminPortal/FairPlayAdminPortal.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
@@ -22,22 +22,18 @@
     <None Remove="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="8.1.0" />
-    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.3" />
+	<PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="8.2.1" />
+	<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.3" />
     <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.6.0" />
     <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.9.3" />
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.30.0.95878">
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.0-preview.6.24328.4" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0-preview.6.24328.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0-preview.6.24327.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0-preview.6.24327.4">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="System.Drawing.Common" Version="8.0.7" />
+    <PackageReference Include="System.Runtime.Caching" Version="9.0.0-rc.2.24473.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FairPlayCombined.Common\FairPlayCombined.Common.csproj" />

diff --git a/src/FairPlayCombinedSln/FairPlayBudget/FairPlayBudget.csproj b/src/FairPlayCombinedSln/FairPlayBudget/FairPlayBudget.csproj
@@ -7,18 +7,18 @@
     <Configurations>Debug;Release;Debug_Enable_Paid_Tests</Configurations>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="8.1.0" />
+    <PackageReference Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="8.2.1" />
     <PackageReference Include="Blazored.Toast" Version="4.2.1" />
     <PackageReference Include="Microsoft.AspNetCore.Components.DataAnnotations.Validation" Version="3.2.0-rc1.20223.4" />
     <PackageReference Include="Microsoft.AspNetCore.Components.QuickGrid" Version="9.0.0-preview.6.24328.4" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.0-preview.6.24328.4" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0-preview.6.24328.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0-preview.6.24327.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0-preview.6.24327.4">
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.Drawing.Common" Version="8.0.7" />
+    <PackageReference Include="System.Runtime.Caching" Version="9.0.0-rc.2.24473.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FairPlayCombined.Common\FairPlayCombined.Common.csproj" />

diff --git a/src/FairPlayCombinedSln/FairPlayBudget/Program.cs b/src/FairPlayCombinedSln/FairPlayBudget/Program.cs
@@ -115,4 +115,4 @@
 // Add additional endpoints required by the Identity /Account Razor components.
 app.MapAdditionalIdentityEndpoints();
 
-app.Run();
+await app.RunAsync();
diff --git a/src/FairPlayCombinedSln/FairPlayCRM.SharedUI/Components/Pages/User/CompanyCreate.razor b/src/FairPlayCombinedSln/FairPlayCRM.SharedUI/Components/Pages/User/CompanyCreate.razor
@@ -58,6 +58,27 @@
                          style="width:100%;">
         </FluentTextField>
     </div>
+    <div>
+        <FluentLabel Typo="Typography.Body">LinkedIn Url</FluentLabel>
+        <FluentTextField @bind-Value="@this.createCompanyModel.LinkedInUrl"
+                         InputMode="InputMode.Url" TextFieldType="TextFieldType.Url"
+                         style="width:100%;">
+        </FluentTextField>
+    </div>
+    <div>
+        <FluentLabel Typo="Typography.Body">Instagram Url</FluentLabel>
+        <FluentTextField @bind-Value="@this.createCompanyModel.InstagramUrl"
+                         InputMode="InputMode.Url" TextFieldType="TextFieldType.Url"
+                         style="width:100%;">
+        </FluentTextField>
+    </div>
+    <div>
+        <FluentLabel Typo="Typography.Body">X (Formerly Twitter) Url</FluentLabel>
+        <FluentTextField @bind-Value="@this.createCompanyModel.XformerlyTwitterUrl"
+                         InputMode="InputMode.Url" TextFieldType="TextFieldType.Url"
+                         style="width:100%;">
+        </FluentTextField>
+    </div>
     <div>
         <FluentButton Type="ButtonType.Submit" Appearance="Appearance.Accent">Save</FluentButton>
     </div>

diff --git a/src/FairPlayCombinedSln/FairPlayCRM.SharedUI/Components/Pages/User/CompanyList.razor b/src/FairPlayCombinedSln/FairPlayCRM.SharedUI/Components/Pages/User/CompanyList.razor
@@ -27,8 +27,70 @@
             <FluentDataGrid Style="min-width: max-content;" ItemsProvider="@this.ItemsProvider" Pagination="@paginationState">
                 <PropertyColumn Property="@(p=>p.Name)"></PropertyColumn>
                 <PropertyColumn Property="@(p=>p.Phone)"></PropertyColumn>
-                <PropertyColumn Property="@(p=>p.WebsiteUrl)"></PropertyColumn>
-                <PropertyColumn Property="@(p=>p.YouTubeChannelUrl)"></PropertyColumn>
+                <TemplateColumn Title="Online presence">
+                    <ul>
+                        @if (!String.IsNullOrWhiteSpace(context.WebsiteUrl))
+                        {
+                            <li>
+                                <FluentLabel Typo="Typography.Body">
+                                    <FluentAnchor Href="@context.WebsiteUrl" Target="_blank">
+                                        <FluentIcon Value="@(new Icons.Regular.Size16.Globe())"
+                                                    Color="Color.Accent" Slot="start"></FluentIcon>
+                                        Website
+                                    </FluentAnchor>
+                                </FluentLabel>
+                            </li>
+                        }
+                        @if (!String.IsNullOrWhiteSpace(context.LinkedInUrl))
+                        {
+                            <li>
+                                <FluentLabel Typo="Typography.Body">
+                                    <FluentAnchor Href="@context.LinkedInUrl" Target="_blank">
+                                        <FluentIcon Value="@(new Icons.Regular.Size16.Globe())"
+                                                    Color="Color.Accent" Slot="start"></FluentIcon>
+                                        LinkedIn
+                                    </FluentAnchor>
+                                </FluentLabel>
+                            </li>
+                        }
+                        @if (!String.IsNullOrWhiteSpace(context.InstagramUrl))
+                        {
+                            <li>
+                                <FluentLabel Typo="Typography.Body">
+                                    <FluentAnchor Href="@context.InstagramUrl" Target="_blank">
+                                        <FluentIcon Value="@(new Icons.Regular.Size16.Globe())"
+                                                    Color="Color.Accent" Slot="start"></FluentIcon>
+                                        Instagram
+                                    </FluentAnchor>
+                                </FluentLabel>
+                            </li>
+                        }
+                        @if (!String.IsNullOrWhiteSpace(context.YouTubeChannelUrl))
+                        {
+                            <li>
+                                <FluentLabel Typo="Typography.Body">
+                                    <FluentAnchor Href="@context.YouTubeChannelUrl" Target="_blank">
+                                        <FluentIcon Value="@(new Icons.Regular.Size16.Globe())"
+                                                    Color="Color.Accent" Slot="start"></FluentIcon>
+                                        YouTube Channel
+                                    </FluentAnchor>
+                                </FluentLabel>
+                            </li>
+                        }
+                        @if (!String.IsNullOrWhiteSpace(context.XformerlyTwitterUrl))
+                        {
+                            <li>
+                                <FluentLabel Typo="Typography.Body">
+                                    <FluentAnchor Href="@context.XformerlyTwitterUrl" Target="_blank">
+                                        <FluentIcon Value="@(new Icons.Regular.Size16.Globe())"
+                                                    Color="Color.Accent" Slot="start"></FluentIcon>
+                                        X (Formerly Twitter)
+                                    </FluentAnchor>
+                                </FluentLabel>
+                            </li>
+                        }
+                    </ul>
+                </TemplateColumn>
             </FluentDataGrid>
         </div>
     </div>

diff --git a/src/FairPlayCombinedSln/FairPlayCRM.SharedUI/Components/Pages/User/ContactCreate.razor b/src/FairPlayCombinedSln/FairPlayCRM.SharedUI/Components/Pages/User/ContactCreate.razor
@@ -63,6 +63,13 @@
                          style="width:100%;">
         </FluentTextField>
     </div>
+    <div>
+        <FluentLabel Typo="Typography.Body">X (Formerly Twitter) Url</FluentLabel>
+        <FluentTextField @bind-Value="@this.createContactModel.XformerlyTwitterUrl" Maxlength="50"
+                         InputMode="InputMode.Url" TextFieldType="TextFieldType.Url"
+                         style="width:100%;">
+        </FluentTextField>
+    </div>
     <div>
         <FluentLabel Typo="Typography.Body">Business Phone Number</FluentLabel>
         <FluentTextField @bind-Value="@this.createContactModel.BusinessPhoneNumber" Maxlength="50"

diff --git a/src/FairPlayCombinedSln/FairPlayCRM.SharedUI/Components/Pages/User/ContactList.razor b/src/FairPlayCombinedSln/FairPlayCRM.SharedUI/Components/Pages/User/ContactList.razor
@@ -24,15 +24,105 @@
 {
     <div style="display: table; table-layout: fixed; width: 100%;">
         <div style="overflow-x: auto;">
-            <FluentDataGrid Style="min-width: max-content;" ItemsProvider="@this.ItemsProvider" Pagination="@paginationState">
-                <PropertyColumn Property="@(p=>p.Name)"></PropertyColumn>
-                <PropertyColumn Property="@(p=>p.Lastname)"></PropertyColumn>
-                <PropertyColumn Property="@(p=>p.EmailAddress)"></PropertyColumn>
-                <PropertyColumn Property="@(p=>p.LinkedInProfileUrl)"></PropertyColumn>
-                <PropertyColumn Property="@(p=>p.YouTubeChannelUrl)"></PropertyColumn>
-                <PropertyColumn Property="@(p=>p.BusinessPhoneNumber)"></PropertyColumn>
-                <PropertyColumn Property="@(p=>p.MobilePhoneNumber)"></PropertyColumn>
-                <PropertyColumn Property="@(p=>p.BirthDate)"></PropertyColumn>
+            <FluentDataGrid Style="min-width: max-content;"
+                            ItemsProvider="@this.ItemsProvider" Pagination="@paginationState">
+                <TemplateColumn Title="Name">
+                    @($"{context.Name} {context.Lastname}")
+                </TemplateColumn>
+                <TemplateColumn Title="Information">
+                    <ul>
+                        @if (context.BirthDate.HasValue)
+                        {
+                            <li>
+                                BirthDate: @context.BirthDate
+                            </li>
+                        }
+                        @if (!String.IsNullOrWhiteSpace(context.EmailAddress))
+                        {
+                            <li>
+                                <FluentLabel Typo="Typography.Body">
+                                    <FluentAnchor Type="" Href="@($"mailto:{context.EmailAddress}")" Target="_blank">
+                                        <FluentIcon Value="@(new Icons.Regular.Size16.Globe())"
+                                                    Color="Color.Accent" Slot="start"></FluentIcon>
+                                        Email
+                                    </FluentAnchor>
+                                </FluentLabel>
+                            </li>
+                        }
+                        @if (!String.IsNullOrWhiteSpace(context.BusinessPhoneNumber))
+                        {
+                            <li>
+                                <FluentLabel Typo="Typography.Body">
+                                    <FluentAnchor Type="" Href="@($"tel:{context.BusinessPhoneNumber}")" Target="_blank">
+                                        <FluentIcon Value="@(new Icons.Regular.Size16.Phone())"
+                                                    Color="Color.Accent" Slot="start"></FluentIcon>
+                                        Business Phone Number
+                                    </FluentAnchor>
+                                </FluentLabel>
+                            </li>
+                        }
+                        @if (!String.IsNullOrWhiteSpace(context.MobilePhoneNumber))
+                        {
+                            <li>
+                                <FluentLabel Typo="Typography.Body">
+                                    <FluentAnchor Type="" Href="@($"tel:{context.MobilePhoneNumber}")" Target="_blank">
+                                        <FluentIcon Value="@(new Icons.Regular.Size16.Phone())"
+                                                    Color="Color.Accent" Slot="start"></FluentIcon>
+                                        Mobile Phone Number
+                                    </FluentAnchor>
+                                </FluentLabel>
+                            </li>
+                        }
+                        @if (!String.IsNullOrWhiteSpace(context.LinkedInProfileUrl))
+                        {
+                            <li>
+                                <FluentLabel Typo="Typography.Body">
+                                    <FluentAnchor Href="@context.LinkedInProfileUrl" Target="_blank">
+                                        <FluentIcon Value="@(new Icons.Regular.Size16.Globe())"
+                                                    Color="Color.Accent" Slot="start"></FluentIcon>
+                                        LinkedIn
+                                    </FluentAnchor>
+                                </FluentLabel>
+                            </li>
+                        }
+                        @if (!String.IsNullOrWhiteSpace(context.InstagramUrl))
+                        {
+                            <li>
+                                <FluentLabel Typo="Typography.Body">
+                                    <FluentAnchor Href="@context.InstagramUrl" Target="_blank">
+                                        <FluentIcon Value="@(new Icons.Regular.Size16.Globe())"
+                                                    Color="Color.Accent" Slot="start"></FluentIcon>
+                                        Instagram
+                                    </FluentAnchor>
+                                </FluentLabel>
+                            </li>
+                        }
+                        @if (!String.IsNullOrWhiteSpace(context.YouTubeChannelUrl))
+                        {
+                            <li>
+                                <FluentLabel Typo="Typography.Body">
+                                    <FluentAnchor Href="@context.YouTubeChannelUrl" Target="_blank">
+                                        <FluentIcon Value="@(new Icons.Regular.Size16.Globe())"
+                                                    Color="Color.Accent" Slot="start"></FluentIcon>
+                                        YouTube Channel
+                                    </FluentAnchor>
+                                </FluentLabel>
+                            </li>
+                        }
+                        @if (!String.IsNullOrWhiteSpace(context.XformerlyTwitterUrl))
+                        {
+                            <li>
+                                <FluentLabel Typo="Typography.Body">
+                                    <FluentAnchor Href="@context.XformerlyTwitterUrl" Target="_blank">
+                                        <FluentIcon Value="@(new Icons.Regular.Size16.Globe())"
+                                                    Color="Color.Accent" Slot="start"></FluentIcon>
+                                        X (Formerly Twitter)
+                                    </FluentAnchor>
+                                </FluentLabel>
+                            </li>
+                        }
+                    </ul>
+                </TemplateColumn>
             </FluentDataGrid>
         </div>
     </div>