Merge pull request #3 from gjmwolmarans/syncfusion

moved ResourceList and added no-cache meta tags
gjmwolmarans · Jul 26, 2024 · ce2b8c8 · ce2b8c8
2 parents 9c323ca + 3210eb4
commit ce2b8c8
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/me/Pages/Learning/ResourceList.razor → me/Components/Resource/ResourceList.razor b/me/Pages/Learning/ResourceList.razor → me/Components/Resource/ResourceList.razor
@@ -9,11 +9,12 @@
 
 @if (Resources != null)
 {
-    <SfGrid DataSource=Resources AllowPaging=true >
+    <SfGrid DataSource=Resources AllowPaging=true AllowSorting=true AllowMultiSorting=true AllowFiltering=true>
+        <GridFilterSettings Type="Syncfusion.Blazor.Grids.FilterType.Excel"></GridFilterSettings>
         <GridPageSettings PageSize=50></GridPageSettings>
         <GridColumns>
-            <GridColumn Field="@nameof(Resource.Id)" HeaderText="ID" TextAlign=TextAlign.Right Width=48 AllowSorting=true />
-            <GridColumn Field="@nameof(Resource.Title)" HeaderText="Title" AllowSorting=true >
+            <GridColumn Field="@nameof(Resource.Id)" IsPrimaryKey=true HeaderText="ID" TextAlign=TextAlign.Right Width=72 />
+            <GridColumn Field="@nameof(Resource.Title)" HeaderText="Title">
                 <Template>
                     @{
                         var resource = context as Resource;
@@ -29,8 +30,8 @@
                 </Template>
             </GridColumn>
             <GridColumn Field="@nameof(Resource.Type)" HeaderText="Type" />
-            <GridColumn Field="@nameof(Resource.Experience)" HeaderText="Experience" Type=ColumnType.Double Format="N2" AllowSorting=true />
-            <GridColumn Field="@nameof(Resource.Duration)" HeaderText="Duration" AllowSorting=true>
+            <GridColumn Field="@nameof(Resource.Experience)" HeaderText="Experience" Type=ColumnType.Double Format="N2" />
+            <GridColumn Field="@nameof(Resource.Duration)" HeaderText="Duration">
                 <Template>
                     @{
                         var resource = context as Resource;

diff --git a/me/Pages/AboutMe.razor b/me/Pages/AboutMe.razor
@@ -1,12 +1,13 @@
 @page "/"
-@using me.shared
-@using me.Pages.Learning
 
 @inject IExcelFileService ExcelFileService
 
-<PageTitle>Gabriël J. M. Wolmarans</PageTitle>
+<PageTitle>gjmwolmarans.me | About Me</PageTitle>
 
-<h1>Hello, world!</h1>
+<FluentStack Orientation="Orientation.Vertical">
+    <h1>Hello, world!</h1>
+    <p></p>
+</FluentStack>
 
 <h2>Competency Matrix</h2>
 
@@ -27,7 +28,7 @@
         if (firstRender)
         {
             Data = await ExcelFileService.LoadData(); 
-            Console.WriteLine(Data.Resources.Count());
+            Console.WriteLine($"Resources ({Data.Resources.Count()})");
         }
     }
 }
diff --git a/me/_Imports.razor b/me/_Imports.razor
@@ -8,4 +8,6 @@
 @using Microsoft.FluentUI.AspNetCore.Components
 @using Microsoft.JSInterop
 @using me
+@using me.shared
 @using me.Layout
+@using me.Components.Resource
diff --git a/me/me.csproj b/me/me.csproj
@@ -11,6 +11,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.*-*" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.*-*" PrivateAssets="all" />
     <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.*-* " />
+    <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.6.0" />
 	  <PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.*-* " />
 	  <PackageReference Include="Syncfusion.Blazor" Version="26.2.4" />
 	  <PackageReference Include="Syncfusion.Blazor.Themes" Version="26.2.4" />
@@ -20,4 +21,9 @@
     <ProjectReference Include="..\me.shared\me.shared.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Components\" />
+    <Folder Include="Components\Resource\" />
+  </ItemGroup>
+
 </Project>
diff --git a/me/wwwroot/index.html b/me/wwwroot/index.html
@@ -19,6 +19,9 @@
     </script>
     <link href="_content/Syncfusion.Blazor.Themes/fluent.css" rel="stylesheet" />
     <script src="_content/Syncfusion.Blazor.Core/scripts/syncfusion-blazor.min.js" type="text/javascript"></script>
+    <meta http-equiv='cache-control' content='no-cache'> 
+    <meta http-equiv='expires' content='0'> 
+    <meta http-equiv='pragma' content='no-cache'>
 </head>
 
 <body>