Navigation (#13)

src/Tool/src/Boost.Abstractions/Navigation/IAppNavigationService.cs

@@ -0,0 +1,7 @@
+namespace Boost.Navigation
+{
+    public interface IAppNavigationService
+    {
+        AppNavigation GetNavigation();
+    }
+}

src/Tool/src/Boost.Abstractions/Navigation/MainNavigation.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+
+namespace Boost.Navigation
+{
+    public class AppNavigation
+    {
+        public string? Title { get; set; } = default!;
+
+        public IEnumerable<MainNavigationItem> Items { get; set; }
+            = new List<MainNavigationItem>();
+    }
+
+    public class NavigationItem
+    {
+        public string? Id { get; set; } = default!;
+
+        public string Title { get; set; } = default!;
+
+        public string Route { get; set; } = default!;
+
+        public string? Icon { get; set; } = default!;
+
+        public bool IsServer { get; set; }
+    }
+
+    public class MainNavigationItem : NavigationItem
+    {
+        public IEnumerable<NavigationItem> Children { get; set; }
+            = new List<NavigationItem>();
+    }
+}

src/Tool/src/Boost.Core/Boost.Core.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>

src/Tool/src/Boost.Core/BoostServiceCollectionExtensions.cs

@@ -5,6 +5,7 @@
 using Boost.Git;
 using Boost.GraphQL;
 using Boost.Infrastructure;
+using Boost.Navigation;
 using Boost.Nuget;
 using Boost.Pipelines;
 using Boost.Security;
@@ -49,6 +50,7 @@ public static IServiceCollection AddBoost(this IServiceCollection services)
             services.AddSingleton<IAuthTokenStore, UserDataAuthTokenStore>();
             services.AddSingleton<IAuthTokenStoreReader, UserDataAuthTokenStoreReader>();
             services.AddSingleton<IVersionChecker, VersionChecker>();
+            services.AddSingleton<IAppNavigationService, AppNavigationService>();
 
             services.AddUserDataProtection();
 

src/Tool/src/Boost.Core/GraphQL/BoostQueries.cs

@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Boost.GraphQL;
 using Boost.Infrastructure;
+using Boost.Navigation;
 using HotChocolate;
 using HotChocolate.Types;
 
@@ -34,7 +35,12 @@ public BoostApplication GetAppliation()
             CancellationToken cancellationToken)
         {
             return versionChecker.GetVersionInfo(cancellationToken);
+        }
 
+        public AppNavigation GetAppNavigation(
+            [Service] IAppNavigationService appNavigationService)
+        {
+            return appNavigationService.GetNavigation();
         }
     }
 }

src/Tool/src/Boost.Core/Navigation/AppNavigationService.cs

@@ -0,0 +1,49 @@
+using System;
+using System.IO;
+using System.Text.Json;
+using Boost.Infrastructure;
+
+namespace Boost.Navigation
+{
+    public class AppNavigationService : IAppNavigationService
+    {
+        private readonly IBoostCommandContext _commandContext;
+
+        public AppNavigationService(IBoostCommandContext commandContext)
+        {
+            _commandContext = commandContext;
+        }
+
+        public AppNavigation GetNavigation()
+        {
+            Stream? stream = _commandContext.ToolAssembly
+                .GetManifestResourceStream("Boost.Tool.AppNavigation.json");
+
+            if (stream is { })
+            {
+                using StreamReader reader = new StreamReader(stream);
+                var json = reader.ReadToEnd();
+                AppNavigation? appNav = JsonSerializer.Deserialize<AppNavigation>(json)!;
+
+                foreach (MainNavigationItem? item in appNav.Items)
+                {
+                    if (item.Id is null)
+                    {
+                        item.Id = item.Route;
+                    }
+                    foreach (NavigationItem child in item.Children)
+                    {
+                        if (child.Id is null)
+                        {
+                            child.Id = $"{item.Id}.{child.Route}";
+                        }
+                    }
+                }
+
+                return appNav;
+            }
+
+            throw new ApplicationException("Could not load app navigation");
+        }
+    }
+}

src/Tool/src/Boost.Tool/AppNavigation.json

@@ -0,0 +1,97 @@
+{
+  "Title":  "Boost",
+  "Items": [
+    {
+      "Title": "Workspace",
+      "Icon": "mdi-folder-outline",
+      "Route": "Workspace"
+    },
+    {
+      "Title": "Git",
+      "Icon": "mdi-git",
+      "Route": "Git",
+      "Children": [
+        {
+          "Title": "Current",
+          "Route": "Git.Current"
+        },
+        {
+          "Title": "All Local",
+          "Route": "Git.Local"
+        },
+        {
+          "Title": "Remote",
+          "Route": "Git.Remote"
+        },
+        {
+          "Title": "Indexing",
+          "Route": "Git.Index"
+        }
+      ]
+    },
+    {
+      "Title": "Utils",
+      "Icon": "mdi-hammer-screwdriver",
+      "Route": "Utils",
+      "Children": [
+        {
+          "Title": "Encoding & Guids",
+          "Route": "Utils.Encoding"
+        },
+        {
+          "Title": "Base64 to File",
+          "Route": "Utils.Base64ToFile"
+        },
+        {
+          "Title": "Security",
+          "Route": "Utils.Security"
+        }
+      ]
+    },
+    {
+      "Title": "Security",
+      "Icon": "mdi-lock-check",
+      "Route": "Security",
+      "Children": [
+        {
+          "Title": "Tokens",
+          "Route": "Security.Tokens"
+        },
+        {
+          "Title": "Authorize (OIDC)",
+          "Route": "Security.Authorize"
+        },
+        {
+          "Title": "Token requestor",
+          "Route": "Security.TokenRequest"
+        }
+      ]
+    },
+    {
+      "Title": "Snapshooter",
+      "Route": "Snapshooter",
+      "Icon": "mdi-test-tube"
+    },
+    {
+      "Title": "Settings",
+      "Icon": "mdi-cog-outline",
+      "Route": "Settings",
+      "Children": [
+        {
+          "Title": "General",
+          "Route": "Settings.General"
+        },
+        {
+          "Title": "Security",
+          "Route": "Settings.Security"
+        }
+      ]
+    },
+    {
+      "Title": "GraphQL",
+      "Icon": "mdi-graphql",
+      "IsServer": true,
+      "Route": "graphql"
+    }
+  ]
+}

src/Tool/src/Boost.Tool/Boost.Tool.csproj

@@ -32,6 +32,14 @@
     <EmbeddedResource Include="AuthUI/**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Remove="AppNavigation.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="AppNavigation.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <Folder Include="UI\" />
     <Folder Include="AuthUI\" />

src/Tool/src/Boost.Tool/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "Boost.Tool": {
       "commandName": "Project",
-      "commandLineArgs": "version"
+      "commandLineArgs": "ui"
     }
   }
 }

src/UI/boost-ui/src/core/appService.js

@@ -2,6 +2,7 @@ import apollo from "../apollo";
 
 import QUERY_INITIAL_DATA from "./graphql/InitialData.gql";
 import QUERY_VERSION_GET from "./graphql/App/GetVersion.gql";
+import QUERY_NAVIGATION_GET from "./graphql/App/GetNavigation.gql";
 
 export const getInitialData = async () => {
     return await apollo.query({
@@ -16,3 +17,10 @@ export const getVersion = async () => {
         variables: {}
     });
 };
+
+export const getNavigation = async () => {
+    return await apollo.query({
+        query: QUERY_NAVIGATION_GET,
+        variables: {}
+    });
+};

src/UI/boost-ui/src/core/components/App.vue

@@ -35,17 +35,19 @@
             >mdi-alert</v-icon
           >
         </div>
-
         <div style="cursor: pointer" @click="$router.push({ name: 'Info' })">
           <v-icon class="mt-n1">mdi-information-outline</v-icon>
-          <span class="mr-2" v-if="version">{{ version.installed }}</span>
+          <span class="mr-4" v-if="version">{{ version.installed }}</span>
         </div>
+        <v-btn @click="$router.push({ name: 'Settings' })" icon
+          ><v-icon>mdi-cog-outline</v-icon></v-btn
+        >
       </v-system-bar>
       <v-navigation-drawer width="62" class="nav" app>
         <div
           class="nav-item"
-          v-for="(nav, i) in navBarItems"
-          :key="i"
+          v-for="nav in navBarItems"
+          :key="nav.id"
           :title="nav.name"
           @click="onNavigate(nav)"
         >
@@ -59,6 +61,7 @@
       <v-main>
         <router-view></router-view>
       </v-main>
+
       <v-snackbar
         color="red darken-3"
         v-model="versionSnack"
@@ -109,56 +112,19 @@ export default {
   mounted() {
     this.getVersion();
   },
-  data: () => ({
-    dialog: false,
-    versionSnack: false,
-    navItems: [
-      {
-        text: "Workspace",
-        icon: "mdi-folder-outline",
-        route: "Workspace",
-      },
-      {
-        text: "Git",
-        icon: "mdi-git",
-        route: "Git",
-      },
-      {
-        text: "Utils",
-        icon: "mdi-hammer-screwdriver",
-        route: "Utils",
-      },
-      {
-        text: "Security",
-        icon: "mdi-lock-check",
-        route: "Security",
-      },
-      {
-        text: "Snapshooter",
-        route: "Snapshooter",
-        icon: "mdi-test-tube",
-        image2: require("../../assets/ss_logo.png"),
-      },
-      {
-        text: "Settings",
-        icon: "mdi-cog-outline",
-        route: "Settings",
-      },
-      {
-        text: "GraphQL",
-        icon: "mdi-graphql",
-        isServer: true,
-        route: "graphql",
-      },
-    ],
-  }),
+  data() {
+    return {
+      dialog: false,
+      versionSnack: false,
+    };
+  },
   computed: {
-    ...mapState("app", ["statusMessage", "app", "version"]),
+    ...mapState("app", ["statusMessage", "app", "version", "navigation"]),
     me: function () {
       return null;
     },
     navBarItems: function () {
-      return this.navItems.map((x) => {
+      return this.$store.state.app.navigation.items.map((x) => {
         x.active = this.$route.name.startsWith(x.route);
         x.color = x.active ? "#fff" : "#b3b3b3";