From f24ab00c4c3381557bd856cc65a35c7fb2969390 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Wed, 6 Jun 2018 21:31:01 -0500
Subject: [PATCH] try removing custom swagger prefix

ref #131
---
 .github/README.md                                    | 2 +-
 src/FilterLists.Api/Startup.cs                       | 6 +-----
 src/FilterLists.Api/V1/Controllers/BaseController.cs | 2 +-
 src/FilterLists.Web/ClientApp/components/Layout.tsx  | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/README.md b/.github/README.md
index dc6cb8427..73653389f 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -9,7 +9,7 @@ FilterLists is the independent, comprehensive directory of filter and host lists
 ## Links
 | Site                                                | API                                                    |
 | --------------------------------------------------- | ------------------------------------------------------ |
-| [v3 (Live, Beta)](https://filterlists.com/)         | [v1 (Live, Beta)](https://filterlists.com/api/docs)    |
+| [v3 (Live, Beta)](https://filterlists.com/)         | [v1 (Live, Beta)](https://filterlists.com/api/swagger/)|
 | [v2 (Legacy, Frozen)](https://v2.filterlists.com/)  |                                                        |
 | [v1 (Legacy, Frozen)](https://v1.filterlists.com/)  |                                                        |
 
diff --git a/src/FilterLists.Api/Startup.cs b/src/FilterLists.Api/Startup.cs
index 863ebd88c..c84519fdc 100644
--- a/src/FilterLists.Api/Startup.cs
+++ b/src/FilterLists.Api/Startup.cs
@@ -61,11 +61,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
             app.UseSwagger(UseLowercaseControllerNameInSwaggerHack);
             app.UseSwaggerUI(c =>
             {
-                c.SwaggerEndpoint(
-                    env.IsDevelopment()
-                        ? "/../swagger/v1/swagger.json"
-                        : "https://filterlists.com/api/swagger/v1/swagger.json", "FilterLists API V1");
-                c.RoutePrefix = "docs";
+                c.SwaggerEndpoint("/swagger/v1/swagger.json", "FilterLists API V1");
                 c.DocumentTitle = "FilterLists API";
             });
             MigrateAndSeedDatabase(app);
diff --git a/src/FilterLists.Api/V1/Controllers/BaseController.cs b/src/FilterLists.Api/V1/Controllers/BaseController.cs
index 1d16b1e4e..bdebc15d5 100644
--- a/src/FilterLists.Api/V1/Controllers/BaseController.cs
+++ b/src/FilterLists.Api/V1/Controllers/BaseController.cs
@@ -5,7 +5,7 @@ namespace FilterLists.Api.V1.Controllers
 {
     [ApiVersion("1.0")]
     //https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/370
-    [Route("api/v{version:apiVersion}/[controller]")]
+    [Route("v{version:apiVersion}/[controller]")]
     public class BaseController : Controller
     {
         protected readonly SeedService SeedService;
diff --git a/src/FilterLists.Web/ClientApp/components/Layout.tsx b/src/FilterLists.Web/ClientApp/components/Layout.tsx
index 089172cc4..077af8561 100644
--- a/src/FilterLists.Web/ClientApp/components/Layout.tsx
+++ b/src/FilterLists.Web/ClientApp/components/Layout.tsx
@@ -21,7 +21,7 @@ export class Layout extends React.Component<ILayoutProps, {}> {
                    </div>
                    <div className="row justify-content-center">
                        <p className="mt-2 ml-1 mr-1">
-                           <a href="https://filterlists.com/api/docs/">API</a> | <a href="https://github.com/collinbarrett/FilterLists">GitHub</a> | By <a href="https://collinmbarrett.com/">Collin M. Barrett</a>
+                           <a href="https://filterlists.com/api/swagger/">API</a> | <a href="https://github.com/collinbarrett/FilterLists">GitHub</a> | By <a href="https://collinmbarrett.com/">Collin M. Barrett</a>
                        </p>
                    </div>
                </div>;