refactor: replace FluentUI with FAST components

BSData · Mar 3, 2022 · 27d3688 · 27d3688
1 parent 9568b17
commit 27d3688
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/src/Phalanx.App/App.razor b/src/Phalanx.App/App.razor
@@ -1,4 +1,4 @@
-<FluentDesignSystemProvider NeutralBaseColor="#242424" AccentBaseColor="#0078D4" BaseLayerLuminance="0.1f">
+<fast-design-system-provider accent-color="#0078D4" base-layer-luminance="0.15">
     <Router AppAssembly="@typeof(App).Assembly">
         <Found Context="routeData">
             <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
@@ -11,4 +11,4 @@
             </LayoutView>
         </NotFound>
     </Router>
-</FluentDesignSystemProvider>
+</fast-design-system-provider>
diff --git a/src/Phalanx.App/Pages/Home/WelcomeView.razor b/src/Phalanx.App/Pages/Home/WelcomeView.razor
@@ -16,6 +16,6 @@
     </li>
     <li>
         Visit our GitHub repository to see source code, raise issues and see planning at
-        <FluentAnchor Appearance="Appearance.Hypertext" Href="https://github.com/BSData/phalanx">https://github.com/BSData/phalanx</FluentAnchor>
+        <fast-anchor appearance="hypertext" href="https://github.com/BSData/phalanx">https://github.com/BSData/phalanx</fast-anchor>
     </li>
 </ul>
diff --git a/src/Phalanx.App/Pages/Index.razor b/src/Phalanx.App/Pages/Index.razor
@@ -3,5 +3,5 @@
 <Phalanx.App.Pages.Home.WelcomeView></Phalanx.App.Pages.Home.WelcomeView>
 
 <div style="display: flex; justify-content: space-around;">
-    <FluentAnchor Appearance="Appearance.Accent" Href="/rosteredit">Edit sample roster</FluentAnchor>
+    <fast-anchor appearance="accent" href="/rosteredit">Edit sample roster</fast-anchor>
 </div>
diff --git a/src/Phalanx.App/Phalanx.App.csproj b/src/Phalanx.App/Phalanx.App.csproj
@@ -1,16 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <TargetFramework>$(CommonTargetFramework)</TargetFramework>
     <!-- <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest> -->
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Fast.Components.FluentUI" Version="1.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="PublishSPAforGitHubPages.Build" Version="1.3.6" />
   </ItemGroup>

diff --git a/src/Phalanx.App/Shared/MainLayout.razor b/src/Phalanx.App/Shared/MainLayout.razor
@@ -17,5 +17,7 @@
 </div>
 
 @code {
-    static string AppVersion = typeof(Program).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
+    static string AppVersion =
+        typeof(Program).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion
+            ?? "(n/a)";
 }
diff --git a/src/Phalanx.App/_Imports.razor b/src/Phalanx.App/_Imports.razor
@@ -8,5 +8,4 @@
 @using Microsoft.JSInterop
 @using Phalanx.App
 @using Phalanx.App.Shared
-@using Microsoft.Fast.Components.FluentUI
 
diff --git a/src/Phalanx.App/wwwroot/index.html b/src/Phalanx.App/wwwroot/index.html
@@ -28,11 +28,11 @@
         <a class="dismiss">🗙</a>
     </div>
     <script src="_framework/blazor.webassembly.js"></script>
+    <!-- turned off PWA for now to prevent cache issues - reenable when ready -->
     <!-- <script>navigator.serviceWorker.register('service-worker.js');</script> -->
     <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
     <script type="module" src="https://cdn.jsdelivr.net/npm/@microsoft/fast-components@2.21.1/dist/fast-components.min.js"></script>
-    <script type="module" src="https://cdn.jsdelivr.net/npm/@fluentui/web-components@2.2.3/dist/web-components.min.js"></script>
     <script type="text/javascript" src="scripts/rosterSelector.js"></script>
     <script type="text/javascript" src="scripts/rosterCreate.js"></script>
 </body>