diff --git a/app/pathfinder.ini b/app/pathfinder.ini index fdef6b40..4e9420f6 100644 --- a/app/pathfinder.ini +++ b/app/pathfinder.ini @@ -13,7 +13,7 @@ NAME = Pathfinder ; Version is used for CSS/JS cache busting and is part of the URL for static resources: ; e.g. public/js/vX.X.X/app.js ; Syntax: String (current version) -; Default: v2.0.0 +; Default: v2.0.0-rc.1 VERSION = v2.0.0-rc.1 ; Contact information [optional] diff --git a/app/requirements.ini b/app/requirements.ini index b183ea12..7df2980e 100644 --- a/app/requirements.ini +++ b/app/requirements.ini @@ -77,8 +77,8 @@ MAX_MEMORY = 67108864 MAXMEMORY_POLICY = allkeys-lru [REQUIREMENTS.PATH] -NODE = 6.0 -NPM = 3.10.0 +NODE = 12.16.0 +NPM = 6.13.4 [REQUIREMENTS.CRON] CLI = 1 diff --git a/app/routes.ini b/app/routes.ini index 07dafbd5..cfe28687 100644 --- a/app/routes.ini +++ b/app/routes.ini @@ -19,7 +19,7 @@ GET|POST /api/@controller/@action/@arg1 [ajax] = {{ @NAMESPACE }}\Con GET|POST /api/@controller/@action/@arg1/@arg2 [ajax] = {{ @NAMESPACE }}\Controller\Api\@controller->@action, 0, 512 ; onUnload route or final map sync (@see https://developer.mozilla.org/docs/Web/API/Navigator/sendBeacon) -POST /api/map/updateUnloadData = {{ @NAMESPACE }}\Controller\Api\map->updateUnloadData, 0, 512 +POST /api/Map/updateUnloadData = {{ @NAMESPACE }}\Controller\Api\Map->updateUnloadData, 0, 512 [maps] ; REST API wildcard endpoints (not cached, throttled) diff --git a/js/app/init.js b/js/app/init.js index c4a931af..89a760c7 100644 --- a/js/app/init.js +++ b/js/app/init.js @@ -21,37 +21,37 @@ define([], () => { img: '/public/img/', // path for images api: '/api/rest', //ajax URL - REST API // user API - getCaptcha: '/api/user/getCaptcha', // ajax URL - get captcha image - getServerStatus: '/api/user/getEveServerStatus', // ajax URL - get EVE-Online server status - getCookieCharacterData: '/api/user/getCookieCharacter', // ajax URL - get character data from cookie - logIn: '/api/user/logIn', // ajax URL - login - logout: '/api/user/logout', // ajax URL - logout - openIngameWindow: '/api/user/openIngameWindow', // ajax URL - open inGame Window - saveUserConfig: '/api/user/saveAccount', // ajax URL - saves/update user account - deleteAccount: '/api/user/deleteAccount', // ajax URL - delete Account data + getCaptcha: '/api/User/getCaptcha', // ajax URL - get captcha image + getServerStatus: '/api/User/getEveServerStatus', // ajax URL - get EVE-Online server status + getCookieCharacterData: '/api/User/getCookieCharacter', // ajax URL - get character data from cookie + logIn: '/api/User/logIn', // ajax URL - login + logout: '/api/User/logout', // ajax URL - logout + openIngameWindow: '/api/User/openIngameWindow', // ajax URL - open inGame Window + saveUserConfig: '/api/User/saveAccount', // ajax URL - saves/update user account + deleteAccount: '/api/User/deleteAccount', // ajax URL - delete Account data // access API - searchAccess: '/api/access/search', // ajax URL - search user/corporation/ally by name + searchAccess: '/api/Access/search', // ajax URL - search user/corporation/ally by name // main config/map ping API - initData: '/api/map/initData', // ajax URL - get static configuration data - getAccessData: '/api/map/getAccessData', // ajax URL - get map access tokens (WebSocket) - updateMapData: '/api/map/updateData', // ajax URL - main map update trigger - updateUserData: '/api/map/updateUserData', // ajax URL - main map user data trigger - updateUnloadData: '/api/map/updateUnloadData', // post URL - for my sync onUnload + initData: '/api/Map/initData', // ajax URL - get static configuration data + getAccessData: '/api/Map/getAccessData', // ajax URL - get map access tokens (WebSocket) + updateMapData: '/api/Map/updateData', // ajax URL - main map update trigger + updateUserData: '/api/Map/updateUserData', // ajax URL - main map user data trigger + updateUnloadData: '/api/Map/updateUnloadData', // post URL - for my sync onUnload // map API - importMap: '/api/map/import', // ajax URL - import map - getMapConnectionData: '/api/map/getConnectionData', // ajax URL - get connection data - getMapLogData: '/api/map/getLogData', // ajax URL - get logs data + importMap: '/api/Map/import', // ajax URL - import map + getMapConnectionData: '/api/Map/getConnectionData', // ajax URL - get connection data + getMapLogData: '/api/Map/getLogData', // ajax URL - get logs data // system API - setDestination: '/api/system/setDestination', // ajax URL - set destination - pokeRally: '/api/system/pokeRally', // ajax URL - send rally point pokes + setDestination: '/api/System/setDestination', // ajax URL - set destination + pokeRally: '/api/System/pokeRally', // ajax URL - send rally point pokes // stats API - getStatisticsData: '/api/statistic/getData', // ajax URL - get statistics data (activity log) + getStatisticsData: '/api/Statistic/getData', // ajax URL - get statistics data (activity log) // universe API - searchUniverseData: '/api/universe/search', // ajax URL - search universe data by category Ids - searchUniverseSystemData: '/api/universe/systems', // ajax URL - search universe system data by name - getConstellationData: '/api/universe/constellationData', // ajax URL - get system constellation data + searchUniverseData: '/api/Universe/search', // ajax URL - search universe data by category Ids + searchUniverseSystemData: '/api/Universe/systems', // ajax URL - search universe system data by name + getConstellationData: '/api/Universe/constellationData', // ajax URL - get system constellation data // GitHub API - gitHubReleases: '/api/github/releases' // ajax URL - get release info from GitHub + gitHubReleases: '/api/GitHub/releases' // ajax URL - get release info from GitHub }, breakpoints: [ {name: 'screen-xl', width: Infinity}, diff --git a/js/app/login.js b/js/app/login.js index 0c872d20..641ca6db 100644 --- a/js/app/login.js +++ b/js/app/login.js @@ -754,6 +754,9 @@ define([ * main init "landing" page */ $(() => { + // passive event listener + Util.initPassiveEvents(); + // clear sessionStorage Util.clearSessionStorage(); diff --git a/js/app/map/map.js b/js/app/map/map.js index 19929303..1b910383 100644 --- a/js/app/map/map.js +++ b/js/app/map/map.js @@ -1699,7 +1699,7 @@ define([ connectionData.mapId = mapId; connectionData.disableAutoScope = disableAutoScope; - Util.request('PUT', 'connection', [], connectionData, { + Util.request('PUT', 'Connection', [], connectionData, { connection: connection, map: map, mapId: mapId, diff --git a/js/app/map/system.js b/js/app/map/system.js index e4bb0e0f..ce95c282 100644 --- a/js/app/map/system.js +++ b/js/app/map/system.js @@ -135,7 +135,7 @@ define([ // show loading animation dialogElement.find('[data-type="spinner"]').addClass('in'); - Util.request('GET', 'system', systemId, {mapId: mapId, isCcpId: 1}, {dialogElement: dialogElement}) + Util.request('GET', 'System', systemId, {mapId: mapId, isCcpId: 1}, {dialogElement: dialogElement}) .then(payload => updateDialog(payload.context.dialogElement, payload.data)) .catch(payload => updateDialog(payload.context.dialogElement)); }; @@ -259,7 +259,7 @@ define([ this.find('.modal-content').showLoadingAnimation(); - Util.request('PUT', 'system', [], formData, { + Util.request('PUT', 'System', [], formData, { systemDialog: systemDialog, formElement: form, map: map, @@ -666,7 +666,7 @@ define([ let mapContainer = $( map.getContainer() ); let systemIds = systems.map(system => $(system).data('id')); - Util.request('DELETE', 'system', systemIds, { + Util.request('DELETE', 'System', systemIds, { mapId: mapContainer.data('id') }, { map: map, diff --git a/js/app/map/util.js b/js/app/map/util.js index 7fe2b5e3..d64e1e9f 100644 --- a/js/app/map/util.js +++ b/js/app/map/util.js @@ -447,7 +447,7 @@ define([ } if(connectionIds.length > 0){ - Util.request('DELETE', 'connection', connectionIds, { + Util.request('DELETE', 'Connection', connectionIds, { mapId: mapContainer.data('id') }, { connections: connections diff --git a/js/app/module_map.js b/js/app/module_map.js index 092575bd..206f24a8 100644 --- a/js/app/module_map.js +++ b/js/app/module_map.js @@ -254,7 +254,7 @@ define([ let renderPromises = []; if(requestSystemData){ - renderPromises.push(Util.request('GET', 'system', data.payload.id, {mapId: data.mapId})); + renderPromises.push(Util.request('GET', 'System', data.payload.id, {mapId: data.mapId})); } renderPromises.push(render(dataStore)); diff --git a/js/app/setup.js b/js/app/setup.js index 87e84bdb..83df971a 100644 --- a/js/app/setup.js +++ b/js/app/setup.js @@ -111,7 +111,7 @@ define([ e.preventDefault(); e.stopPropagation(); let element = $(this); - let url = '/api/setup/' + element.attr('data-action'); + let url = '/api/Setup/' + element.attr('data-action'); let payload = element.attr('data-payload'); let callStartName = element.attr('data-callstart'); let callBackName = element.attr('data-callback'); diff --git a/js/app/ui/dialog/manual.js b/js/app/ui/dialog/manual.js index 8628543e..37152028 100644 --- a/js/app/ui/dialog/manual.js +++ b/js/app/ui/dialog/manual.js @@ -30,7 +30,7 @@ define([ dialogNavigationClass: config.dialogNavigationClass, dialogNavLiClass: config.dialogNavigationListItemClass, scrollspyId: config.mapManualScrollspyId, - pieChartClass : Init.classes.pieChart.pieChartMapCounterClass, + pieChartClass : Init.classes.pieChart.class, mapCounterClass : Init.classes.pieChart.pieChartMapCounterClass }; diff --git a/js/app/ui/dialog/map_settings.js b/js/app/ui/dialog/map_settings.js index a4e653e9..d5e89e6c 100644 --- a/js/app/ui/dialog/map_settings.js +++ b/js/app/ui/dialog/map_settings.js @@ -373,7 +373,7 @@ define([ let method = formData.id ? 'PATCH' : 'PUT'; - Util.request(method, 'map', formData.id, formData, { + Util.request(method, 'Map', formData.id, formData, { formElement: form // for error form messages }, context => { // always do @@ -756,7 +756,7 @@ define([ let dialogContent = mapDeleteDialog.find('.modal-content'); dialogContent.showLoadingAnimation(); - Util.request('DELETE', 'map', mapId, {}, {}).then( + Util.request('DELETE', 'Map', mapId, {}, {}).then( payload => { Util.showNotify({title: 'Map deleted', text: 'Map: ' + mapName, type: 'success'}); }, diff --git a/js/app/ui/module/connection_info.js b/js/app/ui/module/connection_info.js index 9a437cee..11702972 100644 --- a/js/app/ui/module/connection_info.js +++ b/js/app/ui/module/connection_info.js @@ -256,7 +256,7 @@ define([ $(tableEls).showLoadingAnimation(); } - return this.request('GET', 'connection', connectionIds, { + return this.request('GET', 'Connection', connectionIds, { mapId: mapId, addData : ['signatures', 'logs'], // filterData : ['logs'] // do not exclude connections with NO "logs" -> sig data will be used as well @@ -1003,7 +1003,7 @@ define([ $(connectionElement.getElementsByTagName('table')).showLoadingAnimation(); - module.request('DELETE', 'log', rowData.id, {}, { + module.request('DELETE', 'Log', rowData.id, {}, { connectionElement: connectionElement }, module.requestAlways) .then( @@ -1025,7 +1025,7 @@ define([ active: 1 }; - module.request('PATCH', 'log', rowData.id, requestData, { + module.request('PATCH', 'Log', rowData.id, requestData, { connectionElement: connectionElement }, module.requestAlways) .then( @@ -1178,7 +1178,7 @@ define([ let method = formData.id ? 'PATCH' : 'PUT'; - this.request(method, 'log', formData.id, formData, { + this.request(method, 'Log', formData.id, formData, { connectionElement: connectionElement, formElement: form }, this.requestAlways) diff --git a/js/app/ui/module/global_thera.js b/js/app/ui/module/global_thera.js index bcd4640d..906aa8a2 100644 --- a/js/app/ui/module/global_thera.js +++ b/js/app/ui/module/global_thera.js @@ -654,7 +654,7 @@ define([ $(this.moduleElement).hideLoadingAnimation(); resolve(cacheEntry.value); }else{ - this.request('GET', 'systemThera', [], {}, this, context => { + this.request('GET', 'SystemThera', [], {}, this, context => { $(this.moduleElement).hideLoadingAnimation(); }).then(payload => { let cacheEntry = { diff --git a/js/app/ui/module/system_graph.js b/js/app/ui/module/system_graph.js index 7f3c02a6..990cb9d8 100644 --- a/js/app/ui/module/system_graph.js +++ b/js/app/ui/module/system_graph.js @@ -95,7 +95,7 @@ define([ */ getGraphsData(){ $(this.moduleElement).find('.' + this._config.systemGraphClass).showLoadingAnimation(); - return this.request('GET', 'systemgraph', this._systemData.id, { + return this.request('GET', 'SystemGraph', this._systemData.id, { systemIds: [this._systemData.systemId] }); } diff --git a/js/app/ui/module/system_info.js b/js/app/ui/module/system_info.js index 5b54d7d2..a12ccd58 100644 --- a/js/app/ui/module/system_info.js +++ b/js/app/ui/module/system_info.js @@ -512,7 +512,7 @@ define([ // ... valid -> save() descriptionArea.showLoadingAnimation(); - Util.request('PATCH', 'system', systemId, { + Util.request('PATCH', 'System', systemId, { description: description }, { descriptionArea: descriptionArea diff --git a/js/app/ui/module/system_intel.js b/js/app/ui/module/system_intel.js index 2ff912de..09bbba63 100644 --- a/js/app/ui/module/system_intel.js +++ b/js/app/ui/module/system_intel.js @@ -342,7 +342,7 @@ define([ // tableApi.rows(deleteRowElement).remove().draw(); $(module.moduleElement).showLoadingAnimation(); - Util.request('DELETE', 'structure', rowData.id, {}, + Util.request('DELETE', 'Structure', rowData.id, {}, { tableApi: tableApi }, @@ -477,7 +477,7 @@ define([ action: function(e, tableApi, node, config){ $(module.moduleElement).showLoadingAnimation(); - Util.request('GET', 'system', module._systemData.id, {mapId: module._systemData.mapId}, + Util.request('GET', 'System', module._systemData.id, {mapId: module._systemData.mapId}, { tableApi: tableApi, removeMissing: true @@ -907,7 +907,7 @@ define([ }); } - this.request(method, 'structure', ids, data, + this.request(method, 'Structure', ids, data, { tableApi: tableApi }, @@ -1088,7 +1088,7 @@ define([ let saveStructureData = (structureData, context) => { $(this.moduleElement).showLoadingAnimation(); - this.request('POST', 'structure', [], structureData, context, () => $(this.moduleElement).hideLoadingAnimation()) + this.request('POST', 'Structure', [], structureData, context, () => $(this.moduleElement).hideLoadingAnimation()) .then( payload => this.callbackUpdateTableRows(payload.context, payload.data), Util.handleAjaxErrorResponse diff --git a/js/app/ui/module/system_route.js b/js/app/ui/module/system_route.js index 75104ae1..90604c8a 100644 --- a/js/app/ui/module/system_route.js +++ b/js/app/ui/module/system_route.js @@ -510,7 +510,7 @@ define([ getRouteData(requestData, callback){ $(this.moduleElement).showLoadingAnimation(); - this.request('POST', 'route', [], requestData, this, context => { + this.request('POST', 'Route', [], requestData, this, context => { $(this.moduleElement).hideLoadingAnimation(); }) .then(payload => payload.context[callback](payload.data.routesData)) diff --git a/js/app/ui/module/system_signature.js b/js/app/ui/module/system_signature.js index 9a34bb61..4be5db80 100644 --- a/js/app/ui/module/system_signature.js +++ b/js/app/ui/module/system_signature.js @@ -345,7 +345,7 @@ define([ let processLockPromise = null; node.editable({ - url: Init.path.api + '/signaturehistory', + url: Init.path.api + '/SignatureHistory', ajaxOptions: { processData: false, type: 'PUT', @@ -368,7 +368,7 @@ define([ title: 'historical records', name: 'history', pk: module._systemData.id, - source: Init.path.api + '/signaturehistory/' + module._systemData.id, + source: Init.path.api + '/SignatureHistory/' + module._systemData.id, sourceOptions: { type: 'GET', data: { @@ -1071,7 +1071,7 @@ define([ // submit all xEditable fields formFields.editable('submit', { - url: Init.path.api + '/signature', + url: Init.path.api + '/Signature', ajaxOptions: { processData: false, // we need to "process" data in beforeSend() type: 'PUT', @@ -1363,7 +1363,7 @@ define([ Util.request( 'POST', - 'signature', + 'Signature', [], { signatures: signatureData, @@ -1435,7 +1435,7 @@ define([ let processRequestPromise = tableApi.newProcess('request'); - Util.request('DELETE', 'signature', signatureIds, data, { + Util.request('DELETE', 'Signature', signatureIds, data, { tableApi: tableApi, processRequestPromise: processRequestPromise }, @@ -3146,7 +3146,7 @@ define([ let requestData = {}; requestData[params.name] = params.value; - Util.request('PATCH', 'signature', params.pk, requestData) + Util.request('PATCH', 'Signature', params.pk, requestData) .then(payload => resolve(payload.data)) .catch(payload => reject(payload.data.jqXHR)); }else{ diff --git a/public/js/v2.0.0-rc.1/app/init.js b/public/js/v2.0.0-rc.1/app/init.js index c4a931af..89a760c7 100644 --- a/public/js/v2.0.0-rc.1/app/init.js +++ b/public/js/v2.0.0-rc.1/app/init.js @@ -21,37 +21,37 @@ define([], () => { img: '/public/img/', // path for images api: '/api/rest', //ajax URL - REST API // user API - getCaptcha: '/api/user/getCaptcha', // ajax URL - get captcha image - getServerStatus: '/api/user/getEveServerStatus', // ajax URL - get EVE-Online server status - getCookieCharacterData: '/api/user/getCookieCharacter', // ajax URL - get character data from cookie - logIn: '/api/user/logIn', // ajax URL - login - logout: '/api/user/logout', // ajax URL - logout - openIngameWindow: '/api/user/openIngameWindow', // ajax URL - open inGame Window - saveUserConfig: '/api/user/saveAccount', // ajax URL - saves/update user account - deleteAccount: '/api/user/deleteAccount', // ajax URL - delete Account data + getCaptcha: '/api/User/getCaptcha', // ajax URL - get captcha image + getServerStatus: '/api/User/getEveServerStatus', // ajax URL - get EVE-Online server status + getCookieCharacterData: '/api/User/getCookieCharacter', // ajax URL - get character data from cookie + logIn: '/api/User/logIn', // ajax URL - login + logout: '/api/User/logout', // ajax URL - logout + openIngameWindow: '/api/User/openIngameWindow', // ajax URL - open inGame Window + saveUserConfig: '/api/User/saveAccount', // ajax URL - saves/update user account + deleteAccount: '/api/User/deleteAccount', // ajax URL - delete Account data // access API - searchAccess: '/api/access/search', // ajax URL - search user/corporation/ally by name + searchAccess: '/api/Access/search', // ajax URL - search user/corporation/ally by name // main config/map ping API - initData: '/api/map/initData', // ajax URL - get static configuration data - getAccessData: '/api/map/getAccessData', // ajax URL - get map access tokens (WebSocket) - updateMapData: '/api/map/updateData', // ajax URL - main map update trigger - updateUserData: '/api/map/updateUserData', // ajax URL - main map user data trigger - updateUnloadData: '/api/map/updateUnloadData', // post URL - for my sync onUnload + initData: '/api/Map/initData', // ajax URL - get static configuration data + getAccessData: '/api/Map/getAccessData', // ajax URL - get map access tokens (WebSocket) + updateMapData: '/api/Map/updateData', // ajax URL - main map update trigger + updateUserData: '/api/Map/updateUserData', // ajax URL - main map user data trigger + updateUnloadData: '/api/Map/updateUnloadData', // post URL - for my sync onUnload // map API - importMap: '/api/map/import', // ajax URL - import map - getMapConnectionData: '/api/map/getConnectionData', // ajax URL - get connection data - getMapLogData: '/api/map/getLogData', // ajax URL - get logs data + importMap: '/api/Map/import', // ajax URL - import map + getMapConnectionData: '/api/Map/getConnectionData', // ajax URL - get connection data + getMapLogData: '/api/Map/getLogData', // ajax URL - get logs data // system API - setDestination: '/api/system/setDestination', // ajax URL - set destination - pokeRally: '/api/system/pokeRally', // ajax URL - send rally point pokes + setDestination: '/api/System/setDestination', // ajax URL - set destination + pokeRally: '/api/System/pokeRally', // ajax URL - send rally point pokes // stats API - getStatisticsData: '/api/statistic/getData', // ajax URL - get statistics data (activity log) + getStatisticsData: '/api/Statistic/getData', // ajax URL - get statistics data (activity log) // universe API - searchUniverseData: '/api/universe/search', // ajax URL - search universe data by category Ids - searchUniverseSystemData: '/api/universe/systems', // ajax URL - search universe system data by name - getConstellationData: '/api/universe/constellationData', // ajax URL - get system constellation data + searchUniverseData: '/api/Universe/search', // ajax URL - search universe data by category Ids + searchUniverseSystemData: '/api/Universe/systems', // ajax URL - search universe system data by name + getConstellationData: '/api/Universe/constellationData', // ajax URL - get system constellation data // GitHub API - gitHubReleases: '/api/github/releases' // ajax URL - get release info from GitHub + gitHubReleases: '/api/GitHub/releases' // ajax URL - get release info from GitHub }, breakpoints: [ {name: 'screen-xl', width: Infinity}, diff --git a/public/js/v2.0.0-rc.1/app/login.js b/public/js/v2.0.0-rc.1/app/login.js index 0c872d20..641ca6db 100644 --- a/public/js/v2.0.0-rc.1/app/login.js +++ b/public/js/v2.0.0-rc.1/app/login.js @@ -754,6 +754,9 @@ define([ * main init "landing" page */ $(() => { + // passive event listener + Util.initPassiveEvents(); + // clear sessionStorage Util.clearSessionStorage(); diff --git a/public/js/v2.0.0-rc.1/app/map/map.js b/public/js/v2.0.0-rc.1/app/map/map.js index 19929303..1b910383 100644 --- a/public/js/v2.0.0-rc.1/app/map/map.js +++ b/public/js/v2.0.0-rc.1/app/map/map.js @@ -1699,7 +1699,7 @@ define([ connectionData.mapId = mapId; connectionData.disableAutoScope = disableAutoScope; - Util.request('PUT', 'connection', [], connectionData, { + Util.request('PUT', 'Connection', [], connectionData, { connection: connection, map: map, mapId: mapId, diff --git a/public/js/v2.0.0-rc.1/app/map/system.js b/public/js/v2.0.0-rc.1/app/map/system.js index e4bb0e0f..ce95c282 100644 --- a/public/js/v2.0.0-rc.1/app/map/system.js +++ b/public/js/v2.0.0-rc.1/app/map/system.js @@ -135,7 +135,7 @@ define([ // show loading animation dialogElement.find('[data-type="spinner"]').addClass('in'); - Util.request('GET', 'system', systemId, {mapId: mapId, isCcpId: 1}, {dialogElement: dialogElement}) + Util.request('GET', 'System', systemId, {mapId: mapId, isCcpId: 1}, {dialogElement: dialogElement}) .then(payload => updateDialog(payload.context.dialogElement, payload.data)) .catch(payload => updateDialog(payload.context.dialogElement)); }; @@ -259,7 +259,7 @@ define([ this.find('.modal-content').showLoadingAnimation(); - Util.request('PUT', 'system', [], formData, { + Util.request('PUT', 'System', [], formData, { systemDialog: systemDialog, formElement: form, map: map, @@ -666,7 +666,7 @@ define([ let mapContainer = $( map.getContainer() ); let systemIds = systems.map(system => $(system).data('id')); - Util.request('DELETE', 'system', systemIds, { + Util.request('DELETE', 'System', systemIds, { mapId: mapContainer.data('id') }, { map: map, diff --git a/public/js/v2.0.0-rc.1/app/map/util.js b/public/js/v2.0.0-rc.1/app/map/util.js index 7fe2b5e3..d64e1e9f 100644 --- a/public/js/v2.0.0-rc.1/app/map/util.js +++ b/public/js/v2.0.0-rc.1/app/map/util.js @@ -447,7 +447,7 @@ define([ } if(connectionIds.length > 0){ - Util.request('DELETE', 'connection', connectionIds, { + Util.request('DELETE', 'Connection', connectionIds, { mapId: mapContainer.data('id') }, { connections: connections diff --git a/public/js/v2.0.0-rc.1/app/module_map.js b/public/js/v2.0.0-rc.1/app/module_map.js index 092575bd..206f24a8 100644 --- a/public/js/v2.0.0-rc.1/app/module_map.js +++ b/public/js/v2.0.0-rc.1/app/module_map.js @@ -254,7 +254,7 @@ define([ let renderPromises = []; if(requestSystemData){ - renderPromises.push(Util.request('GET', 'system', data.payload.id, {mapId: data.mapId})); + renderPromises.push(Util.request('GET', 'System', data.payload.id, {mapId: data.mapId})); } renderPromises.push(render(dataStore)); diff --git a/public/js/v2.0.0-rc.1/app/setup.js b/public/js/v2.0.0-rc.1/app/setup.js index 87e84bdb..83df971a 100644 --- a/public/js/v2.0.0-rc.1/app/setup.js +++ b/public/js/v2.0.0-rc.1/app/setup.js @@ -111,7 +111,7 @@ define([ e.preventDefault(); e.stopPropagation(); let element = $(this); - let url = '/api/setup/' + element.attr('data-action'); + let url = '/api/Setup/' + element.attr('data-action'); let payload = element.attr('data-payload'); let callStartName = element.attr('data-callstart'); let callBackName = element.attr('data-callback'); diff --git a/public/js/v2.0.0-rc.1/app/ui/dialog/manual.js b/public/js/v2.0.0-rc.1/app/ui/dialog/manual.js index 8628543e..37152028 100644 --- a/public/js/v2.0.0-rc.1/app/ui/dialog/manual.js +++ b/public/js/v2.0.0-rc.1/app/ui/dialog/manual.js @@ -30,7 +30,7 @@ define([ dialogNavigationClass: config.dialogNavigationClass, dialogNavLiClass: config.dialogNavigationListItemClass, scrollspyId: config.mapManualScrollspyId, - pieChartClass : Init.classes.pieChart.pieChartMapCounterClass, + pieChartClass : Init.classes.pieChart.class, mapCounterClass : Init.classes.pieChart.pieChartMapCounterClass }; diff --git a/public/js/v2.0.0-rc.1/app/ui/dialog/map_settings.js b/public/js/v2.0.0-rc.1/app/ui/dialog/map_settings.js index a4e653e9..d5e89e6c 100644 --- a/public/js/v2.0.0-rc.1/app/ui/dialog/map_settings.js +++ b/public/js/v2.0.0-rc.1/app/ui/dialog/map_settings.js @@ -373,7 +373,7 @@ define([ let method = formData.id ? 'PATCH' : 'PUT'; - Util.request(method, 'map', formData.id, formData, { + Util.request(method, 'Map', formData.id, formData, { formElement: form // for error form messages }, context => { // always do @@ -756,7 +756,7 @@ define([ let dialogContent = mapDeleteDialog.find('.modal-content'); dialogContent.showLoadingAnimation(); - Util.request('DELETE', 'map', mapId, {}, {}).then( + Util.request('DELETE', 'Map', mapId, {}, {}).then( payload => { Util.showNotify({title: 'Map deleted', text: 'Map: ' + mapName, type: 'success'}); }, diff --git a/public/js/v2.0.0-rc.1/app/ui/module/connection_info.js b/public/js/v2.0.0-rc.1/app/ui/module/connection_info.js index 9a437cee..11702972 100644 --- a/public/js/v2.0.0-rc.1/app/ui/module/connection_info.js +++ b/public/js/v2.0.0-rc.1/app/ui/module/connection_info.js @@ -256,7 +256,7 @@ define([ $(tableEls).showLoadingAnimation(); } - return this.request('GET', 'connection', connectionIds, { + return this.request('GET', 'Connection', connectionIds, { mapId: mapId, addData : ['signatures', 'logs'], // filterData : ['logs'] // do not exclude connections with NO "logs" -> sig data will be used as well @@ -1003,7 +1003,7 @@ define([ $(connectionElement.getElementsByTagName('table')).showLoadingAnimation(); - module.request('DELETE', 'log', rowData.id, {}, { + module.request('DELETE', 'Log', rowData.id, {}, { connectionElement: connectionElement }, module.requestAlways) .then( @@ -1025,7 +1025,7 @@ define([ active: 1 }; - module.request('PATCH', 'log', rowData.id, requestData, { + module.request('PATCH', 'Log', rowData.id, requestData, { connectionElement: connectionElement }, module.requestAlways) .then( @@ -1178,7 +1178,7 @@ define([ let method = formData.id ? 'PATCH' : 'PUT'; - this.request(method, 'log', formData.id, formData, { + this.request(method, 'Log', formData.id, formData, { connectionElement: connectionElement, formElement: form }, this.requestAlways) diff --git a/public/js/v2.0.0-rc.1/app/ui/module/global_thera.js b/public/js/v2.0.0-rc.1/app/ui/module/global_thera.js index bcd4640d..906aa8a2 100644 --- a/public/js/v2.0.0-rc.1/app/ui/module/global_thera.js +++ b/public/js/v2.0.0-rc.1/app/ui/module/global_thera.js @@ -654,7 +654,7 @@ define([ $(this.moduleElement).hideLoadingAnimation(); resolve(cacheEntry.value); }else{ - this.request('GET', 'systemThera', [], {}, this, context => { + this.request('GET', 'SystemThera', [], {}, this, context => { $(this.moduleElement).hideLoadingAnimation(); }).then(payload => { let cacheEntry = { diff --git a/public/js/v2.0.0-rc.1/app/ui/module/system_graph.js b/public/js/v2.0.0-rc.1/app/ui/module/system_graph.js index 7f3c02a6..990cb9d8 100644 --- a/public/js/v2.0.0-rc.1/app/ui/module/system_graph.js +++ b/public/js/v2.0.0-rc.1/app/ui/module/system_graph.js @@ -95,7 +95,7 @@ define([ */ getGraphsData(){ $(this.moduleElement).find('.' + this._config.systemGraphClass).showLoadingAnimation(); - return this.request('GET', 'systemgraph', this._systemData.id, { + return this.request('GET', 'SystemGraph', this._systemData.id, { systemIds: [this._systemData.systemId] }); } diff --git a/public/js/v2.0.0-rc.1/app/ui/module/system_info.js b/public/js/v2.0.0-rc.1/app/ui/module/system_info.js index 5b54d7d2..a12ccd58 100644 --- a/public/js/v2.0.0-rc.1/app/ui/module/system_info.js +++ b/public/js/v2.0.0-rc.1/app/ui/module/system_info.js @@ -512,7 +512,7 @@ define([ // ... valid -> save() descriptionArea.showLoadingAnimation(); - Util.request('PATCH', 'system', systemId, { + Util.request('PATCH', 'System', systemId, { description: description }, { descriptionArea: descriptionArea diff --git a/public/js/v2.0.0-rc.1/app/ui/module/system_intel.js b/public/js/v2.0.0-rc.1/app/ui/module/system_intel.js index 2ff912de..09bbba63 100644 --- a/public/js/v2.0.0-rc.1/app/ui/module/system_intel.js +++ b/public/js/v2.0.0-rc.1/app/ui/module/system_intel.js @@ -342,7 +342,7 @@ define([ // tableApi.rows(deleteRowElement).remove().draw(); $(module.moduleElement).showLoadingAnimation(); - Util.request('DELETE', 'structure', rowData.id, {}, + Util.request('DELETE', 'Structure', rowData.id, {}, { tableApi: tableApi }, @@ -477,7 +477,7 @@ define([ action: function(e, tableApi, node, config){ $(module.moduleElement).showLoadingAnimation(); - Util.request('GET', 'system', module._systemData.id, {mapId: module._systemData.mapId}, + Util.request('GET', 'System', module._systemData.id, {mapId: module._systemData.mapId}, { tableApi: tableApi, removeMissing: true @@ -907,7 +907,7 @@ define([ }); } - this.request(method, 'structure', ids, data, + this.request(method, 'Structure', ids, data, { tableApi: tableApi }, @@ -1088,7 +1088,7 @@ define([ let saveStructureData = (structureData, context) => { $(this.moduleElement).showLoadingAnimation(); - this.request('POST', 'structure', [], structureData, context, () => $(this.moduleElement).hideLoadingAnimation()) + this.request('POST', 'Structure', [], structureData, context, () => $(this.moduleElement).hideLoadingAnimation()) .then( payload => this.callbackUpdateTableRows(payload.context, payload.data), Util.handleAjaxErrorResponse diff --git a/public/js/v2.0.0-rc.1/app/ui/module/system_route.js b/public/js/v2.0.0-rc.1/app/ui/module/system_route.js index 75104ae1..90604c8a 100644 --- a/public/js/v2.0.0-rc.1/app/ui/module/system_route.js +++ b/public/js/v2.0.0-rc.1/app/ui/module/system_route.js @@ -510,7 +510,7 @@ define([ getRouteData(requestData, callback){ $(this.moduleElement).showLoadingAnimation(); - this.request('POST', 'route', [], requestData, this, context => { + this.request('POST', 'Route', [], requestData, this, context => { $(this.moduleElement).hideLoadingAnimation(); }) .then(payload => payload.context[callback](payload.data.routesData)) diff --git a/public/js/v2.0.0-rc.1/app/ui/module/system_signature.js b/public/js/v2.0.0-rc.1/app/ui/module/system_signature.js index 9a34bb61..4be5db80 100644 --- a/public/js/v2.0.0-rc.1/app/ui/module/system_signature.js +++ b/public/js/v2.0.0-rc.1/app/ui/module/system_signature.js @@ -345,7 +345,7 @@ define([ let processLockPromise = null; node.editable({ - url: Init.path.api + '/signaturehistory', + url: Init.path.api + '/SignatureHistory', ajaxOptions: { processData: false, type: 'PUT', @@ -368,7 +368,7 @@ define([ title: 'historical records', name: 'history', pk: module._systemData.id, - source: Init.path.api + '/signaturehistory/' + module._systemData.id, + source: Init.path.api + '/SignatureHistory/' + module._systemData.id, sourceOptions: { type: 'GET', data: { @@ -1071,7 +1071,7 @@ define([ // submit all xEditable fields formFields.editable('submit', { - url: Init.path.api + '/signature', + url: Init.path.api + '/Signature', ajaxOptions: { processData: false, // we need to "process" data in beforeSend() type: 'PUT', @@ -1363,7 +1363,7 @@ define([ Util.request( 'POST', - 'signature', + 'Signature', [], { signatures: signatureData, @@ -1435,7 +1435,7 @@ define([ let processRequestPromise = tableApi.newProcess('request'); - Util.request('DELETE', 'signature', signatureIds, data, { + Util.request('DELETE', 'Signature', signatureIds, data, { tableApi: tableApi, processRequestPromise: processRequestPromise }, @@ -3146,7 +3146,7 @@ define([ let requestData = {}; requestData[params.name] = params.value; - Util.request('PATCH', 'signature', params.pk, requestData) + Util.request('PATCH', 'Signature', params.pk, requestData) .then(payload => resolve(payload.data)) .catch(payload => reject(payload.data.jqXHR)); }else{ diff --git a/public/templates/dialog/map_manual.html b/public/templates/dialog/map_manual.html index b25a8632..4fefa620 100644 --- a/public/templates/dialog/map_manual.html +++ b/public/templates/dialog/map_manual.html @@ -120,10 +120,8 @@

Update counter

-
-
- 4 -
+
+

The "Update counter" starts counting backwards during map interaction. While the counter is active, no data is pushed to server. diff --git a/public/templates/ui/notice.html b/public/templates/ui/notice.html index d5ddf7b9..6208ff62 100644 --- a/public/templates/ui/notice.html +++ b/public/templates/ui/notice.html @@ -1,5 +1,5 @@

-
+

New release {{version}}

@@ -8,15 +8,26 @@
-
+
    -
  • Bulk update for "Structures" #869
    • -
  • Switched to new image server #872
    • +
  • + Custom UI (drag&drop panels, hide/load modules) + #470 +
    • +
  • + Live "Killstream" (zkillboard.com - WebSocket push) + #909 +
    • +
  • + New "Thera" connections module (from eve-scout.com) + #829 +
-
+
    -
  • Improved signature types for "Shattered wormholes" #875
    • +
  • Updated list of wormhole signatures #916
    • +
  • Plugin API for custom UI modules [BETA] #913
  • Many more improvements/fixes. Complete changelog