alihan/SwarmUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make a lot of URLs relative

Browse Source 
for #72
This commit is contained in:
Alex "mcmonkey" Goodwin
2024-09-14 15:14:18 +09:00
parent 97e061c952
commit 56e7a54624
7 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/WebServer.cs
View File

@@ -201,7 +201,7 @@ public class WebServer
WebApp.UseWebSockets(new WebSocketOptions() { KeepAliveInterval = TimeSpan.FromSeconds(30) });
WebApp.MapRazorPages();
timer.Check("[Web] core use calls");
WebApp.MapGet("/", () => Results.Redirect("/Text2Image"));
WebApp.MapGet("/", () => Results.Redirect("Text2Image"));
WebApp.Map("/API/{*Call}", API.HandleAsyncRequest);
WebApp.MapGet("/Output/{*Path}", ViewOutput);
WebApp.MapGet("/View/{*Path}", ViewOutput);

6
src/Pages/Install.cshtml
View File

@@ -3,14 +3,14 @@
ViewData["Title"] = "SwarmUI Installer";
}
@section Header {
<link rel="stylesheet" href="/css/installer.css?vary=@Utilities.VaryID" />
<link rel="stylesheet" href="css/installer.css?vary=@Utilities.VaryID" />
}
@{
if (Program.ServerSettings.IsInstalled)
{
<script>
window.location.href = "/Text2Image";
window.location.href = "Text2Image";
</script>
return;
}
@@ -256,5 +256,5 @@
</div>
@section Scripts {
<script src="/js/installer.js?vary=@Utilities.VaryID"></script>
<script src="js/installer.js?vary=@Utilities.VaryID"></script>
}

18
src/Pages/Shared/_Layout.cshtml
View File

@@ -19,17 +19,17 @@
<link class="theme_sheet_header" rel="stylesheet" href="@themeUrl" />
}
}
<link rel="stylesheet" href="/css/select2.min.css" />
<link rel="stylesheet" href="/css/select2_bootstrap.min.css" />
<link rel="stylesheet" id="sitecssheader" href="/css/site.css?vary=@Utilities.VaryID" />
<link rel="stylesheet" href="css/select2.min.css" />
<link rel="stylesheet" href="css/select2_bootstrap.min.css" />
<link rel="stylesheet" id="sitecssheader" href="css/site.css?vary=@Utilities.VaryID" />
<link id="favicon" rel="shortcut icon" href="favicon.ico" />
@RenderSection("Header", required: false)
@WebServer.PageHeaderExtra
<script src="/js/jquery.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
<script src="/js/select2.min.js"></script>
<script src="/js/util.js?vary=@Utilities.VaryID"></script>
<script src="/js/translator.js?vary=@Utilities.VaryID"></script>
<script src="js/jquery.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="js/select2.min.js"></script>
<script src="js/util.js?vary=@Utilities.VaryID"></script>
<script src="js/translator.js?vary=@Utilities.VaryID"></script>
</head>
<body>
<div class="top-status-bar-wrapper"><div class="top-status-bar" id="top_status_bar"></div></div>
@@ -37,7 +37,7 @@
@WebUtil.Toast("error_toast_box", "Error", "", "error_toast_content", "", false)
</div>
@RenderBody()
<script src="/js/site.js?vary=@Utilities.VaryID"></script>
<script src="js/site.js?vary=@Utilities.VaryID"></script>
@RenderSection("Scripts", required: false)
<div id="version_display" class="version-display">SwarmUI v<span>@Utilities.Version</span><span> (@Program.CurrentGitDate)</span></div>
</body>

36
src/Pages/Text2Image.cshtml
View File

@@ -5,13 +5,13 @@
string experimentalHide = Program.ServerSettings.ShowExperimentalFeatures ? "" : "secretexperimental";
}
@section Header {
<link rel="stylesheet" href="/css/genpage.css?vary=@Utilities.VaryID" />
<link rel="stylesheet" href="css/genpage.css?vary=@Utilities.VaryID" />
}
@if (!Program.ServerSettings.IsInstalled)
{
<script>
window.location.href = "/Install";
window.location.href = "Install";
</script>
return;
}
@@ -904,21 +904,21 @@
</div>
@section Scripts {
<script src="/js/exifr.min.js"></script>
<script src="/js/genpage/welcomemessages.js?vary=@Utilities.VaryID"></script>
<script src="/js/genpage/backends.js?vary=@Utilities.VaryID"></script>
<script src="/js/genpage/browsers.js?vary=@Utilities.VaryID"></script>
<script src="/js/genpage/presets.js?vary=@Utilities.VaryID"></script>
<script src="/js/genpage/models.js?vary=@Utilities.VaryID"></script>
<script src="/js/genpage/params.js?vary=@Utilities.VaryID"></script>
<script src="/js/genpage/utiltab.js?vary=@Utilities.VaryID"></script>
<script src="/js/genpage/usertab.js?vary=@Utilities.VaryID"></script>
<script src="/js/genpage/image_editor.js?vary=@Utilities.VaryID"></script>
<script src="/js/genpage/generatehandler.js?vary=@Utilities.VaryID"></script>
<script src="/js/genpage/simpletab.js?vary=@Utilities.VaryID"></script>
<script src="/js/genpage/main.js?vary=@Utilities.VaryID"></script>
<script src="/js/genpage/settings_editor.js?vary=@Utilities.VaryID"></script>
<script src="/js/genpage/logs.js?vary=@Utilities.VaryID"></script>
<script src="/js/genpage/ui_improvements.js?vary=@Utilities.VaryID"></script>
<script src="js/exifr.min.js"></script>
<script src="js/genpage/welcomemessages.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/backends.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/browsers.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/presets.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/models.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/params.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/utiltab.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/usertab.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/image_editor.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/generatehandler.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/simpletab.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/main.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/settings_editor.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/logs.js?vary=@Utilities.VaryID"></script>
<script src="js/genpage/ui_improvements.js?vary=@Utilities.VaryID"></script>
@WebServer.PageFooterExtra
}

2
src/wwwroot/js/installer.js
View File

@@ -177,7 +177,7 @@ class InstallerClass {
stepBar.style.width = `${stepPercent}%`;
}
else if (response.success) {
window.location.href = '/Text2Image';
window.location.href = 'Text2Image';
}
}, 0, (e) => {
getRequiredElementById('installer_button_confirm').disabled = false;

2
src/wwwroot/js/site.js
View File

@@ -143,7 +143,7 @@ function genericRequest(url, in_data, callback, depth = 0, errorHandle = null) {
console.log(e);
showError(e);
}
sendJsonToServer(`/API/${url}`, in_data, (status, data) => {
sendJsonToServer(`API/${url}`, in_data, (status, data) => {
if (!data) {
console.log(`Tried making generic request ${url} but failed.`);
fail(failedCrash.get());

2
src/wwwroot/js/util.js
View File

@@ -40,7 +40,7 @@ function getWSAddress() {
console.log("URL is not HTTP or HTTPS, cannot determine WebSocket path.");
return null;
}
let slashIndex = url.indexOf("/");
let slashIndex = url.lastIndexOf("/");
if (slashIndex != -1) {
url = url.substring(0, slashIndex);
}