diff --git a/Services/Admin/Pages/DungeonBuilder/ObjectEdit.cshtml b/Services/Admin/Pages/DungeonBuilder/ObjectEdit.cshtml index 73a3710..7f319eb 100644 --- a/Services/Admin/Pages/DungeonBuilder/ObjectEdit.cshtml +++ b/Services/Admin/Pages/DungeonBuilder/ObjectEdit.cshtml @@ -349,7 +349,7 @@ const row = Math.floor(frameIndex / cols); const bgX = -col * tw; const bgY = -row * th; - const imgUrl = `${cdnBaseUrl}/downloads/${cdn}`; + const imgUrl = `${cdnBaseUrl}/${cdn}`; spritePreview.innerHTML = `
DamageTypes { get; set; } = new(); public List CdnImages { get; set; } = new(); - public string CdnBaseUrl;// => _config["Cdn:BaseUrl"]?.TrimEnd('/') ?? ""; + public string CdnBaseUrl => NormalizeCdnBaseUrl(_config["Cdn:BaseUrl"]); + + private string NormalizeCdnBaseUrl(string? baseUrl) + { + baseUrl = string.IsNullOrWhiteSpace(baseUrl) + ? "https://assets.aeternalisgames.com" + : baseUrl; + baseUrl = baseUrl.TrimEnd('/'); + if (!baseUrl.EndsWith("/downloads", StringComparison.OrdinalIgnoreCase)) + baseUrl += "/downloads"; + return baseUrl; + } public string? Message { get; set; } public bool IsError { get; set; } public async Task OnGetAsync(int? id) { - CdnBaseUrl = NormalizeCdnBaseUrl(_config["Cdn:BaseUrl"] ?? "https://assets.aeternalisgames.com"); await LoadReferenceData(); - + if (id.HasValue) { var obj = await _db.ObjectTemplates @@ -61,7 +70,6 @@ public class ObjectEditModel : AdminPageModel public async Task OnPostAsync() { - CdnBaseUrl = NormalizeCdnBaseUrl(_config["Cdn:BaseUrl"] ?? "https://assets.aeternalisgames.com"); await LoadReferenceData(); if (!ModelState.IsValid) @@ -170,17 +178,4 @@ public class ObjectEditModel : AdminPageModel if (!baseUrl.EndsWith("/downloads")) baseUrl += "/downloads"; return $"{baseUrl}/{path.TrimStart('/')}"; } - private static string NormalizeCdnBaseUrl(string? baseUrl) - { - baseUrl = string.IsNullOrWhiteSpace(baseUrl) - ? "https://assets.aeternalisgames.com" - : baseUrl; - - baseUrl = baseUrl.TrimEnd('/'); - - if (!baseUrl.EndsWith("/downloads", StringComparison.OrdinalIgnoreCase)) - baseUrl += "/downloads"; - - return baseUrl; - } } diff --git a/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml b/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml index fa039d0..80ad883 100644 --- a/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml +++ b/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml @@ -301,7 +301,7 @@ function render(x, y) { const t = tileData[k]; if (t && sheet && t.sid == sheet.id) { const col = t.f % sheet.cols, row = Math.floor(t.f / sheet.cols); - c.style.background = `url('${cdnBase}/downloads/${sheet.cdn}') ${-col*sheet.tw}px ${-row*sheet.th}px no-repeat`; + c.style.background = `url('${cdnBase}/${sheet.cdn}') ${-col*sheet.tw}px ${-row*sheet.th}px no-repeat`; c.style.backgroundSize = `${sheet.sw}px ${sheet.sh}px`; } else if (t) { c.style.background = '#2d3748'; @@ -387,7 +387,7 @@ function loadTilePalette() { for (let i = 0; i < total; i++) { const col = i % sheet.cols, row = Math.floor(i / sheet.cols); html += `
`; } document.getElementById('tilePalette').innerHTML = html; diff --git a/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml.cs b/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml.cs index f22275b..d6289e2 100644 --- a/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml.cs +++ b/Services/Admin/Pages/DungeonBuilder/RoomEdit.cshtml.cs @@ -14,7 +14,6 @@ public class RoomEditModel : AdminPageModel { _db = db; _config = config; - CdnBaseUrl = NormalizeCdnBaseUrl(_config["Cdn:BaseUrl"] ?? "https://assets.aeternalisgames.com"); } [BindProperty] @@ -23,7 +22,18 @@ public class RoomEditModel : AdminPageModel public List TileSheets { get; set; } = new(); public List Objects { get; set; } = new(); - public string CdnBaseUrl;// => _config["Cdn:BaseUrl"]?.TrimEnd('/') ?? ""; + public string CdnBaseUrl => NormalizeCdnBaseUrl(_config["Cdn:BaseUrl"]); + + private string NormalizeCdnBaseUrl(string? baseUrl) + { + baseUrl = string.IsNullOrWhiteSpace(baseUrl) + ? "https://assets.aeternalisgames.com" + : baseUrl; + baseUrl = baseUrl.TrimEnd('/'); + if (!baseUrl.EndsWith("/downloads", StringComparison.OrdinalIgnoreCase)) + baseUrl += "/downloads"; + return baseUrl; + } public string? Message { get; set; } public bool IsError { get; set; } @@ -137,17 +147,4 @@ public class RoomEditModel : AdminPageModel .OrderBy(o => o.Name) .ToListAsync(); } - private static string NormalizeCdnBaseUrl(string? baseUrl) - { - baseUrl = string.IsNullOrWhiteSpace(baseUrl) - ? "https://assets.aeternalisgames.com" - : baseUrl; - - baseUrl = baseUrl.TrimEnd('/'); - - if (!baseUrl.EndsWith("/downloads", StringComparison.OrdinalIgnoreCase)) - baseUrl += "/downloads"; - - return baseUrl; - } } diff --git a/Services/Admin/Pages/DungeonBuilder/TileEdit.cshtml b/Services/Admin/Pages/DungeonBuilder/TileEdit.cshtml index dd11ae1..c706f9c 100644 --- a/Services/Admin/Pages/DungeonBuilder/TileEdit.cshtml +++ b/Services/Admin/Pages/DungeonBuilder/TileEdit.cshtml @@ -332,7 +332,7 @@ function renderCell(x, y) { if (data && sheet && data.sheetId == sheet.id) { const col = data.frameIndex % sheet.cols; const row = Math.floor(data.frameIndex / sheet.cols); - cell.style.background = `url('${cdnBase}/downloads/${sheet.cdn}') ${-col * sheet.tw}px ${-row * sheet.th}px no-repeat`; + cell.style.background = `url('${cdnBase}/${sheet.cdn}') ${-col * sheet.tw}px ${-row * sheet.th}px no-repeat`; cell.style.backgroundSize = `${sheet.sw}px ${sheet.sh}px`; } else if (data) { cell.style.background = '#2d3748'; @@ -381,7 +381,7 @@ function loadSheet() { const col = i % sheet.cols; const row = Math.floor(i / sheet.cols); html += `
`; } document.getElementById('palette').innerHTML = html; @@ -406,7 +406,7 @@ function selectTile(frameIndex) { const row = Math.floor(frameIndex / sheet.cols); document.getElementById('selectedPreview').innerHTML = `
`; diff --git a/Services/Admin/Pages/DungeonBuilder/TileEdit.cshtml.cs b/Services/Admin/Pages/DungeonBuilder/TileEdit.cshtml.cs index a5e3927..9d4330d 100644 --- a/Services/Admin/Pages/DungeonBuilder/TileEdit.cshtml.cs +++ b/Services/Admin/Pages/DungeonBuilder/TileEdit.cshtml.cs @@ -14,7 +14,6 @@ public class TileEditModel : AdminPageModel { _db = db; _config = config; - CdnBaseUrl = NormalizeCdnBaseUrl(_config["Cdn:BaseUrl"] ?? "https://assets.aeternalisgames.com"); } [BindProperty] @@ -22,14 +21,24 @@ public class TileEditModel : AdminPageModel public List TileSheets { get; set; } = new(); - public string CdnBaseUrl;// => _config["Cdn:BaseUrl"]?.TrimEnd('/') ?? ""; + public string CdnBaseUrl => NormalizeCdnBaseUrl(_config["Cdn:BaseUrl"]); + + private string NormalizeCdnBaseUrl(string? baseUrl) + { + baseUrl = string.IsNullOrWhiteSpace(baseUrl) + ? "https://assets.aeternalisgames.com" + : baseUrl; + baseUrl = baseUrl.TrimEnd('/'); + if (!baseUrl.EndsWith("/downloads", StringComparison.OrdinalIgnoreCase)) + baseUrl += "/downloads"; + return baseUrl; + } public string? Message { get; set; } public bool IsError { get; set; } public async Task OnGetAsync(int? id) { - await LoadReferenceData(); if (id.HasValue) @@ -134,17 +143,4 @@ public class TileEditModel : AdminPageModel .OrderBy(s => s.Name) .ToListAsync(); } - private static string NormalizeCdnBaseUrl(string? baseUrl) - { - baseUrl = string.IsNullOrWhiteSpace(baseUrl) - ? "https://assets.aeternalisgames.com" - : baseUrl; - - baseUrl = baseUrl.TrimEnd('/'); - - if (!baseUrl.EndsWith("/downloads", StringComparison.OrdinalIgnoreCase)) - baseUrl += "/downloads"; - - return baseUrl; - } } diff --git a/Services/Admin/Pages/DungeonBuilder/Tiles.cshtml.cs b/Services/Admin/Pages/DungeonBuilder/Tiles.cshtml.cs index d7bd72a..4108492 100644 --- a/Services/Admin/Pages/DungeonBuilder/Tiles.cshtml.cs +++ b/Services/Admin/Pages/DungeonBuilder/Tiles.cshtml.cs @@ -84,8 +84,8 @@ public class TilesModel : AdminPageModel { if (string.IsNullOrEmpty(path)) return ""; - var baseUrl = _config["Cdn:BaseUrl"]?.TrimEnd('/') ?? ""; - if (!baseUrl.EndsWith("/downloads")) + var baseUrl = _config["Cdn:BaseUrl"]?.TrimEnd('/') ?? "https://assets.aeternalisgames.com"; + if (!baseUrl.EndsWith("/downloads", StringComparison.OrdinalIgnoreCase)) { baseUrl += "/downloads"; }