Switched index to razor view

scottbrady91 · scottbrady91 · commit 441c9adb2ade · 2019-06-10T16:47:59.000+01:00
diff --git a/src/IdentityManager2/Api/Controllers/PageController.cs b/src/IdentityManager2/Api/Controllers/PageController.cs
@@ -1,10 +1,11 @@
 ﻿using System;
 using System.Threading.Tasks;
-using IdentityManager2.Assets;
+using IdentityManager2.Api.Models;
 using IdentityManager2.Configuration;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 
 namespace IdentityManager2.Api.Controllers
 {
@@ -23,10 +24,20 @@ public PageController(IdentityManagerOptions config)
         [Route("", Name = IdentityManagerConstants.RouteNames.Home)]
         public IActionResult Index()
         {
-            return new EmbeddedHtmlResult(
-                Request.PathBase, 
-                "IdentityManager2.Assets.Templates.index.html",
-                config.SecurityConfiguration);
+            return View("/Areas/IdentityManager/Pages/Index.cshtml", new PageModel
+            {
+                PathBase = Request.PathBase,
+                Model = JsonConvert.SerializeObject(new
+                {
+                    PathBase = Request.PathBase,
+                    ShowLoginButton = config.SecurityConfiguration.ShowLoginButton,
+                    oauthSettings = new
+                    {
+                        authorization_endpoint = Request.PathBase + Constants.AuthorizePath,
+                        client_id = Constants.IdMgrClientId
+                    }
+                })
+            });
         }
 
         [HttpGet]
diff --git a/src/IdentityManager2/Api/Models/PageModel.cs b/src/IdentityManager2/Api/Models/PageModel.cs
@@ -0,0 +1,8 @@
+﻿namespace IdentityManager2.Api.Models
+{
+    public class PageModel
+    {
+        public string PathBase { get; set; }
+        public string Model { get; set; }
+    }
+}
diff --git a/src/IdentityManager2/Areas/IdentityManager/Pages/Index.cshtml b/src/IdentityManager2/Areas/IdentityManager/Pages/Index.cshtml
@@ -0,0 +1,29 @@
+﻿@model IdentityManager2.Api.Models.PageModel
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta charset="utf-8" />
+    <title>IdentityManager 2</title>
+    <link href="@Model.PathBase/assets/Content.bootstrap.min.css" rel="stylesheet" />
+    <link href="@Model.PathBase/assets/Content.Style.min.css" rel="stylesheet" />
+    <link rel="icon" type="image/x-icon" href="@Model.PathBase/assets/Content.favicon.ico" />
+    <link rel="shortcut icon" type="image/x-icon" href="@Model.PathBase/assets/Content.favicon.ico" />
+</head>
+<body lang="en" ng-app="ttIdmApp" ng-csp ng-controller="LayoutCtrl" ng-cloak>
+
+    <div ng-include="'@Model.PathBase/assets/Templates.navbar.html'"></div>
+
+    <div class="container" ng-cloak>
+        <ng-view tt-focus></ng-view>
+    </div>
+
+    <div ng-include="'@Model.PathBase/assets/Templates.footer.html'"></div>
+
+    <script id="model" type="application/json">
+        @Html.Raw(Model.Model)
+    </script>
+    <script src="@Model.PathBase/assets/Scripts.Bundle.js"></script>
+</body>
+</html>
diff --git a/src/IdentityManager2/Assets/Templates/index.html b/src/IdentityManager2/Assets/Templates/index.html
diff --git a/src/IdentityManager2/IdentityManager2.csproj b/src/IdentityManager2/IdentityManager2.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -23,7 +23,6 @@
 
     <EmbeddedResource Include="Assets\Scripts\Bundle.js" />
 
-    <EmbeddedResource Include="Assets\Templates\index.html" />
     <EmbeddedResource Include="Assets\Templates\home.html" />
     <EmbeddedResource Include="Assets\Templates\users\edit.html" />
     <EmbeddedResource Include="Assets\Templates\users\list.html" />
