arcanis/ahriman
1
0
Fork 0
mirror of https://github.com/arcan1s/ahriman.git synced 2025-06-28 06:41:43 +00:00
Code Issues Projects Releases Wiki Activity

rewrite api under single /api endpoint

Browse Source
This commit is contained in:
Evgenii Alekseev
2022-05-29 17:15:49 +03:00
parent f4131b8cd7
commit a0cfb7561d
19 changed files with 119 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/share/ahriman/templates/build-status.jinja2
View File

@ -91,7 +91,7 @@
{% if auth.username is none %}
{{ auth.control|safe }}
{% else %}
<form action="/user-api/v1/logout" method="post">
<form action="/api/v1/logout" method="post">
<button class="btn btn-link" style="text-decoration: none">logout ({{ auth.username }})</button>
</form>
{% endif %}

2
package/share/ahriman/templates/build-status/login-modal.jinja2
View File

@ -1,7 +1,7 @@
<div id="loginForm" tabindex="-1" role="dialog" class="modal fade">
<div class="modal-dialog" role="document">
<div class="modal-content">
<form action="/user-api/v1/login" method="post">
<form action="/api/v1/login" method="post">
<div class="modal-header">
<h4 class="modal-title">login</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>

9
package/share/ahriman/templates/build-status/package-add-modal.jinja2
View File

@ -9,7 +9,7 @@
<div class="form-group row">
<label for="package" class="col-sm-2 col-form-label">package</label>
<div class="col-sm-10">
<input id="package-form" type="text" list="known-packages-dlist" class="form-control" placeholder="AUR package" name="package" required>
<input id="package-form" type="text" list="known-packages-dlist" autocomplete="off" class="form-control" placeholder="AUR package" name="package" required>
<datalist id="known-packages-dlist"></datalist>
</div>
</div>
@ -32,7 +32,7 @@
const value = packageInput.val();
$.ajax({
url: "/service-api/v1/search",
url: "/api/v1/service/search",
data: {"for": value},
type: "GET",
dataType: "json",
@ -44,7 +44,6 @@
return option;
});
knownPackages.empty().append(options);
packageInput.focus();
},
})
}, this), 500));
@ -52,11 +51,11 @@
function addPackages() {
const packages = [packageInput.val()]
doPackageAction("/service-api/v1/add", packages);
doPackageAction("/api/v1/service/add", packages);
}
function requestPackages() {
const packages = [packageInput.val()]
doPackageAction("/service-api/v1/request", packages);
doPackageAction("/api/v1/service/request", packages);
}
</script>

8
package/share/ahriman/templates/build-status/table.jinja2
View File

@ -39,9 +39,9 @@
return table.bootstrapTable("getSelections").map(row => { return row.id; });
}
function removePackages() { doPackageAction("/service-api/v1/remove", getSelection()); }
function removePackages() { doPackageAction("/api/v1/service/remove", getSelection()); }
function updatePackages() { doPackageAction("/service-api/v1/add", getSelection()); }
function updatePackages() { doPackageAction("/api/v1/service/add", getSelection()); }
function hideControls(hidden) {
addButton.attr("hidden", hidden);
@ -53,7 +53,7 @@
table.bootstrapTable("showLoading");
$.ajax({
url: "/status-api/v1/packages",
url: "/api/v1/packages",
type: "GET",
dataType: "json",
success: response => {
@ -100,7 +100,7 @@
});
$.ajax({
url: "/status-api/v1/status",
url: "/api/v1/status",
type: "GET",
dataType: "json",
success: response => {