add bottom padding to main,
improve error handling with request function
This commit is contained in:
parent
09bdf686b3
commit
e2f5bf9a0a
@ -53,7 +53,7 @@
|
|||||||
</nav>
|
</nav>
|
||||||
</header>
|
</header>
|
||||||
<main>
|
<main>
|
||||||
<section class="w3-container">
|
<section>
|
||||||
<h2>Account</h2>
|
<h2>Account</h2>
|
||||||
<div class="w3-card w3-padding">
|
<div class="w3-card w3-padding">
|
||||||
<h3>Account Details</h3>
|
<h3>Account Details</h3>
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
</nav>
|
</nav>
|
||||||
</header>
|
</header>
|
||||||
<main>
|
<main>
|
||||||
<section class="w3-container">
|
<section>
|
||||||
<h2 id="name"><a href="index.html">Instances</a> / %{vmname}</h2>
|
<h2 id="name"><a href="index.html">Instances</a> / %{vmname}</h2>
|
||||||
<form>
|
<form>
|
||||||
<fieldset class="w3-card w3-padding">
|
<fieldset class="w3-card w3-padding">
|
||||||
|
@ -43,6 +43,10 @@ main, dialog {
|
|||||||
color: var(--main-text-color);
|
color: var(--main-text-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
main {
|
||||||
|
padding: 0 16px 16px 16px;
|
||||||
|
}
|
||||||
|
|
||||||
.w3-card {
|
.w3-card {
|
||||||
background-color: var(--main-card-bg-color);
|
background-color: var(--main-card-bg-color);
|
||||||
box-shadow: var(--main-card-box-shadow);
|
box-shadow: var(--main-card-box-shadow);
|
||||||
|
@ -56,7 +56,7 @@
|
|||||||
</nav>
|
</nav>
|
||||||
</header>
|
</header>
|
||||||
<main>
|
<main>
|
||||||
<section class="w3-container">
|
<section>
|
||||||
<h2>Instances</h2>
|
<h2>Instances</h2>
|
||||||
<div class="w3-card w3-padding">
|
<div class="w3-card w3-padding">
|
||||||
<div class="flex row nowrap" style="margin-top: 1em; justify-content: space-between;">
|
<div class="flex row nowrap" style="margin-top: 1em; justify-content: space-between;">
|
||||||
|
@ -207,27 +207,31 @@ export async function requestAPI (path, method, body = null) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function request (url, content) {
|
async function request (url, content) {
|
||||||
const response = await fetch(url, content);
|
try {
|
||||||
const contentType = response.headers.get("Content-Type");
|
const response = await fetch(url, content);
|
||||||
let data = null;
|
const contentType = response.headers.get("Content-Type");
|
||||||
if (contentType.includes("application/json")) {
|
let data = null;
|
||||||
data = await response.json();
|
if (contentType.includes("application/json")) {
|
||||||
data.status = response.status;
|
data = await response.json();
|
||||||
|
data.status = response.status;
|
||||||
|
}
|
||||||
|
else if (contentType.includes("text/html")) {
|
||||||
|
data = { data: await response.text() };
|
||||||
|
data.status = response.status;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
data = response;
|
||||||
|
}
|
||||||
|
if (!response.ok) {
|
||||||
|
return { status: response.status, error: data ? data.error : response.status };
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
data.status = response.status;
|
||||||
|
return data || response;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (contentType.includes("text/html")) {
|
catch (error) {
|
||||||
data = { data: await response.text() };
|
return {status: 400, error: error};
|
||||||
data.status = response.status;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
data = response;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
return { status: response.status, error: data ? data.error : response.status };
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
data.status = response.status;
|
|
||||||
return data || response;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user