diff --git a/src/js/firmware/middleware.js b/src/js/firmware/middleware.js index 05e580c..e319808 100644 --- a/src/js/firmware/middleware.js +++ b/src/js/firmware/middleware.js @@ -1,6 +1,10 @@ import { generalError } from './util.js' export function ajaxRequest (params) { + let fetchParams = { + 'credentials': 'include' + } + if (typeof (params.error) !== 'function') { params.error = generalError } @@ -18,14 +22,22 @@ export function ajaxRequest (params) { const url = new URL(window.location.protocol + '//' + window.location.hostname + ":8080/api/" + params.url) + if (typeof (params.method) !== 'undefined') { + fetchParams.method = params.method + } else { + fetchParams.method == 'GET' + } + if (typeof (params.data) !== 'undefined') { - Object.keys(params.data).forEach(key => url.searchParams.append(key, params.data[key])) + if (fetchParams.method == 'GET') { + Object.keys(params.data).forEach(key => url.searchParams.append(key, params.data[key])) + } else { + fetchParams.body = JSON.stringify(params.data) + fetchParams.method = 'POST' + } } - window.fetch(url, { - method: 'GET', - credentials: 'include' - }) + window.fetch(url, fetchParams) .then(resp => { if (!resp.ok) { Promise.reject(resp) diff --git a/src/js/modules/DatabaseRemoteServer.js b/src/js/modules/DatabaseRemoteServer.js index 97b948d..26d01be 100644 --- a/src/js/modules/DatabaseRemoteServer.js +++ b/src/js/modules/DatabaseRemoteServer.js @@ -3,12 +3,9 @@ import { ajaxRequest } from '../firmware/middleware.js' export class DatabaseRemoteServer { getTasks (theListId) { ajaxRequest({ - url: 'Task/List', + url: 'Task/List/' + theListId, success: (jsonTasks) => { window.dbal.local.addTasksFromServer(jsonTasks) - }, - data: { - listId: theListId } }) } diff --git a/src/js/modules/UiManager.js b/src/js/modules/UiManager.js index f9fd918..2e85ccb 100644 --- a/src/js/modules/UiManager.js +++ b/src/js/modules/UiManager.js @@ -46,18 +46,18 @@ export class UiManager { } } - onBootloaderSuccess (res) { + onBootloaderSuccess (init) { document.querySelector('#initMessages').remove() - if (res.wallpaper !== null) { - const img = 'url(/wallpapers/' + res.Wallpaper + ')' + if (init.wallpaper !== null) { + const img = 'url(/wallpapers/' + init.wallpaper + ')' document.body.style.backgroundImage = img } window.loginForm = document.createElement('login-form') window.loginForm.create() - if (res.username !== null) { + if (init.username !== null) { this.loginSuccess() } else { window.loginForm.show() diff --git a/src/js/modules/webcomponents/SidePanel.js b/src/js/modules/webcomponents/SidePanel.js index e8d5b6f..059b371 100644 --- a/src/js/modules/webcomponents/SidePanel.js +++ b/src/js/modules/webcomponents/SidePanel.js @@ -99,7 +99,8 @@ export class SidePanel extends HTMLElement { } ajaxRequest({ - url: 'CreateList', + url: 'List/Create', + method: 'POST', data: { title: title },