refactor: 🎨 re-organize repo

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\api\src\FilterLists.Directory.Api\FilterLists.Directory.Api.csproj", "{FE50F471-7DC0-44AB-8DAB-2909E3207FF9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Api", "services\directory\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\api\.dockerignore = directory\api\.dockerignore
+		services\directory\.dockerignore = services\directory\.dockerignore
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Domain", "directory\api\src\FilterLists.Directory.Domain\FilterLists.Directory.Domain.csproj", "{05496C09-DA31-4543-9EC4-D56BCADBB027}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Domain", "services\directory\src\FilterLists.Directory.Domain\FilterLists.Directory.Domain.csproj", "{05496C09-DA31-4543-9EC4-D56BCADBB027}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Application", "directory\api\src\FilterLists.Directory.Application\FilterLists.Directory.Application.csproj", "{CB1BCB34-C2A1-4E94-A90E-359FB4720B96}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Application", "services\directory\src\FilterLists.Directory.Application\FilterLists.Directory.Application.csproj", "{CB1BCB34-C2A1-4E94-A90E-359FB4720B96}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure", "directory\api\src\FilterLists.Directory.Infrastructure\FilterLists.Directory.Infrastructure.csproj", "{74C798F8-892A-40F2-8D2E-395E83853771}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Directory.Infrastructure", "services\directory\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\api\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", "services\directory\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

directory/web/package.json

@@ -1,68 +0,0 @@
-{
-  "name": "filterlists.web",
-  "version": "0.1.0",
-  "private": true,
-  "dependencies": {
-    "@testing-library/jest-dom": "^5.11.4",
-    "@testing-library/react": "^10.4.9",
-    "@testing-library/user-event": "^12.1.2",
-    "@types/jest": "^26.0.10",
-    "@types/node": "^14.6.0",
-    "@types/react": "^16.9.46",
-    "@types/react-dom": "^16.9.8",
-    "@types/react-router-dom": "^5.1.5",
-    "antd": "^4.6.1",
-    "babel-plugin-import": "^1.13.0",
-    "customize-cra": "^1.0.0",
-    "react": "^16.13.1",
-    "react-app-rewired": "^2.1.6",
-    "react-dom": "^16.13.1",
-    "react-router-dom": "^5.2.0",
-    "react-scripts": "^3.4.3",
-    "slugify": "^1.4.5",
-    "typescript": "^4.0.2"
-  },
-  "scripts": {
-    "start": "react-app-rewired start",
-    "build": "react-app-rewired build",
-    "test": "react-app-rewired test",
-    "eject": "react-scripts eject"
-  },
-  "proxy": "https://filterlists.com",
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "plugin:prettier/recommended"
-    ]
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "**/*.{json,js,jsx,ts,tsx,css,scss,yaml,md}": [
-      "prettier --write",
-      "git add"
-    ]
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
-  "devDependencies": {
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-prettier": "^3.1.4",
-    "husky": "^4.2.5",
-    "lint-staged": "^10.2.11",
-    "prettier": "^2.0.5"
-  }
-}

docker-compose.yml

@@ -14,7 +14,7 @@ services:
   filterlists.directory.web:
     image: ${DOCKER_REGISTRY-}filterlists_directory_web
     build:
-      context: ./directory/web
+      context: ./web
     networks:
       - reverse_proxy
     depends_on:
@@ -23,8 +23,8 @@ services:
   filterlists.directory.api:
     image: ${DOCKER_REGISTRY-}filterlists_directory_api
     build:
-      context: ./directory/api
-      dockerfile: src/FilterLists.Directory.Api/Dockerfile
+      context: ./services
+      dockerfile: directory/src/FilterLists.Directory.Api/Dockerfile
     networks:
       - reverse_proxy
       - directory.api
@@ -49,4 +49,4 @@ networks:
   directory.api:
 
 volumes:
-  directory.db:
+  directory.db: