diff --git a/CannedNet/AppConfigs/appsettings.API.json b/CannedNet/AppConfigs/appsettings.API.json deleted file mode 100644 index f345fb5..0000000 --- a/CannedNet/AppConfigs/appsettings.API.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Hosting": { - "Url": "http://*:5000" - } -} - diff --git a/CannedNet/AppConfigs/appsettings.Accounts.json b/CannedNet/AppConfigs/appsettings.Accounts.json deleted file mode 100644 index 07865db..0000000 --- a/CannedNet/AppConfigs/appsettings.Accounts.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Hosting": { - "Url": "http://*:5005" - } -} - diff --git a/CannedNet/AppConfigs/appsettings.Auth.json b/CannedNet/AppConfigs/appsettings.Auth.json deleted file mode 100644 index 0a93f73..0000000 --- a/CannedNet/AppConfigs/appsettings.Auth.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Hosting": { - "Url": "http://*:5002" - } -} - diff --git a/CannedNet/AppConfigs/appsettings.CDN.json b/CannedNet/AppConfigs/appsettings.CDN.json deleted file mode 100644 index 4a8e525..0000000 --- a/CannedNet/AppConfigs/appsettings.CDN.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Hosting": { - "Url": "http://*:5007" - } -} - diff --git a/CannedNet/AppConfigs/appsettings.Chat.json b/CannedNet/AppConfigs/appsettings.Chat.json deleted file mode 100644 index 322a307..0000000 --- a/CannedNet/AppConfigs/appsettings.Chat.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Hosting": { - "Url": "http://*:5003" - } -} - diff --git a/CannedNet/AppConfigs/appsettings.Clubs.json b/CannedNet/AppConfigs/appsettings.Clubs.json deleted file mode 100644 index 7877f2f..0000000 --- a/CannedNet/AppConfigs/appsettings.Clubs.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Hosting": { - "Url": "http://*:5009" - } -} - diff --git a/CannedNet/AppConfigs/appsettings.Commerce.json b/CannedNet/AppConfigs/appsettings.Commerce.json deleted file mode 100644 index b005764..0000000 --- a/CannedNet/AppConfigs/appsettings.Commerce.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Hosting": { - "Url": "http://*:5010" - } -} - diff --git a/CannedNet/AppConfigs/appsettings.Econ.json b/CannedNet/AppConfigs/appsettings.Econ.json deleted file mode 100644 index ed20ce8..0000000 --- a/CannedNet/AppConfigs/appsettings.Econ.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Hosting": { - "Url": "http://*:5011" - } -} - diff --git a/CannedNet/AppConfigs/appsettings.Image.json b/CannedNet/AppConfigs/appsettings.Image.json deleted file mode 100644 index 18f3dcf..0000000 --- a/CannedNet/AppConfigs/appsettings.Image.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Hosting": { - "Url": "http://*:5008" - } -} - diff --git a/CannedNet/AppConfigs/appsettings.Match.json b/CannedNet/AppConfigs/appsettings.Match.json deleted file mode 100644 index e264816..0000000 --- a/CannedNet/AppConfigs/appsettings.Match.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Hosting": { - "Url": "http://*:5004" - } -} - diff --git a/CannedNet/AppConfigs/appsettings.NS.json b/CannedNet/AppConfigs/appsettings.NS.json deleted file mode 100644 index 771f6b9..0000000 --- a/CannedNet/AppConfigs/appsettings.NS.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Hosting": { - "Url": "http://*:5001" - } -} - diff --git a/CannedNet/AppConfigs/appsettings.Notify.json b/CannedNet/AppConfigs/appsettings.Notify.json deleted file mode 100644 index d96c059..0000000 --- a/CannedNet/AppConfigs/appsettings.Notify.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Hosting": { - "Url": "http://*:5006" - } -} - diff --git a/CannedNet/AppConfigs/appsettings.PlayerSettings.json b/CannedNet/AppConfigs/appsettings.PlayerSettings.json deleted file mode 100644 index fa7d0f4..0000000 --- a/CannedNet/AppConfigs/appsettings.PlayerSettings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Hosting": { - "Url": "http://*:5012" - } -} - diff --git a/CannedNet/CannedNet.csproj b/CannedNet/CannedNet.csproj index a744181..9488359 100644 --- a/CannedNet/CannedNet.csproj +++ b/CannedNet/CannedNet.csproj @@ -22,4 +22,20 @@ + + <_ContentIncludedByDefault Remove="AppConfigs\appsettings.Accounts.json" /> + <_ContentIncludedByDefault Remove="AppConfigs\appsettings.API.json" /> + <_ContentIncludedByDefault Remove="AppConfigs\appsettings.Auth.json" /> + <_ContentIncludedByDefault Remove="AppConfigs\appsettings.CDN.json" /> + <_ContentIncludedByDefault Remove="AppConfigs\appsettings.Chat.json" /> + <_ContentIncludedByDefault Remove="AppConfigs\appsettings.Clubs.json" /> + <_ContentIncludedByDefault Remove="AppConfigs\appsettings.Commerce.json" /> + <_ContentIncludedByDefault Remove="AppConfigs\appsettings.Econ.json" /> + <_ContentIncludedByDefault Remove="AppConfigs\appsettings.Image.json" /> + <_ContentIncludedByDefault Remove="AppConfigs\appsettings.Match.json" /> + <_ContentIncludedByDefault Remove="AppConfigs\appsettings.Notify.json" /> + <_ContentIncludedByDefault Remove="AppConfigs\appsettings.NS.json" /> + <_ContentIncludedByDefault Remove="AppConfigs\appsettings.PlayerSettings.json" /> + + diff --git a/CannedNet/JSON/endpoints.json b/CannedNet/JSON/endpoints.json index f4de70a..587ec19 100644 --- a/CannedNet/JSON/endpoints.json +++ b/CannedNet/JSON/endpoints.json @@ -6,7 +6,7 @@ "BugReporting": "https://cannednet.lapis.codes", "Cards": "https://cannednet.lapis.codes", "CDN": "https://cannednet.lapis.codes", - "Chat": "https://cannednet.lapis.codes", + "Chat": "https://cannednet.lapis.codes/chat", "Clubs": "https://cannednet.lapis.codes", "CMS": "https://cannednet.lapis.codes", "Commerce": "https://cannednet.lapis.codes", @@ -16,7 +16,7 @@ "Econ": "https://cannednet.lapis.codes", "GameLogs": "https://cannednet.lapis.codes", "Geo": "https://cannednet.lapis.codes", - "Images": "https://cannednet.lapis.codes", + "Images": "https://cannednet.lapis.codes/img", "Leaderboard": "https://cannednet.lapis.codes", "Link": "https://cannednet.lapis.codes", "Lists": "https://cannednet.lapis.codes", @@ -24,7 +24,7 @@ "Moderation": "https://cannednet.lapis.codes", "Notifications": "https://cannednet.lapis.codes", "PlatformNotifications": "https://cannednet.lapis.codes", - "PlayerSettings": "https://cannednet.lapis.codes", + "PlayerSettings": "https://cannednet.lapis.codes/playersettings", "RoomComments": "https://cannednet.lapis.codes", "RoomieIntegrations": "https://cannednet.lapis.codes", "Rooms": "https://cannednet.lapis.codes", diff --git a/CannedNet/Services/Controllers/EconController.cs b/CannedNet/Services/Controllers/EconController.cs index bc0e4d5..820aa18 100644 --- a/CannedNet/Services/Controllers/EconController.cs +++ b/CannedNet/Services/Controllers/EconController.cs @@ -9,21 +9,21 @@ namespace CannedNet.Services.Controllers; [ApiController, Route("econ")] public class EconController : ControllerBase { - [HttpGet("api/avatar/v1/defaultunlocked")] + [HttpGet("/api/avatar/v1/defaultunlocked")] public async Task DefaultUnlocked() { var json = System.IO.File.ReadAllText("JSON/defaultAvatarItems.json"); return Results.Content(json, "application/json"); } - [HttpGet("api/avatar/v1/defaultbaseavataritems")] + [HttpGet("/api/avatar/v1/defaultbaseavataritems")] public async Task DefaultBaseAvatarItems() { var json = System.IO.File.ReadAllText("JSON/defaultAvatarItems.json"); return Results.Content(json, "application/json"); } - [HttpGet("api/avatar/v4/items")] + [HttpGet("/api/avatar/v4/items")] [Authorize] public async Task GetAvatarItemsV4(AppDbContext db) { diff --git a/CannedNet/Services/Controllers/PlayerSettingsController.cs b/CannedNet/Services/Controllers/PlayerSettingsController.cs index c38a6b5..772d859 100644 --- a/CannedNet/Services/Controllers/PlayerSettingsController.cs +++ b/CannedNet/Services/Controllers/PlayerSettingsController.cs @@ -8,7 +8,7 @@ namespace CannedNet.Services.Controllers; [ApiController, Route("playersettings")] public class PlayerSettingsController : ControllerBase { - [HttpGet("/playersettings")] + [HttpGet("playersettings")] [Authorize] public async Task GetPlayerSettings(AppDbContext db) { @@ -63,7 +63,7 @@ public class PlayerSettingsController : ControllerBase return Results.Json(settings); } - [HttpPut("/playersettings")] + [HttpPut("playersettings")] [Authorize] public async Task PutPlayerSettings(AppDbContext db) { diff --git a/CannedNet/appsettings.Production.json b/CannedNet/appsettings.Production.json index 19fb0e6..be9ae06 100644 --- a/CannedNet/appsettings.Production.json +++ b/CannedNet/appsettings.Production.json @@ -3,8 +3,7 @@ "DefaultConnection": "Host=localhost;Port=5432;Database=cannednet;Username=postgres;Password=postgres" }, "Ports": { - "API": 5000, - "NS": 5001 + "API": 5000 }, "Logging": { "LogLevel": { diff --git a/CannedNet/appsettings.json b/CannedNet/appsettings.json index 3afb6ba..8d3a59f 100644 --- a/CannedNet/appsettings.json +++ b/CannedNet/appsettings.json @@ -9,8 +9,7 @@ "DefaultConnection": "Host=localhost;Port=5432;Database=cannednet;Username=postgres;Password=postgres" }, "Ports": { - "Primary": 5000, - "Secondary": 5001 + "Primary": 5000 }, "AllowedHosts": "*" }