diff --git a/FilterLists.sln b/FilterLists.sln index bf6361602..1a0eb20ed 100644 --- a/FilterLists.sln +++ b/FilterLists.sln @@ -3,20 +3,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30413.136 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Api", "directory\src\FilterLists.Directory.Api\FilterLists.Directory.Api.csproj", "{FE50F471-7DC0-44AB-8DAB-2909E3207FF9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Api", "directory\api\src\FilterLists.Directory.Api\FilterLists.Directory.Api.csproj", "{FE50F471-7DC0-44AB-8DAB-2909E3207FF9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Directory", "Directory", "{AE5D6471-1B6E-4B06-A313-34EF81F35342}" ProjectSection(SolutionItems) = preProject - directory\.dockerignore = directory\.dockerignore + directory\api\.dockerignore = directory\api\.dockerignore EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Domain", "directory\src\FilterLists.Directory.Domain\FilterLists.Directory.Domain.csproj", "{05496C09-DA31-4543-9EC4-D56BCADBB027}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Domain", "directory\api\src\FilterLists.Directory.Domain\FilterLists.Directory.Domain.csproj", "{05496C09-DA31-4543-9EC4-D56BCADBB027}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Application", "directory\src\FilterLists.Directory.Application\FilterLists.Directory.Application.csproj", "{CB1BCB34-C2A1-4E94-A90E-359FB4720B96}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Application", "directory\api\src\FilterLists.Directory.Application\FilterLists.Directory.Application.csproj", "{CB1BCB34-C2A1-4E94-A90E-359FB4720B96}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure", "directory\src\FilterLists.Directory.Infrastructure\FilterLists.Directory.Infrastructure.csproj", "{74C798F8-892A-40F2-8D2E-395E83853771}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure", "directory\api\src\FilterLists.Directory.Infrastructure\FilterLists.Directory.Infrastructure.csproj", "{74C798F8-892A-40F2-8D2E-395E83853771}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure.Migrations", "directory\src\FilterLists.Directory.Infrastructure.Migrations\FilterLists.Directory.Infrastructure.Migrations.csproj", "{4F7D51FE-A1F3-4473-A8C3-D57EBDD8E60E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure.Migrations", "directory\api\src\FilterLists.Directory.Infrastructure.Migrations\FilterLists.Directory.Infrastructure.Migrations.csproj", "{4F7D51FE-A1F3-4473-A8C3-D57EBDD8E60E}" EndProject Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{8F04C802-830B-4B6D-8D53-5D2A87B4223D}" EndProject diff --git a/directory/.dockerignore b/directory/api/.dockerignore similarity index 100% rename from directory/.dockerignore rename to directory/api/.dockerignore diff --git a/directory/src/FilterLists.Directory.Api/Controllers/FilterListsController.cs b/directory/api/src/FilterLists.Directory.Api/Controllers/FilterListsController.cs similarity index 100% rename from directory/src/FilterLists.Directory.Api/Controllers/FilterListsController.cs rename to directory/api/src/FilterLists.Directory.Api/Controllers/FilterListsController.cs diff --git a/directory/src/FilterLists.Directory.Api/Dockerfile b/directory/api/src/FilterLists.Directory.Api/Dockerfile similarity index 100% rename from directory/src/FilterLists.Directory.Api/Dockerfile rename to directory/api/src/FilterLists.Directory.Api/Dockerfile diff --git a/directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj b/directory/api/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj similarity index 100% rename from directory/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj rename to directory/api/src/FilterLists.Directory.Api/FilterLists.Directory.Api.csproj diff --git a/directory/src/FilterLists.Directory.Api/Program.cs b/directory/api/src/FilterLists.Directory.Api/Program.cs similarity index 100% rename from directory/src/FilterLists.Directory.Api/Program.cs rename to directory/api/src/FilterLists.Directory.Api/Program.cs diff --git a/directory/src/FilterLists.Directory.Api/Properties/launchSettings.json b/directory/api/src/FilterLists.Directory.Api/Properties/launchSettings.json similarity index 100% rename from directory/src/FilterLists.Directory.Api/Properties/launchSettings.json rename to directory/api/src/FilterLists.Directory.Api/Properties/launchSettings.json diff --git a/directory/src/FilterLists.Directory.Api/Startup.cs b/directory/api/src/FilterLists.Directory.Api/Startup.cs similarity index 100% rename from directory/src/FilterLists.Directory.Api/Startup.cs rename to directory/api/src/FilterLists.Directory.Api/Startup.cs diff --git a/directory/src/FilterLists.Directory.Api/appsettings.Development.json b/directory/api/src/FilterLists.Directory.Api/appsettings.Development.json similarity index 100% rename from directory/src/FilterLists.Directory.Api/appsettings.Development.json rename to directory/api/src/FilterLists.Directory.Api/appsettings.Development.json diff --git a/directory/src/FilterLists.Directory.Api/debug.Dockerfile b/directory/api/src/FilterLists.Directory.Api/debug.Dockerfile similarity index 100% rename from directory/src/FilterLists.Directory.Api/debug.Dockerfile rename to directory/api/src/FilterLists.Directory.Api/debug.Dockerfile diff --git a/directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj b/directory/api/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj similarity index 100% rename from directory/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj rename to directory/api/src/FilterLists.Directory.Application/FilterLists.Directory.Application.csproj diff --git a/directory/src/FilterLists.Directory.Application/GetLists.cs b/directory/api/src/FilterLists.Directory.Application/GetLists.cs similarity index 100% rename from directory/src/FilterLists.Directory.Application/GetLists.cs rename to directory/api/src/FilterLists.Directory.Application/GetLists.cs diff --git a/directory/src/FilterLists.Directory.Application/ServicesRegistrationExtension.cs b/directory/api/src/FilterLists.Directory.Application/ServicesRegistrationExtension.cs similarity index 100% rename from directory/src/FilterLists.Directory.Application/ServicesRegistrationExtension.cs rename to directory/api/src/FilterLists.Directory.Application/ServicesRegistrationExtension.cs diff --git a/directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj b/directory/api/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj similarity index 100% rename from directory/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj rename to directory/api/src/FilterLists.Directory.Domain/FilterLists.Directory.Domain.csproj diff --git a/directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj b/directory/api/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj rename to directory/api/src/FilterLists.Directory.Infrastructure.Migrations/FilterLists.Directory.Infrastructure.Migrations.csproj diff --git a/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200824012903_Initial.Designer.cs b/directory/api/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200824012903_Initial.Designer.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200824012903_Initial.Designer.cs rename to directory/api/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200824012903_Initial.Designer.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200824012903_Initial.cs b/directory/api/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200824012903_Initial.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200824012903_Initial.cs rename to directory/api/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/20200824012903_Initial.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs b/directory/api/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs rename to directory/api/src/FilterLists.Directory.Infrastructure.Migrations/Migrations/QueryDbContextModelSnapshot.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj b/directory/api/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj rename to directory/api/src/FilterLists.Directory.Infrastructure/FilterLists.Directory.Infrastructure.csproj diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/IQueryContext.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryDbContext.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Dependent.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterList.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListLanguage.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListMaintainer.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListSyntax.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/FilterListTag.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Fork.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Language.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/License.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Maintainer.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Merge.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Software.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/SoftwareSyntax.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Syntax.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/Tag.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlMirror.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlMirror.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlMirror.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlMirror.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlPartial.cs b/directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlPartial.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlPartial.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Entities/ViewUrlPartial.cs diff --git a/directory/src/FilterLists.Directory.Infrastructure/ServiceRegistrationExtension.cs b/directory/api/src/FilterLists.Directory.Infrastructure/ServiceRegistrationExtension.cs similarity index 100% rename from directory/src/FilterLists.Directory.Infrastructure/ServiceRegistrationExtension.cs rename to directory/api/src/FilterLists.Directory.Infrastructure/ServiceRegistrationExtension.cs diff --git a/docker-compose.override.yml b/docker-compose.override.yml index bdf1de3a7..28db8ae63 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,4 +1,4 @@ -version: '3.8' +version: "3.8" services: filterlists.directory.api: diff --git a/docker-compose.yml b/docker-compose.yml index 4d0c7ac08..004110c24 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,10 @@ -version: '3.8' +version: "3.8" services: filterlists.directory.api: image: ${DOCKER_REGISTRY-}filterlists_directory_api build: - context: ./directory + context: ./directory/api dockerfile: src/FilterLists.Directory.Api/Dockerfile depends_on: - filterlists.directory.db