From a72b59ab98345a3f8059c12c6b0d8209056f3bbb Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Mon, 7 Sep 2020 13:12:17 -0500 Subject: [PATCH] =?UTF-8?q?refactor(directory):=20=E2=99=BB=20deprecate=20?= =?UTF-8?q?url=20API=20versioning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/LanguagesController.cs | 2 +- .../Controllers/LicensesController.cs | 2 +- .../Controllers/ListsController.cs | 2 +- .../Controllers/MaintainersController.cs | 2 +- .../Controllers/SoftwareController.cs | 2 +- .../Controllers/SyntaxesController.cs | 2 +- .../FilterLists.Directory.Api/Controllers/TagsController.cs | 2 +- web/src/App.tsx | 2 +- web/src/hooks/useLanguages.tsx | 2 +- web/src/hooks/useLicenses.tsx | 2 +- web/src/hooks/useListDetails.tsx | 2 +- web/src/hooks/useLists.tsx | 2 +- web/src/hooks/useMaintainers.tsx | 2 +- web/src/hooks/useSoftware.tsx | 2 +- web/src/hooks/useSyntaxes.tsx | 6 +++--- web/src/hooks/useTags.tsx | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/services/directory/src/FilterLists.Directory.Api/Controllers/LanguagesController.cs b/services/directory/src/FilterLists.Directory.Api/Controllers/LanguagesController.cs index 75399ce77..4687d7317 100644 --- a/services/directory/src/FilterLists.Directory.Api/Controllers/LanguagesController.cs +++ b/services/directory/src/FilterLists.Directory.Api/Controllers/LanguagesController.cs @@ -7,7 +7,7 @@ namespace FilterLists.Directory.Api.Controllers { [ApiController] - [Route("v1/[controller]")] + [Route("[controller]")] public class LanguagesController : ControllerBase { private readonly IMediator _mediator; diff --git a/services/directory/src/FilterLists.Directory.Api/Controllers/LicensesController.cs b/services/directory/src/FilterLists.Directory.Api/Controllers/LicensesController.cs index 24aa45062..37d319bf6 100644 --- a/services/directory/src/FilterLists.Directory.Api/Controllers/LicensesController.cs +++ b/services/directory/src/FilterLists.Directory.Api/Controllers/LicensesController.cs @@ -7,7 +7,7 @@ namespace FilterLists.Directory.Api.Controllers { [ApiController] - [Route("v1/[controller]")] + [Route("[controller]")] public class LicensesController : ControllerBase { private readonly IMediator _mediator; diff --git a/services/directory/src/FilterLists.Directory.Api/Controllers/ListsController.cs b/services/directory/src/FilterLists.Directory.Api/Controllers/ListsController.cs index 8e29a634d..18849f643 100644 --- a/services/directory/src/FilterLists.Directory.Api/Controllers/ListsController.cs +++ b/services/directory/src/FilterLists.Directory.Api/Controllers/ListsController.cs @@ -7,7 +7,7 @@ namespace FilterLists.Directory.Api.Controllers { [ApiController] - [Route("v1/[controller]")] + [Route("[controller]")] public class ListsController : ControllerBase { private readonly IMediator _mediator; diff --git a/services/directory/src/FilterLists.Directory.Api/Controllers/MaintainersController.cs b/services/directory/src/FilterLists.Directory.Api/Controllers/MaintainersController.cs index 95d969c1a..d67a84e3e 100644 --- a/services/directory/src/FilterLists.Directory.Api/Controllers/MaintainersController.cs +++ b/services/directory/src/FilterLists.Directory.Api/Controllers/MaintainersController.cs @@ -7,7 +7,7 @@ namespace FilterLists.Directory.Api.Controllers { [ApiController] - [Route("v1/[controller]")] + [Route("[controller]")] public class MaintainersController : ControllerBase { private readonly IMediator _mediator; diff --git a/services/directory/src/FilterLists.Directory.Api/Controllers/SoftwareController.cs b/services/directory/src/FilterLists.Directory.Api/Controllers/SoftwareController.cs index e0698dbae..ce19cf253 100644 --- a/services/directory/src/FilterLists.Directory.Api/Controllers/SoftwareController.cs +++ b/services/directory/src/FilterLists.Directory.Api/Controllers/SoftwareController.cs @@ -7,7 +7,7 @@ namespace FilterLists.Directory.Api.Controllers { [ApiController] - [Route("v1/[controller]")] + [Route("[controller]")] public class SoftwareController : ControllerBase { private readonly IMediator _mediator; diff --git a/services/directory/src/FilterLists.Directory.Api/Controllers/SyntaxesController.cs b/services/directory/src/FilterLists.Directory.Api/Controllers/SyntaxesController.cs index d4d778843..d4ed1412a 100644 --- a/services/directory/src/FilterLists.Directory.Api/Controllers/SyntaxesController.cs +++ b/services/directory/src/FilterLists.Directory.Api/Controllers/SyntaxesController.cs @@ -7,7 +7,7 @@ namespace FilterLists.Directory.Api.Controllers { [ApiController] - [Route("v1/[controller]")] + [Route("[controller]")] public class SyntaxesController : ControllerBase { private readonly IMediator _mediator; diff --git a/services/directory/src/FilterLists.Directory.Api/Controllers/TagsController.cs b/services/directory/src/FilterLists.Directory.Api/Controllers/TagsController.cs index a9d4d502b..b01ddce62 100644 --- a/services/directory/src/FilterLists.Directory.Api/Controllers/TagsController.cs +++ b/services/directory/src/FilterLists.Directory.Api/Controllers/TagsController.cs @@ -7,7 +7,7 @@ namespace FilterLists.Directory.Api.Controllers { [ApiController] - [Route("v1/[controller]")] + [Route("[controller]")] public class TagsController : ControllerBase { private readonly IMediator _mediator; diff --git a/web/src/App.tsx b/web/src/App.tsx index 53716e1aa..bd1ab4c62 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -136,7 +136,7 @@ const GitHub = () => ( const Api = () => ( ( - useApiData("/api/v1/languages") || [] + useApiData("/api/languages") || [] ).sort((a: Language, b: Language) => a.name.localeCompare(b.name)); diff --git a/web/src/hooks/useLicenses.tsx b/web/src/hooks/useLicenses.tsx index ccaeb9092..79b881229 100644 --- a/web/src/hooks/useLicenses.tsx +++ b/web/src/hooks/useLicenses.tsx @@ -3,5 +3,5 @@ import { useApiData } from "./useApiData"; export const useLicenses = () => ( - useApiData("/api/v1/licenses") || [] + useApiData("/api/licenses") || [] ).sort((a: License, b: License) => a.name.localeCompare(b.name)); diff --git a/web/src/hooks/useListDetails.tsx b/web/src/hooks/useListDetails.tsx index 0993388f3..e91552944 100644 --- a/web/src/hooks/useListDetails.tsx +++ b/web/src/hooks/useListDetails.tsx @@ -2,5 +2,5 @@ import { ListDetails } from "../interfaces/ListDetails"; import { useApiData } from "./useApiData"; export const useListDetails = (id: number) => { - return useApiData("/api/v1/lists/" + id); + return useApiData("/api/lists/" + id); }; diff --git a/web/src/hooks/useLists.tsx b/web/src/hooks/useLists.tsx index bdaa0f5b7..3197679d4 100644 --- a/web/src/hooks/useLists.tsx +++ b/web/src/hooks/useLists.tsx @@ -5,7 +5,7 @@ import { List } from "../interfaces/List"; import { useApiData } from "./useApiData"; export const useLists = () => { - const lists = useApiData("/api/v1/lists"); + const lists = useApiData("/api/lists"); lists && lists.forEach((l) => (l.slug = slugify(l.name, SlugifyOptions))); return (lists || []).sort((a: List, b: List) => a.name.localeCompare(b.name)); }; diff --git a/web/src/hooks/useMaintainers.tsx b/web/src/hooks/useMaintainers.tsx index 66964df97..5909c9432 100644 --- a/web/src/hooks/useMaintainers.tsx +++ b/web/src/hooks/useMaintainers.tsx @@ -3,5 +3,5 @@ import { useApiData } from "./useApiData"; export const useMaintainers = () => ( - useApiData("/api/v1/maintainers") || [] + useApiData("/api/maintainers") || [] ).sort((a: Maintainer, b: Maintainer) => a.name.localeCompare(b.name)); diff --git a/web/src/hooks/useSoftware.tsx b/web/src/hooks/useSoftware.tsx index 2f33c0c3f..b6522f9c2 100644 --- a/web/src/hooks/useSoftware.tsx +++ b/web/src/hooks/useSoftware.tsx @@ -3,5 +3,5 @@ import { useApiData } from "./useApiData"; export const useSoftware = () => ( - useApiData("/api/v1/software") || [] + useApiData("/api/software") || [] ).sort((a: Software, b: Software) => a.name.localeCompare(b.name)); diff --git a/web/src/hooks/useSyntaxes.tsx b/web/src/hooks/useSyntaxes.tsx index cf217ce06..2a5615688 100644 --- a/web/src/hooks/useSyntaxes.tsx +++ b/web/src/hooks/useSyntaxes.tsx @@ -2,6 +2,6 @@ import { Syntax } from "../interfaces/Syntax"; import { useApiData } from "./useApiData"; export const useSyntaxes = () => - ( - useApiData("/api/v1/syntaxes") || [] - ).sort((a: Syntax, b: Syntax) => a.name.localeCompare(b.name)); + (useApiData("/api/syntaxes") || []).sort((a: Syntax, b: Syntax) => + a.name.localeCompare(b.name) + ); diff --git a/web/src/hooks/useTags.tsx b/web/src/hooks/useTags.tsx index 6faf3cb9d..d062b18bf 100644 --- a/web/src/hooks/useTags.tsx +++ b/web/src/hooks/useTags.tsx @@ -2,6 +2,6 @@ import { Tag } from "../interfaces/Tag"; import { useApiData } from "./useApiData"; export const useTags = () => - (useApiData("/api/v1/tags") || []).sort((a: Tag, b: Tag) => + (useApiData("/api/tags") || []).sort((a: Tag, b: Tag) => a.name.localeCompare(b.name) );