Fixes for documentation file

9 years ago · f492b1fff2
3 changed files with 12 additions and 11 deletions
--- a/src/Squidex/Squidex.csproj
+++ b/src/Squidex/Squidex.csproj
@ -69,10 +69,10 @@
    <PackageReference Include="Microsoft.OData.Core" Version="6.15.0" />
  </ItemGroup>

-  <ItemGroup>
-    <Reference Include="System.Web">
-      <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2\System.Web.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  
+  <Target Name="IncludeDocFile" BeforeTargets="PrepareForPublish">
+    <ItemGroup Condition=" '$(DocumentationFile)' != '' ">
+      <_DocumentationFile Include="$(DocumentationFile)" />
+      <ContentWithTargetPath Include="@(_DocumentationFile->'%(FullPath)')" RelativePath="%(_DocumentationFile.Identity)" TargetPath="%(_DocumentationFile.Filename)%(_DocumentationFile.Extension)" CopyToPublishDirectory="PreserveNewest" />
+    </ItemGroup>
+  </Target>
 </Project>
--- a/src/Squidex/Views/Shared/Docs.cshtml
+++ b/src/Squidex/Views/Shared/Docs.cshtml
@ -13,7 +13,7 @@
        body {
            margin: 0;
            padding: 0;
-            position: fixed;
+            position: static;
        }

        h1,
@ -31,8 +31,8 @@
    </style>
 </head>
 <body>
-    <redoc lazy-rendering="true" spec-url="@Url.Content(ViewBag.Specification)"></redoc>
+    <redoc spec-url="@Url.Content(ViewBag.Specification)"></redoc>

-    <script src="https://rebilly.github.io/ReDoc/releases/v1.10.1/redoc.min.js"></script>
+    <script src="/scripts/redoc.min.js"></script>
 </body>
 </html>
--- a/src/Squidex/package.json
+++ b/src/Squidex/package.json
@ -8,9 +8,9 @@
    "test": "karma start",
    "test:coverage": "karma start karma.coverage.conf.js",
    "test:clean": "rimraf _test-output",
-    "dev": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ & webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000",
+    "dev": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ & cpx node_modules/redoc/dist/redoc.min.js wwwroot/scripts/ webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000",
    "build": "webpack --config app-config/webpack.run.prod.js --display-error-details --bail",
-    "build:copy": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/",
+    "build:copy": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ & cpx node_modules/redoc/dist/redoc.min.js wwwroot/scripts/",
    "build:clean": "rimraf wwwroot/build"
  },
  "dependencies": {
@ -29,6 +29,7 @@
    "mousetrap": "1.6.0",
    "oidc-client": "1.3.0-beta.3",
    "pikaday": "1.5.1",
+    "redoc": "1.10.0",
    "rxjs": "5.2.0",
    "zone.js": "0.7.7"
  },